Various preparations in call tree code for fast inverted tree

src/components/flame-graph/Canvas.js

@@ -33,7 +33,6 @@ import type {
   CallTreeSummaryStrategy,
   WeightType,
   SamplesLikeTable,
-  TracedTiming,
   InnerWindowID,
   Page,
 } from 'firefox-profiler/types';
@@ -49,7 +48,10 @@ import type {
   ChartCanvasHoverInfo,
 } from '../shared/chart/Canvas';
 
-import type { CallTree } from 'firefox-profiler/profile-logic/call-tree';
+import type {
+  CallTree,
+  CallTreeTimings,
+} from 'firefox-profiler/profile-logic/call-tree';
 
 export type OwnProps = {|
   +thread: Thread,
@@ -75,7 +77,7 @@ export type OwnProps = {|
   +callTreeSummaryStrategy: CallTreeSummaryStrategy,
   +samples: SamplesLikeTable,
   +unfilteredSamples: SamplesLikeTable,
-  +tracedTiming: TracedTiming | null,
+  +tracedTiming: CallTreeTimings | null,
   +displayImplementation: boolean,
   +displayStackType: boolean,
 |};
@@ -391,7 +393,7 @@ class FlameGraphCanvasImpl extends React.PureComponent<Props> {
       const time = formatCallNodeNumberWithUnit(
         'tracing-ms',
         false,
-        tracedTiming.running[callNodeIndex]
+        tracedTiming.total[callNodeIndex]
       );
       percentage = `${time} (${percentage})`;
     }

src/components/flame-graph/FlameGraph.js

@@ -42,15 +42,17 @@ import type {
   CallTreeSummaryStrategy,
   CallNodeInfo,
   IndexIntoCallNodeTable,
-  TracedTiming,
   ThreadsKey,
   InnerWindowID,
   Page,
 } from 'firefox-profiler/types';
 
 import type { FlameGraphTiming } from 'firefox-profiler/profile-logic/flame-graph';
 
-import type { CallTree } from 'firefox-profiler/profile-logic/call-tree';
+import type {
+  CallTree,
+  CallTreeTimings,
+} from 'firefox-profiler/profile-logic/call-tree';
 
 import type { ConnectedProps } from 'firefox-profiler/utils/connect';
 
@@ -87,7 +89,7 @@ type StateProps = {|
   +callTreeSummaryStrategy: CallTreeSummaryStrategy,
   +samples: SamplesLikeTable,
   +unfilteredSamples: SamplesLikeTable,
-  +tracedTiming: TracedTiming | null,
+  +tracedTiming: CallTreeTimings | null,
   +displayImplementation: boolean,
   +displayStackType: boolean,
 |};

src/components/sidebar/CallTreeSidebar.js

@@ -30,7 +30,7 @@ import type {
   ThreadsKey,
   CategoryList,
   IndexIntoCallNodeTable,
-  TracedTiming,
+  SelfAndTotal,
   Milliseconds,
   WeightType,
   IndexIntoCategoryList,
@@ -291,7 +291,7 @@ type StateProps = {|
   +timings: TimingsForPath,
   +categoryList: CategoryList,
   +weightType: WeightType,
-  +tracedTiming: TracedTiming | null,
+  +selectedNodeTracedSelfAndTotal: SelfAndTotal | null,
 |};
 
 type Props = ConnectedProps<{||}, StateProps, {||}>;
@@ -352,7 +352,7 @@ class CallTreeSidebarImpl extends React.PureComponent<Props> {
       timings,
       categoryList,
       weightType,
-      tracedTiming,
+      selectedNodeTracedSelfAndTotal,
     } = this.props;
     const {
       forPath: { selfTime, totalTime },
@@ -402,24 +402,24 @@ class CallTreeSidebarImpl extends React.PureComponent<Props> {
           <h4 className="sidebar-title3">
             <div>Call node details</div>
           </h4>
-          {tracedTiming ? (
+          {selectedNodeTracedSelfAndTotal ? (
             <SidebarDetail
               label="Traced running time"
               value={formatMilliseconds(
-                tracedTiming.running[selectedNodeIndex],
+                selectedNodeTracedSelfAndTotal.total,
                 3,
                 1
               )}
             ></SidebarDetail>
           ) : null}
-          {tracedTiming ? (
+          {selectedNodeTracedSelfAndTotal ? (
             <SidebarDetail
               label="Traced self time"
               value={
-                tracedTiming.self[selectedNodeIndex] === 0
+                selectedNodeTracedSelfAndTotal.self === 0
                   ? '—'
                   : formatMilliseconds(
-                      tracedTiming.self[selectedNodeIndex],
+                      selectedNodeTracedSelfAndTotal.self,
                       3,
                       1
                     )
@@ -507,7 +507,8 @@ export const CallTreeSidebar = explicitConnect<{||}, StateProps, {||}>({
     timings: selectedNodeSelectors.getTimingsForSidebar(state),
     categoryList: getCategories(state),
     weightType: selectedThreadSelectors.getWeightTypeForCallTree(state),
-    tracedTiming: selectedThreadSelectors.getTracedTiming(state),
+    selectedNodeTracedSelfAndTotal:
+      selectedThreadSelectors.getTracedSelfAndTotalForSelectedCallNode(state),
   }),
   component: CallTreeSidebarImpl,
 });