WIP traced value support

Author: squarewave

package.json

@@ -120,7 +120,6 @@
     "babel-loader": "^9.2.1",
     "babel-plugin-module-resolver": "^5.0.2",
     "browserslist": "^4.24.3",
-    "caniuse-lite": "^1.0.30001690",
     "circular-dependency-plugin": "^5.2.1",
     "codecov": "^3.8.3",
     "copy-webpack-plugin": "^12.0.2",

src/components/stack-chart/Canvas.js

@@ -20,6 +20,7 @@ import {
   typeof changeMouseTimePosition as ChangeMouseTimePosition,
 } from '../../actions/profile-view';
 import { mapCategoryColorNameToStackChartStyles } from '../../utils/colors';
+import { getArgvSummaries } from '../../utils/value-summaries';
 import { TooltipCallNode } from '../tooltip/CallNode';
 import { TooltipMarker } from '../tooltip/Marker';
 
@@ -97,6 +98,7 @@ const TEXT_CSS_PIXELS_OFFSET_TOP = 11;
 const FONT_SIZE = 10;
 const BORDER_OPACITY = 0.4;
 
+
 class StackChartCanvasImpl extends React.PureComponent<Props> {
   _textMeasurement: null | TextMeasurement;
   _textMeasurementCssToDeviceScale: number = 1;
@@ -467,12 +469,18 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
       );
     }
 
+
     const callNodeIndex = timing.callNode[stackTimingIndex];
     if (callNodeIndex === undefined) {
       return null;
     }
     const duration =
       timing.end[stackTimingIndex] - timing.start[stackTimingIndex];
+    const argv = timing.argv[stackTimingIndex];
+    let argvSummaries = undefined;
+    if (argv != -1) {
+      argvSummaries = getArgvSummaries(thread, argv);
+    }
 
     return (
       <TooltipCallNode
@@ -487,6 +495,7 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
         callTreeSummaryStrategy="timing"
         durationText={formatMilliseconds(duration)}
         displayStackType={displayStackType}
+        argv={JSON.stringify(argvSummaries, null, 2) || null}
       />
     );
   };

src/components/tooltip/CallNode.js

