Merge pull request #180 from microsoft/connor4312/cpuprofile-sorting

fix: inflated inline metrics for profiles, stall opening cpu profile

Author: connor4312

package-lock.json

@@ -20,14 +20,13 @@ export abstract class ProfileAnnotations<TNode extends INode> {
 
   public add(rootPath: string | undefined, node: TNode) {
     const expand = once(() => {
-      this.set(
-        node.callFrame.url,
-        new Position(
-          Math.max(0, node.callFrame.lineNumber),
-          Math.max(0, node.callFrame.columnNumber),
-        ),
-        node,
+      const seen = new Set<string>();
+      const basePosition = new Position(
+        Math.max(0, node.callFrame.lineNumber),
+        Math.max(0, node.callFrame.columnNumber),
       );
+      seen.add(`${node.callFrame.url}/${basePosition.line}`);
+      this.set(node.callFrame.url, basePosition, node);
 
       const src = node.src;
       if (
@@ -40,11 +39,16 @@ export abstract class ProfileAnnotations<TNode extends INode> {
       }
 
       for (const path of getCandidateDiskPaths(rootPath, src.source)) {
-        this.set(
-          path,
-          new Position(Math.max(0, src.lineNumber - 1), Math.max(0, src.columnNumber - 1)),
-          node,
+        const position = new Position(
+          Math.max(0, src.lineNumber - 1),
+          Math.max(0, src.columnNumber - 1),
         );
+
+        const key = `${path}/${position.line}`;
+        if (!seen.has(key)) {
+          seen.add(key);
+          this.set(path, position, node);
+        }
       }
     });
 

packages/vscode-js-profile-core/src/profileAnnotations.ts

@@ -62,8 +62,12 @@ export class DataProvider<T> {
     }
   }
 
-  /** Recursively updates the sorting used for data in the provider. */
+  /** Updates the sorting used for data in the provider. */
   public setSort(sort?: (a: T, b: T) => number) {
+    if (sort === this.sortFn) {
+      return;
+    }
+
     this.sortFn = sort;
     if (!this.eof) {
       // if we didn't read all the data from the provider, we need to throw away
@@ -73,10 +77,6 @@ export class DataProvider<T> {
     } else if (this.data) {
       this.data.sort(sort);
     }
-
-    for (const child of this.children.values()) {
-      child.setSort(sort);
-    }
   }
 
   /** Gets a data provider for the children of the item. */
@@ -87,6 +87,8 @@ export class DataProvider<T> {
       this.children.set(item, children);
     }
 
+    children.setSort(this.sortFn); // sort lazily
+
     return children;
   }
 

packages/vscode-js-profile-core/src/ql/index.ts

@@ -1,7 +1,7 @@
 {
   "name": "vscode-js-profile-flame",
   "displayName": "Flame Chart Visualizer for JavaScript Profiles",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Flame graph visualizer for Heap and CPU profiles taken from the JavaScript debugger",
   "author": "Connor Peet <[email protected]>",
   "homepage": "https://github.com/microsoft/vscode-js-profile-visualizer#readme",

packages/vscode-js-profile-flame/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-js-profile-table",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "displayName": "Table Visualizer for JavaScript Profiles",
   "description": "Text visualizer for profiles taken from the JavaScript debugger",
   "author": "Connor Peet <[email protected]>",

packages/vscode-js-profile-flame/package.json

@@ -19,8 +19,8 @@ import ImpactBar from '../common/impact-bar';
 import styles from '../common/time-view.css';
 import { SortFn } from '../common/types';
 
-const selfTime: SortFn<IGraphNode> = n => n.selfTime;
-const aggTime: SortFn<IGraphNode> = n => n.aggregateTime;
+const selfTime: SortFn<IGraphNode> = (a, b) => b.selfTime - a.selfTime;
+const aggTime: SortFn<IGraphNode> = (a, b) => b.aggregateTime - a.aggregateTime;
 
 const BaseTimeView = makeBaseTimeView<IGraphNode>();
 

packages/vscode-js-profile-table/package-lock.json

@@ -19,8 +19,10 @@ import ImpactBar from '../common/impact-bar';
 import styles from '../common/time-view.css';
 import { SortFn } from '../common/types';
 
-const selfSize: SortFn<ITreeNode> = n => (n as IHeapProfileNode).selfSize;
-const totalSize: SortFn<ITreeNode> = n => (n as IHeapProfileNode).totalSize;
+const selfSize: SortFn<ITreeNode> = (a, b) =>
+  (b as IHeapProfileNode).selfSize - (a as IHeapProfileNode).selfSize;
+const totalSize: SortFn<ITreeNode> = (a, b) =>
+  (b as IHeapProfileNode).totalSize - (a as IHeapProfileNode).totalSize;
 
 const BaseTimeView = makeBaseTimeView<ITreeNode>();