watcher - improve stats reporting (microsoft#210684)

Author: bpasero

src/vs/platform/files/common/watcher.ts

@@ -470,7 +470,7 @@ export function requestFilterToString(filter: FileChangeFilter | undefined): str
 			return '<all>';
 		}
 
-		return filters.join(', ');
+		return `[${filters.join(', ')}]`;
 	}
 
 	return '<none>';

src/vs/platform/files/node/watcher/watcherStats.ts

@@ -14,32 +14,41 @@ export function computeStats(
 ): string {
 	const lines: string[] = [];
 
-	const recursiveRequests = sortByPathPrefix(requests.filter(request => request.recursive));
-	const recursiveRequestsStatus = computeRequestStatus(recursiveRequests, recursiveWatcher);
+	const allRecursiveRequests = sortByPathPrefix(requests.filter(request => request.recursive));
+	const nonSuspendedRecursiveRequests = allRecursiveRequests.filter(request => recursiveWatcher.isSuspended(request) === false);
+	const suspendedPollingRecursiveRequests = allRecursiveRequests.filter(request => recursiveWatcher.isSuspended(request) === 'polling');
+	const suspendedNonPollingRecursiveRequests = allRecursiveRequests.filter(request => recursiveWatcher.isSuspended(request) === true);
+
+	const recursiveRequestsStatus = computeRequestStatus(allRecursiveRequests, recursiveWatcher);
 	const recursiveWatcherStatus = computeRecursiveWatchStatus(recursiveWatcher);
 
-	const nonRecursiveRequests = sortByPathPrefix(requests.filter(request => !request.recursive));
-	const nonRecursiveRequestsStatus = computeRequestStatus(nonRecursiveRequests, nonRecursiveWatcher);
+	const allNonRecursiveRequests = sortByPathPrefix(requests.filter(request => !request.recursive));
+	const nonSuspendedNonRecursiveRequests = allNonRecursiveRequests.filter(request => nonRecursiveWatcher.isSuspended(request) === false);
+	const suspendedPollingNonRecursiveRequests = allNonRecursiveRequests.filter(request => nonRecursiveWatcher.isSuspended(request) === 'polling');
+	const suspendedNonPollingNonRecursiveRequests = allNonRecursiveRequests.filter(request => nonRecursiveWatcher.isSuspended(request) === true);
+
+	const nonRecursiveRequestsStatus = computeRequestStatus(allNonRecursiveRequests, nonRecursiveWatcher);
 	const nonRecursiveWatcherStatus = computeNonRecursiveWatchStatus(nonRecursiveWatcher);
 
 	lines.push('[Summary]');
-	lines.push(`- Recursive Requests:     total: ${recursiveRequests.length}, suspended: ${recursiveRequestsStatus.suspended}, polling: ${recursiveRequestsStatus.polling}`);
-	lines.push(`- Non-Recursive Requests: total: ${nonRecursiveRequests.length}, suspended: ${nonRecursiveRequestsStatus.suspended}, polling: ${nonRecursiveRequestsStatus.polling}`);
+	lines.push(`- Recursive Requests:     total: ${allRecursiveRequests.length}, suspended: ${recursiveRequestsStatus.suspended}, polling: ${recursiveRequestsStatus.polling}`);
+	lines.push(`- Non-Recursive Requests: total: ${allNonRecursiveRequests.length}, suspended: ${nonRecursiveRequestsStatus.suspended}, polling: ${nonRecursiveRequestsStatus.polling}`);
 	lines.push(`- Recursive Watchers:     total: ${recursiveWatcher.watchers.size}, active: ${recursiveWatcherStatus.active}, failed: ${recursiveWatcherStatus.failed}, stopped: ${recursiveWatcherStatus.stopped}`);
 	lines.push(`- Non-Recursive Watchers: total: ${nonRecursiveWatcher.watchers.size}, active: ${nonRecursiveWatcherStatus.active}, failed: ${nonRecursiveWatcherStatus.failed}, reusing: ${nonRecursiveWatcherStatus.reusing}`);
 	lines.push(`- I/O Handles Impact:     total: ${recursiveRequestsStatus.polling + nonRecursiveRequestsStatus.polling + recursiveWatcherStatus.active + nonRecursiveWatcherStatus.active}`);
 
-	lines.push(`\n[Recursive Requests (${recursiveRequests.length}, suspended: ${recursiveRequestsStatus.suspended}, polling: ${recursiveRequestsStatus.polling})]:`);
-	for (const request of recursiveRequests) {
+	lines.push(`\n[Recursive Requests (${allRecursiveRequests.length}, suspended: ${recursiveRequestsStatus.suspended}, polling: ${recursiveRequestsStatus.polling})]:`);
+	for (const request of [nonSuspendedRecursiveRequests, suspendedPollingRecursiveRequests, suspendedNonPollingRecursiveRequests].flat()) {
 		fillRequestStats(lines, request, recursiveWatcher);
 	}
 
-	lines.push(`\n[Non-Recursive Requests (${nonRecursiveRequests.length}, suspended: ${nonRecursiveRequestsStatus.suspended}, polling: ${nonRecursiveRequestsStatus.polling})]:`);
-	for (const request of nonRecursiveRequests) {
+	fillRecursiveWatcherStats(lines, recursiveWatcher);
+
+	lines.push(`\n[Non-Recursive Requests (${allNonRecursiveRequests.length}, suspended: ${nonRecursiveRequestsStatus.suspended}, polling: ${nonRecursiveRequestsStatus.polling})]:`);
+	for (const request of [nonSuspendedNonRecursiveRequests, suspendedPollingNonRecursiveRequests, suspendedNonPollingNonRecursiveRequests].flat()) {
 		fillRequestStats(lines, request, nonRecursiveWatcher);
 	}
 
-	fillRecursiveWatcherStats(lines, recursiveWatcher);
 	fillNonRecursiveWatcherStats(lines, nonRecursiveWatcher);
 
 	let maxLength = 0;
@@ -157,7 +166,7 @@ function fillRequestStats(lines: string[], request: IUniversalWatchRequest, watc
 		}
 	}
 
-	lines.push(`${request.path}\t${decorations.length > 0 ? decorations.join(' ') + ' ' : ''}(${requestDetailsToString(request)})`);
+	lines.push(` ${request.path}\t${decorations.length > 0 ? decorations.join(' ') + ' ' : ''}(${requestDetailsToString(request)})`);
 }
 
 function requestDetailsToString(request: IUniversalWatchRequest): string {
@@ -184,24 +193,27 @@ function fillRecursiveWatcherStats(lines: string[], recursiveWatcher: ParcelWatc
 		if (watcher.restarts > 0) {
 			decorations.push(`[RESTARTED:${watcher.restarts}]`);
 		}
-		lines.push(`${watcher.request.path}\t${decorations.length > 0 ? decorations.join(' ') + ' ' : ''}(${requestDetailsToString(watcher.request)})`);
+		lines.push(` ${watcher.request.path}\t${decorations.length > 0 ? decorations.join(' ') + ' ' : ''}(${requestDetailsToString(watcher.request)})`);
 	}
 }
 
 function fillNonRecursiveWatcherStats(lines: string[], nonRecursiveWatcher: NodeJSWatcher): void {
-	const watchers = sortByPathPrefix(Array.from(nonRecursiveWatcher.watchers.values()));
+	const allWatchers = sortByPathPrefix(Array.from(nonRecursiveWatcher.watchers.values()));
+	const activeWatchers = allWatchers.filter(watcher => !watcher.instance.failed && !watcher.instance.isReusingRecursiveWatcher);
+	const failedWatchers = allWatchers.filter(watcher => watcher.instance.failed);
+	const reusingWatchers = allWatchers.filter(watcher => watcher.instance.isReusingRecursiveWatcher);
 
 	const { active, failed, reusing } = computeNonRecursiveWatchStatus(nonRecursiveWatcher);
-	lines.push(`\n[Non-Recursive Watchers (${watchers.length}, active: ${active}, failed: ${failed}, reusing: ${reusing})]:`);
+	lines.push(`\n[Non-Recursive Watchers (${allWatchers.length}, active: ${active}, failed: ${failed}, reusing: ${reusing})]:`);
 
-	for (const watcher of watchers) {
+	for (const watcher of [activeWatchers, failedWatchers, reusingWatchers].flat()) {
 		const decorations = [];
 		if (watcher.instance.failed) {
 			decorations.push('[FAILED]');
 		}
 		if (watcher.instance.isReusingRecursiveWatcher) {
 			decorations.push('[REUSING]');
 		}
-		lines.push(`${watcher.request.path}\t${decorations.length > 0 ? decorations.join(' ') + ' ' : ''}(${requestDetailsToString(watcher.request)})`);
+		lines.push(` ${watcher.request.path}\t${decorations.length > 0 ? decorations.join(' ') + ' ' : ''}(${requestDetailsToString(watcher.request)})`);
 	}
 }