@@ -129,6 +129,7 @@ type Props = {|
   +timings?: TimingsForPath,
   +callTreeSummaryStrategy: CallTreeSummaryStrategy,
   +displayStackType: boolean,
+  +argv?: string | null,
 |};
 
 /**
@@ -358,6 +359,7 @@ export class TooltipCallNode extends React.PureComponent<Props> {
       thread,
       durationText,
       categories,
+      argv,
       displayData,
       timings,
       callTreeSummaryStrategy,
@@ -424,6 +426,18 @@ export class TooltipCallNode extends React.PureComponent<Props> {
       ];
     }
 
+    let argvEl = null;
+    if (argv) {
+      argvEl = [
+        <div className="tooltipLabel" key="resource">
+          Arguments:
+        </div>,
+      ];
+      for (let line of argv.split("\n")) {
+        argvEl.push(line);
+      }
+    }
+
     // Finding current frame and parent frame URL(if there is).
     let pageAndParentPageURL;
     if (innerWindowIDToPageMap) {
@@ -538,6 +552,7 @@ export class TooltipCallNode extends React.PureComponent<Props> {
             {pageAndParentPageURL}
             {fileName}
             {resource}
+            {argvEl}
           </div>
           {this._renderCategoryTimings(timings)}
         </div>

src/profile-logic/data-structures.js

@@ -89,6 +89,7 @@ export function getEmptySamplesTableWithEventDelay(): RawSamplesTable {
     eventDelay: [],
     stack: [],
     time: [],
+    argv: [],
     length: 0,
   };
 }
@@ -109,6 +110,7 @@ export function getEmptySamplesTableWithResponsiveness(): SamplesTable {
     responsiveness: [],
     stack: [],
     time: [],
+    argv: [],
     length: 0,
   };
 }

src/profile-logic/process-profile.js

@@ -19,6 +19,7 @@ import {
 } from './data-structures';
 import { immutableUpdate, ensureExists, coerce } from '../utils/flow';
 import { verifyMagic, SIMPLEPERF as SIMPLEPERF_MAGIC } from '../utils/magic';
+import { base64StringToArrayBuffer } from '../utils/value-summaries';
 import { attemptToUpgradeProcessedProfileThroughMutation } from './processed-profile-versioning';
 import { upgradeGeckoProfileToCurrentVersion } from './gecko-profile-versioning';
 import {
@@ -967,6 +968,10 @@ function _processSamples(geckoSamples: GeckoSampleStruct): RawSamplesTable {
     }
   }
 
+  if (geckoSamples.argv) {
+    samples.argv = geckoSamples.argv;
+  }
+
   if (geckoSamples.eventDelay) {
     samples.eventDelay = geckoSamples.eventDelay;
   } else if (geckoSamples.responsiveness) {
@@ -1204,6 +1209,17 @@ function _processThread(
     newThread.nativeAllocations = nativeAllocations;
   }
 
+  if (thread.values) {
+    var buffer = base64StringToArrayBuffer(thread.values);
+    if (buffer) {
+      newThread.argvBuffer = buffer;
+    }
+  }
+
+  if (thread.shapes) {
+    newThread.shapes = thread.shapes;
+  }
+
   function processJsTracer() {
     // Optionally extract the JS Tracer information, if they exist.
     const { jsTracerEvents } = thread;

src/profile-logic/profile-data.js

@@ -1673,6 +1673,13 @@ export function filterThreadSamplesToRange(
     );
   }
 
+  if (samples.argv) {
+    newSamples.argv = samples.argv.slice(
+      beginSampleIndex,
+      endSampleIndex
+    );
+  }
+
   if (samples.threadId) {
     newSamples.threadId = samples.threadId.slice(
       beginSampleIndex,
@@ -1799,6 +1806,13 @@ export function filterRawThreadSamplesToRange(
     );
   }
 
+  if (samples.argv) {
+    newSamples.argv = samples.argv.slice(
+      beginSampleIndex,
+      endSampleIndex
+    );
+  }
+
   if (samples.threadId) {
     newSamples.threadId = samples.threadId.slice(
       beginSampleIndex,
@@ -1907,6 +1921,10 @@ export function filterCounterSamplesToRange(
       : undefined,
   };
 
+  if (samples.argv) {
+    newCounter.argv = samples.argv.slice(beginSampleIndex, endSampleIndex);
+  }
+
   return newCounter;
 }
 
@@ -2345,6 +2363,7 @@ export function computeSamplesTableFromRawSamplesTable(
   const {
     responsiveness,
     eventDelay,
+    argv,
     stack,
     weight,
     weightType,
@@ -2371,6 +2390,7 @@ export function computeSamplesTableFromRawSamplesTable(
     // These fields are copied from the raw samples table:
     responsiveness,
     eventDelay,
+    argv,
     stack,
     weight,
     weightType,
@@ -2417,6 +2437,8 @@ export function createThreadFromDerivedTables(
     jsTracer,
     isPrivateBrowsing,
     userContextId,
+    argvBuffer,
+    shapes,
   } = rawThread;
 
   const thread: Thread = {
@@ -2445,6 +2467,8 @@ export function createThreadFromDerivedTables(
     jsTracer,
     isPrivateBrowsing,
     userContextId,
+    argvBuffer,
+    shapes,
 
     // These fields are derived:
     samples,

src/profile-logic/stack-timing.js

@@ -51,6 +51,7 @@ export type StackTiming = {|
   start: Milliseconds[],
   end: Milliseconds[],
   callNode: IndexIntoCallNodeTable[],
+  argv: number[],
   length: number,
 |};
 
@@ -76,6 +77,7 @@ export function getStackTimingByDepth(
     start: [],
     end: [],
     callNode: [],
+    argv: [],
     length: 0,
   }));
 
@@ -105,9 +107,14 @@ export function getStackTimingByDepth(
   let deepestOpenBoxCallNodeIndex = -1;
   let deepestOpenBoxDepth = -1;
   const openBoxStartTimeByDepth = new Float64Array(maxDepthPlusOne);
+  const openBoxArgvByDepth = new Int32Array(maxDepthPlusOne);
 
   for (let sampleIndex = 0; sampleIndex < samples.length; sampleIndex++) {
     const sampleTime = samples.time[sampleIndex];
+    let sampleArgv : number = -1; 
+    if (samples.argv) {
+      sampleArgv = samples.argv[sampleIndex];
+    }
     const thisCallNodeIndex = sampleCallNodes[sampleIndex] ?? -1;
     if (thisCallNodeIndex === deepestOpenBoxCallNodeIndex) {
       continue;
@@ -134,10 +141,12 @@ export function getStackTimingByDepth(
       // deepestOpenBoxCallNodeIndex is *not* an ancestors of thisCallNodeIndex.
       // Commit this box.
       const start = openBoxStartTimeByDepth[deepestOpenBoxDepth];
+      const argv = openBoxArgvByDepth[deepestOpenBoxDepth];
       const stackTimingForThisDepth = stackTimingByDepth[deepestOpenBoxDepth];
       const index = stackTimingForThisDepth.length++;
       stackTimingForThisDepth.start[index] = start;
       stackTimingForThisDepth.end[index] = sampleTime;
+      stackTimingForThisDepth.argv[index] = argv;
       stackTimingForThisDepth.callNode[index] = deepestOpenBoxCallNodeIndex;
       deepestOpenBoxCallNodeIndex =
         callNodeTablePrefixColumn[deepestOpenBoxCallNodeIndex];
@@ -153,6 +162,7 @@ export function getStackTimingByDepth(
       while (deepestOpenBoxDepth < thisCallNodeDepth) {
         deepestOpenBoxDepth++;
         openBoxStartTimeByDepth[deepestOpenBoxDepth] = sampleTime;
+        openBoxArgvByDepth[deepestOpenBoxDepth] = sampleArgv;
       }
     }
 
@@ -166,8 +176,10 @@ export function getStackTimingByDepth(
     const stackTimingForThisDepth = stackTimingByDepth[deepestOpenBoxDepth];
     const index = stackTimingForThisDepth.length++;
     const start = openBoxStartTimeByDepth[deepestOpenBoxDepth];
+    const argv = openBoxArgvByDepth[deepestOpenBoxDepth];
     stackTimingForThisDepth.start[index] = start;
     stackTimingForThisDepth.end[index] = endTime;
+    stackTimingForThisDepth.argv[index] = argv;
     stackTimingForThisDepth.callNode[index] = deepestOpenBoxCallNodeIndex;
     deepestOpenBoxCallNodeIndex =
       callNodeTablePrefixColumn[deepestOpenBoxCallNodeIndex];

src/test/fixtures/profiles/processed-profile.js

@@ -2117,6 +2117,9 @@ export function addInnerWindowIdToStacks(
       if (samples.responsiveness) {
         samples.responsiveness.push(samples.responsiveness[sampleIndex]);
       }
+      if (samples.argv) {
+        samples.argv.push(samples.argv[sampleIndex]);
+      }
       if (samples.threadCPUDelta) {
         samples.threadCPUDelta.push(samples.threadCPUDelta[sampleIndex]);
       }

src/types/gecko-profile.js

@@ -120,6 +120,7 @@ export type GeckoSamples = {|
         stack: 0,
         time: 1,
         eventDelay: 2,
+        argv?: 3,
         threadCPUDelta?: 3,
       |},
   data: Array<
@@ -154,6 +155,7 @@ export type GeckoSampleStructWithResponsiveness = {|
   // versions may not have it or that feature could be disabled. No upgrader was
   // written for this change because it's a completely new data source.
   threadCPUDelta?: Array<number | null>,
+  argv?: Array<number | null>,
   length: number,
 |};
 
@@ -168,6 +170,7 @@ export type GeckoSampleStructWithEventDelay = {|
   // versions may not have it or that feature could be disabled. No upgrader was
   // written for this change because it's a completely new data source.
   threadCPUDelta?: Array<number | null>,
+  argv?: Array<number | null>,
   length: number,
 |};
 
@@ -276,6 +279,8 @@ export type GeckoThread = {|
   stackTable: GeckoStackTable,
   stringTable: string[],
   jsTracerEvents?: JsTracerTable,
+  values?: string,
+  shapes?: Array<?Array<string>>,
 |};
 
 export type GeckoExtensionMeta = {|

src/types/profile-derived.js

@@ -132,6 +132,7 @@ export type SamplesTable = {|
   // This property isn't present in normal threads. However it's present for
   // merged threads, so that we know the origin thread for these samples.
   threadId?: Tid[],
+  argv?: Array<number | null>,
   length: number,
 |};
 

src/types/profile.js

@@ -118,6 +118,7 @@ export type RawSamplesTable = {|
   time?: Milliseconds[],
   // If the `time` column is not present, then the `timeDeltas` column must be present.
   timeDeltas?: Milliseconds[],
+  argv?: Array<number | null>,
   // An optional weight array. If not present, then the weight is assumed to be 1.
   // See the WeightType type for more information.
   weight: null | number[],
@@ -133,6 +134,7 @@ export type RawSamplesTable = {|
   // This property isn't present in normal threads. However it's present for
   // merged threads, so that we know the origin thread for these samples.
   threadId?: Tid[],
+  argv?: Array<number | null>,
   length: number,
 |};
 
@@ -636,7 +638,9 @@ export type RawThread = {|
   // It's absent in Firefox 97 and before, or in Firefox 98+ when this thread
   // had no extra attribute at all.
   userContextId?: number,
-|};
+  argvBuffer?: ArrayBuffer,
+  shapes?: Array<?Array<string>>,
+  |};
 
 export type ExtensionTable = {|
   baseURL: string[],