Merge VS Code 1.23.1 (#1520)

src/typings/windows-process-tree.d.ts

@@ -4,11 +4,60 @@
  *--------------------------------------------------------------------------------------------*/
 
 declare module 'windows-process-tree' {
-	interface ProcessTreeNode {
-		pid: number,
-		name: string,
-		children: ProcessTreeNode[]
+	export enum ProcessDataFlag {
+		None = 0,
+		Memory = 1,
+		CommandLine = 2
 	}
-	function get(rootPid: number, callback: (tree: ProcessTreeNode) => void): void;
-	export = get;
-}
+
+	export interface IProcessInfo {
+		pid: number;
+		ppid: number;
+		name: string;
+
+		/**
+		 * The working set size of the process, in bytes.
+		 */
+		memory?: number;
+
+		/**
+		 * The string returned is at most 512 chars, strings exceeding this length are truncated.
+		 */
+		commandLine?: string;
+	}
+
+	export interface IProcessCpuInfo extends IProcessInfo {
+		cpu?: number;
+	}
+
+	export interface IProcessTreeNode {
+		pid: number;
+		name: string;
+		memory?: number;
+		commandLine?: string;
+		children: IProcessTreeNode[];
+	}
+
+	/**
+	 * Returns a tree of processes with the rootPid process as the root.
+	 * @param rootPid - The pid of the process that will be the root of the tree.
+	 * @param callback - The callback to use with the returned list of processes.
+	 * @param flags - The flags for what process data should be included.
+	 */
+	export function getProcessTree(rootPid: number, callback: (tree: IProcessTreeNode) => void, flags?: ProcessDataFlag): void;
+
+	/**
+	 * Returns a list of processes containing the rootPid process and all of its descendants.
+	 * @param rootPid - The pid of the process of interest.
+	 * @param callback - The callback to use with the returned set of processes.
+	 * @param flags - The flags for what process data should be included.
+	 */
+	export function getProcessList(rootPid: number, callback: (processList: IProcessInfo[]) => void, flags?: ProcessDataFlag): void;
+
+	/**
+	 * Returns the list of processes annotated with cpu usage information.
+	 * @param processList - The list of processes.
+	 * @param callback - The callback to use with the returned list of processes.
+	 */
+	export function getProcessCpuUsage(processList: IProcessInfo[], callback: (processListWithCpu: IProcessCpuInfo[]) => void): void;
+}