Share stringTable between threads.

Author: mstange

src/actions/receive-profile.js

@@ -397,7 +397,7 @@ export function finalizeFullProfileView(
         const thread = profile.threads[threadIndex];
         const { samples, jsAllocations, nativeAllocations } = thread;
         hasSamples = [samples, jsAllocations, nativeAllocations].some((table) =>
-          hasUsefulSamples(table?.stack, thread)
+          hasUsefulSamples(table?.stack, thread, profile.shared)
         );
         if (hasSamples) {
           break;
@@ -793,20 +793,23 @@ export function bulkProcessSymbolicationSteps(
   symbolicationStepsPerThread: Map<ThreadIndex, SymbolicationStepInfo[]>
 ): ThunkAction<void> {
   return (dispatch, getState) => {
-    const { threads } = getProfile(getState());
+    const profile = getProfile(getState());
     const oldFuncToNewFuncsMaps: Map<ThreadIndex, FuncToFuncsMap> = new Map();
-    const symbolicatedThreads = threads.map((oldThread, threadIndex) => {
-      const symbolicationSteps = symbolicationStepsPerThread.get(threadIndex);
-      if (symbolicationSteps === undefined) {
-        return oldThread;
+    const symbolicatedThreads = profile.threads.map(
+      (oldThread, threadIndex) => {
+        const symbolicationSteps = symbolicationStepsPerThread.get(threadIndex);
+        if (symbolicationSteps === undefined) {
+          return oldThread;
+        }
+        const { thread, oldFuncToNewFuncsMap } = applySymbolicationSteps(
+          oldThread,
+          profile.shared,
+          symbolicationSteps
+        );
+        oldFuncToNewFuncsMaps.set(threadIndex, oldFuncToNewFuncsMap);
+        return thread;
       }
-      const { thread, oldFuncToNewFuncsMap } = applySymbolicationSteps(
-        oldThread,
-        symbolicationSteps
-      );
-      oldFuncToNewFuncsMaps.set(threadIndex, oldFuncToNewFuncsMap);
-      return thread;
-    });
+    );
     dispatch({
       type: 'BULK_SYMBOLICATION',
       oldFuncToNewFuncsMaps,
@@ -1895,7 +1898,7 @@ export function changeTabFilter(tabID: TabID | null): ThunkAction<void> {
         const thread = profile.threads[threadIndex];
         const { samples, jsAllocations, nativeAllocations } = thread;
         hasSamples = [samples, jsAllocations, nativeAllocations].some((table) =>
-          hasUsefulSamples(table?.stack, thread)
+          hasUsefulSamples(table?.stack, thread, profile.shared)
         );
         if (hasSamples) {
           break;

src/app-logic/constants.js

@@ -14,7 +14,7 @@ export const GECKO_PROFILE_VERSION = 31;
 // The current version of the "processed" profile format.
 // Please don't forget to update the processed profile format changelog in
 // `docs-developer/CHANGELOG-formats.md`.
-export const PROCESSED_PROFILE_VERSION = 53;
+export const PROCESSED_PROFILE_VERSION = 54;
 
 // The following are the margin sizes for the left and right of the timeline. Independent
 // components need to share these values.

src/components/js-tracer/Chart.js

@@ -15,6 +15,7 @@ import { JsTracerCanvas } from './Canvas';
 import {
   getCommittedRange,
   getPreviewSelection,
+  getStringTable,
 } from 'firefox-profiler/selectors/profile';
 import { selectedThreadSelectors } from 'firefox-profiler/selectors/per-thread';
 import { getSelectedThreadsKey } from 'firefox-profiler/selectors/url-state';
@@ -136,7 +137,7 @@ const JsTracerExpensiveChart = explicitConnect<
 >({
   mapStateToProps: (state, ownProps) => ({
     timeRange: getCommittedRange(state),
-    stringTable: selectedThreadSelectors.getStringTable(state),
+    stringTable: getStringTable(state),
     threadsKey: getSelectedThreadsKey(state),
     previewSelection: getPreviewSelection(state),
     jsTracerTimingRows: ensureExists(

src/profile-logic/active-tab.js

@@ -66,14 +66,15 @@ export function computeActiveTabTracks(
   const screenshots = [];
   const topmostInnerWindowIDs = getTopmostInnerWindowIDs(relevantPages);
   const innerWindowIDToPageMap = _getInnerWindowIDToPageMap(relevantPages);
+  const { stringArray } = profile.shared;
 
   for (
     let threadIndex = 0;
     threadIndex < profile.threads.length;
     threadIndex++
   ) {
     const thread = profile.threads[threadIndex];
-    const { markers, stringArray } = thread;
+    const { markers } = thread;
 
     if (thread.isMainThread) {
       // This is a main thread, there is a possibility that it can be a global

src/profile-logic/data-structures.js

@@ -399,7 +399,6 @@ export function getEmptyThread(overrides?: $Shape<RawThread>): RawThread {
     markers: getEmptyRawMarkerTable(),
     stackTable: getEmptyRawStackTable(),
     frameTable: getEmptyFrameTable(),
-    stringArray: [],
     funcTable: getEmptyFuncTable(),
     resourceTable: getEmptyResourceTable(),
     nativeSymbols: getEmptyNativeSymbolTable(),
@@ -438,6 +437,9 @@ export function getEmptyProfile(): Profile {
     },
     libs: [],
     pages: [],
+    shared: {
+      stringArray: [],
+    },
     threads: [],
   };
 }

src/profile-logic/import/chrome.js

@@ -514,6 +514,8 @@ async function processTracingEvents(
   // new samples on our target interval of 500us.
   profile.meta.interval = 0.5;
 
+  const stringTable = StringTable.withBackingArray(profile.shared.stringArray);
+
   let profileEvents: (ProfileEvent | CpuProfileEvent)[] =
     (eventsByName.get('Profile'): any) || [];
 
@@ -579,13 +581,10 @@ async function processTracingEvents(
         funcTable,
         frameTable,
         stackTable,
-        stringArray,
         samples: samplesTable,
         resourceTable,
       } = thread;
 
-      const stringTable = StringTable.withBackingArray(stringArray);
-
       if (nodes) {
         const parentMap = new Map();
         for (const node of nodes) {
@@ -842,7 +841,7 @@ async function extractScreenshots(
     screenshots[0]
   );
 
-  const stringTable = StringTable.withBackingArray(thread.stringArray);
+  const stringTable = StringTable.withBackingArray(profile.shared.stringArray);
 
   const graphicsIndex = ensureExists(profile.meta.categories).findIndex(
     (category) => category.name === 'Graphics'
@@ -933,6 +932,8 @@ function extractMarkers(
     throw new Error('No "Other" category in empty profile category list');
   }
 
+  const stringTable = StringTable.withBackingArray(profile.shared.stringArray);
+
   profile.meta.markerSchema = [
     {
       name: 'EventDispatch',
@@ -999,8 +1000,7 @@ function extractMarkers(
           event
         );
         const { thread } = threadInfo;
-        const { markers, stringArray } = thread;
-        const stringTable = StringTable.withBackingArray(stringArray);
+        const { markers } = thread;
         let argData: MixedObject | null = null;
         if (event.args && typeof event.args === 'object') {
           argData = (event.args: any).data || null;

src/profile-logic/import/dhat.js

@@ -180,10 +180,10 @@ export function attemptToConvertDhat(json: mixed): Profile | null {
   const profile = getEmptyProfile();
   profile.meta.product = dhat.cmd + ' (dhat)';
   profile.meta.importedFrom = `dhat`;
+  const stringTable = StringTable.withBackingArray(profile.shared.stringArray);
 
   const allocationsTable = getEmptyUnbalancedNativeAllocationsTable();
-  const { funcTable, stringArray, stackTable, frameTable } = getEmptyThread();
-  const stringTable = StringTable.withBackingArray(stringArray);
+  const { funcTable, stackTable, frameTable } = getEmptyThread();
 
   const funcKeyToFuncIndex = new Map<string, IndexIntoFuncTable>();
 
@@ -373,7 +373,6 @@ export function attemptToConvertDhat(json: mixed): Profile | null {
     thread.pid = dhat.pid;
     thread.tid = i;
     thread.name = name;
-    thread.stringArray = stringTable.getBackingArray();
 
     thread.funcTable.name = funcTable.name.slice();
     thread.funcTable.isJS = funcTable.isJS.slice();

src/profile-logic/import/simpleperf.js

@@ -220,24 +220,30 @@ class FirefoxThread {
   tid: number;
   pid: number;
 
-  stringArray = [];
-  strings = StringTable.withBackingArray(this.stringArray);
+  strings: StringTable;
 
   sampleTable: RawSamplesTable = getEmptySamplesTable();
 
-  stackTable: FirefoxSampleTable = new FirefoxSampleTable(this.strings);
-  frameTable: FirefoxFrameTable = new FirefoxFrameTable(this.strings);
-  funcTable: FirefoxFuncTable = new FirefoxFuncTable(this.strings);
-  resourceTable: FirefoxResourceTable = new FirefoxResourceTable(this.strings);
+  stackTable: FirefoxSampleTable;
+  frameTable: FirefoxFrameTable;
+  funcTable: FirefoxFuncTable;
+  resourceTable: FirefoxResourceTable;
 
   cpuClockEventId: number = -1;
 
-  constructor(thread: report.IThread) {
+  constructor(thread: report.IThread, stringTable: StringTable) {
     this.tid = thread.threadId;
     this.pid = thread.processId;
 
     this.isMainThread = thread.threadId === thread.processId;
     this.name = thread.threadName ?? '';
+
+    this.strings = stringTable;
+
+    this.stackTable = new FirefoxSampleTable(this.strings);
+    this.frameTable = new FirefoxFrameTable(this.strings);
+    this.funcTable = new FirefoxFuncTable(this.strings);
+    this.resourceTable = new FirefoxResourceTable(this.strings);
   }
 
   toJson(): RawThread {
@@ -256,7 +262,6 @@ class FirefoxThread {
       markers: getEmptyRawMarkerTable(),
       stackTable: this.stackTable.toJson(),
       frameTable: this.frameTable.toJson(),
-      stringArray: this.stringArray,
       funcTable: this.funcTable.toJson(),
       resourceTable: this.resourceTable.toJson(),
       nativeSymbols: getEmptyNativeSymbolTable(),
@@ -355,10 +360,16 @@ class FirefoxProfile {
   sampleCount: number = 0;
   lostCount: number = 0;
 
+  stringArray = [];
+  stringTable = StringTable.withBackingArray(this.stringArray);
+
   toJson(): Profile {
     return {
       meta: this.getProfileMeta(),
       libs: [],
+      shared: {
+        stringArray: this.stringArray,
+      },
       threads: this.threads.map((thread) => thread.toJson()),
     };
   }
@@ -438,7 +449,7 @@ class FirefoxProfile {
   }
 
   addThread(thread: report.IThread) {
-    const firefoxThread = new FirefoxThread(thread);
+    const firefoxThread = new FirefoxThread(thread, this.stringTable);
     this.threads.push(firefoxThread);
     this.threadMap.set(thread.threadId, firefoxThread);
   }

src/profile-logic/js-tracer.js

@@ -772,10 +772,10 @@ export function getJsTracerFixed(jsTracer: JsTracerTable): JsTracerFixed {
 export function convertJsTracerToThread(
   fromThread: RawThread,
   jsTracer: JsTracerTable,
-  categories: CategoryList
+  categories: CategoryList,
+  stringTable: StringTable
 ): RawThread {
   const jsTracerFixed = getJsTracerFixed(jsTracer);
-  const stringTable = StringTable.withBackingArray(fromThread.stringArray);
   const { thread, stackMap } = convertJsTracerToThreadWithoutSamples(
     fromThread,
     stringTable,

src/profile-logic/marker-data.js

@@ -22,6 +22,7 @@ import {
 import type {
   SamplesTable,
   RawThread,
+  RawProfileSharedData,
   RawMarkerTable,
   IndexIntoStringTable,
   IndexIntoRawMarkerTable,
@@ -400,7 +401,8 @@ export class IPCMarkerCorrelations {
  *                   (or main thread in receiver process if they are not profiled)
  */
 export function correlateIPCMarkers(
-  threads: RawThread[]
+  threads: RawThread[],
+  shared: RawProfileSharedData
 ): IPCMarkerCorrelations {
   // Create a unique ID constructed from the source PID, destination PID,
   // message seqno, and message type. Since the seqno is only unique for each
@@ -465,6 +467,8 @@ export function correlateIPCMarkers(
     }
   }
 
+  const stringTable = StringTable.withBackingArray(shared.stringArray);
+
   // First, construct a mapping of marker IDs to an array of markers with that
   // ID for faster lookup. We also collect the friendly thread names while we
   // have access to all the threads. It's considerably more difficult to do
@@ -478,7 +482,6 @@ export function correlateIPCMarkers(
     // Don't bother checking for IPC markers if this thread's string table
     // doesn't have the string "IPC". This lets us avoid looping over all the
     // markers when we don't have to.
-    const stringTable = StringTable.withBackingArray(thread.stringArray);
     if (!stringTable.hasString('IPC')) {
       continue;
     }
@@ -1625,3 +1628,23 @@ export const stringsToMarkerRegExps = (
     fieldMap,
   };
 };
+
+export function computeStringIndexMarkerFieldsByDataType(
+  markerSchemas: MarkerSchema[]
+): Map<string, string[]> {
+  const stringIndexMarkerFieldsByDataType = new Map();
+  stringIndexMarkerFieldsByDataType.set('CompositorScreenshot', ['url']);
+  for (const schema of markerSchemas) {
+    const { name, data } = schema;
+    const stringIndexFields = [];
+    for (const field of data) {
+      if (field.format === 'unique-string' && field.key) {
+        stringIndexFields.push(field.key);
+      }
+    }
+    if (stringIndexFields.length !== 0) {
+      stringIndexMarkerFieldsByDataType.set(name, stringIndexFields);
+    }
+  }
+  return stringIndexMarkerFieldsByDataType;
+}