From e4c378d8ea0e02e3c36be60a4c845f003a36282c Mon Sep 17 00:00:00 2001
From: Jamie Wong <jamie.lf.wong@gmail.com>
Date: Thu, 7 Dec 2017 21:24:13 -0800
Subject: [PATCH] Cumulative timings

---
 flamechart.tsx | 25 +++++++++++++-------
 profile.ts     | 62 ++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/flamechart.tsx b/flamechart.tsx
index 51a615b..83b77ee 100644
--- a/flamechart.tsx
+++ b/flamechart.tsx
@@ -660,7 +660,7 @@ export class FlamechartView extends Component<FlamechartViewProps, FlamechartVie
   }
 
   static TOOLTIP_WIDTH_MAX = 300
-  static TOOLTIP_HEIGHT_MAX = 50
+  static TOOLTIP_HEIGHT_MAX = 75
 
   renderTooltip() {
     if (!this.container) return null
@@ -692,9 +692,11 @@ export class FlamechartView extends Component<FlamechartViewProps, FlamechartVie
 
     return (
       <div className={css(style.hoverTip)} style={positionStyle}>
-        <div>{hoveredNode.frame.name}</div>
-        <div>Total Time: {(hoveredNode.getTotalTime() / 1000).toFixed(2)}ms</div>
-        <div>Self Time: {(hoveredNode.getSelfTime() / 1000).toFixed(2)}ms</div>
+        <div className={css(style.hoverTipRow)}>{hoveredNode.frame.name}</div>
+        <div className={css(style.hoverTipRow)}>Total Time: {(hoveredNode.getTotalTime() / 1000).toFixed(2)}ms</div>
+        <div className={css(style.hoverTipRow)}>Self Time: {(hoveredNode.getSelfTime() / 1000).toFixed(2)}ms</div>
+        <div className={css(style.hoverTipRow)}>Cum. Total Time: {(hoveredNode.frame.getTotalTime() / 1000).toFixed(2)}ms</div>
+        <div className={css(style.hoverTipRow)}>Cum. Self Time: {(hoveredNode.frame.getSelfTime() / 1000).toFixed(2)}ms</div>
       </div>
     )
   }
@@ -716,21 +718,28 @@ export class FlamechartView extends Component<FlamechartViewProps, FlamechartVie
   }
 }
 
+const HOVERTIP_PADDING = 2
 const style = StyleSheet.create({
   hoverTip: {
     position: 'absolute',
     background: 'white',
     border: '1px solid black',
-    textOverflow: 'ellipsis',
     maxWidth: FlamechartView.TOOLTIP_WIDTH_MAX,
-    maxHeight: FlamechartView.TOOLTIP_HEIGHT_MAX,
     overflow: 'hidden',
-    whiteSpace: 'nowrap',
-    padding: 2,
+    paddingTop: HOVERTIP_PADDING,
+    paddingBottom: HOVERTIP_PADDING,
     pointerEvents: 'none',
     fontSize: FontSize.LABEL,
     fontFamily: FontFamily.MONOSPACE
   },
+  hoverTipRow: {
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+    overflow: 'hidden',
+    paddingLeft: HOVERTIP_PADDING,
+    paddingRight: HOVERTIP_PADDING,
+    maxWidth: FlamechartView.TOOLTIP_WIDTH_MAX,
+  },
   clip: {
     overflow: 'hidden'
   },
diff --git a/profile.ts b/profile.ts
index 5bf360c..5b8c5de 100644
--- a/profile.ts
+++ b/profile.ts
@@ -1,4 +1,31 @@
-export interface Frame {
+export interface FrameInfo {
+  key: string | number
+
+  // Name of the frame. May be a method name, e.g.
+  // "ActiveRecord##to_hash"
+  name: string
+
+  // File path of the code corresponding to this
+  // call stack frame.
+  file?: string
+
+  // Line in the given file where this frame occurs
+  line?: number
+
+  // Column in the file
+  col?: number
+}
+
+export class HasTimings {
+  private selfTime = 0
+  private totalTime = 0
+  getSelfTime() { return this.selfTime }
+  getTotalTime() { return this.totalTime }
+  addToTotalTime(delta: number) { this.totalTime += delta }
+  addToSelfTime(delta: number) { this.selfTime += delta }
+}
+
+export class Frame extends HasTimings {
   key: string | number
 
   // Name of the frame. May be a method name, e.g.
@@ -15,22 +42,21 @@ export interface Frame {
   // Column in the file
   col?: number
 
-  // Color, if specified, to associate with this frame.
-  // If unspecified, will be generated.
-  color?: string
+  constructor(info: FrameInfo) {
+    super()
+    this.key = info.key
+    this.name = info.name
+    this.file = info.file
+    this.line = info.line
+    this.col = info.col
+  }
 }
 
-export class CallTreeNode {
+export class CallTreeNode extends HasTimings {
   children: CallTreeNode[] = []
-  private selfTime = 0
-  private totalTime = 0
-  constructor(readonly frame: Frame, readonly parent: CallTreeNode | null) {}
-
-  getSelfTime() { return this.selfTime }
-  getTotalTime() { return this.totalTime }
-
-  addToTotalTime(delta: number) { this.totalTime += delta }
-  addToSelfTime(delta: number) { this.selfTime += delta }
+  constructor(readonly frame: Frame, readonly parent: CallTreeNode | null) {
+    super()
+  }
 }
 
 export interface ProfilingEvent {
@@ -115,12 +141,12 @@ export class Profile {
     this.frames.forEach(fn)
   }
 
-  appendSample(stack: Frame[], timeDelta: number) {
+  appendSample(stack: FrameInfo[], timeDelta: number) {
     let node: CallTreeNode | null = null
     let children = this.calltreeRoots
 
-    for (let frame of stack) {
-      frame = getOrInsert(this.frames, frame.key, frame)
+    for (let frameInfo of stack) {
+      const frame = getOrInsert(this.frames, frameInfo.key, new Frame(frameInfo))
       const last = lastOf(children)
       if (last && last.frame == frame) {
         node = last
@@ -129,11 +155,13 @@ export class Profile {
         children.push(node)
       }
       node.addToTotalTime(timeDelta)
+      node.frame.addToTotalTime(timeDelta)
       children = node.children
     }
 
     if (node) {
       node.addToSelfTime(timeDelta)
+      node.frame.addToSelfTime(timeDelta)
       this.samples.push(node)
       this.timeDeltas.push(timeDelta)
     }