fix: timings in table visualizer being incorrect

Author: connor4312

.vscode/launch.json

@@ -10,6 +10,9 @@
 			"type": "pwa-extensionHost",
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
+			"debugWebviews": {
+				"webRoot": "${workspaceFolder}/packages/vscode-js-profile-table"
+			},
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}/packages/vscode-js-profile-table",
 				"--extensionDevelopmentPath=${workspaceFolder}/packages/vscode-js-profile-flame",

packages/vscode-js-profile-core/src/cpu/bottomUpGraph.ts

@@ -49,7 +49,6 @@ export class BottomUpNode implements IGraphNode {
   public addNode(node: IComputedNode) {
     this.selfTime += node.selfTime;
     this.aggregateTime += node.aggregateTime;
-    this.parent?.addNode(node);
   }
 
   public toJSON(): IGraphNode {
@@ -66,36 +65,35 @@ export class BottomUpNode implements IGraphNode {
   }
 }
 
-const processNode = (aggregate: BottomUpNode, node: IComputedNode, model: IProfileModel) => {
+const processNode = (
+  aggregate: BottomUpNode,
+  node: IComputedNode,
+  model: IProfileModel,
+  initialNode = node,
+) => {
   let child = aggregate.children[node.locationId];
   if (!child) {
     child = new BottomUpNode(model.locations[node.locationId], aggregate);
     aggregate.childrenSize++;
     aggregate.children[node.locationId] = child;
   }
 
-  child.addNode(node);
+  child.addNode(initialNode);
 
   if (node.parent) {
-    processNode(child, model.nodes[node.parent], model);
+    processNode(child, model.nodes[node.parent], model, initialNode);
   }
 };
 
 /**
  * Creates a bottom-up graph of the process information
  */
 export const createBottomUpGraph = (model: IProfileModel) => {
-  const byLocation: IComputedNode[][] = new Array(model.locations.length).fill([]);
-  for (const node of model.nodes) {
-    byLocation[node.locationId].push(node);
-  }
-
   const root = BottomUpNode.root();
 
   for (const node of model.nodes) {
-    if (node.children.length === 0) {
-      processNode(root, node, model);
-    }
+    processNode(root, node, model);
+    root.addNode(node);
   }
 
   return root;

packages/vscode-js-profile-core/src/cpu/model.ts

@@ -203,6 +203,7 @@ export const buildModel = (profile: ICpuProfileRaw): IProfileModel => {
     };
   }
 
+  const { samples, timeDeltas } = profile;
   const sourceLocations = ensureSourceLocations(profile);
   const locations: ILocation[] = sourceLocations.map((l, id) => {
     const src = getBestLocation(profile, l.locations);
@@ -260,8 +261,8 @@ export const buildModel = (profile: ICpuProfileRaw): IProfileModel => {
 
   // 2. The profile samples are the 'bottom-most' node, the currently running
   // code. Sum of these in the self time.
-  for (let i = 1; i < profile.timeDeltas.length; i++) {
-    nodes[profile.samples[i] - 1].selfTime += profile.timeDeltas[i - 1];
+  for (let i = 1; i < timeDeltas.length; i++) {
+    nodes[mapId(samples[i])].selfTime += timeDeltas[i - 1];
   }
 
   // 3. Add the aggregate times for all node children and locations
@@ -275,8 +276,8 @@ export const buildModel = (profile: ICpuProfileRaw): IProfileModel => {
   return {
     nodes,
     locations,
-    samples: profile.samples.map(mapId),
-    timeDeltas: profile.timeDeltas || [],
+    samples: samples.map(mapId),
+    timeDeltas,
     rootPath: profile.$vscode?.rootPath,
     duration: profile.endTime - profile.startTime,
   };

packages/vscode-js-profile-table/src/client/time-view.tsx

@@ -182,7 +182,7 @@ export const TimeView: FunctionComponent<{
         data={rendered}
         renderRow={renderRow}
         rowHeight={25}
-        overscanCount={10}
+        overscanCount={100}
       />
     </Fragment>
   );