From f2f27d625475398a511d6f1624679fe01c731945 Mon Sep 17 00:00:00 2001
From: Charles Dick <cwdick@fb.com>
Date: Wed, 17 Aug 2016 03:31:20 -0700
Subject: [PATCH] add marked block overhead to JSC heap capture aggrow

Reviewed By: bnham

Differential Revision: D3728678

fbshipit-source-id: 2c17003449dddb0ea68d3f6b097fd7704758cf5f
---
 .../middleware/heapCapture/out/heapCapture.js | 23 +++++++++++++++----
 .../middleware/heapCapture/src/heapCapture.js | 13 +++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/local-cli/server/middleware/heapCapture/out/heapCapture.js b/local-cli/server/middleware/heapCapture/out/heapCapture.js
index 9de5bc21f..97ee4b88a 100644
--- a/local-cli/server/middleware/heapCapture/out/heapCapture.js
+++ b/local-cli/server/middleware/heapCapture/out/heapCapture.js
@@ -204,6 +204,9 @@ var rowCount=0;
 for(var id in capture.refs){// eslint-disable-line no-unused-vars
 rowCount++;
 }
+for(var _id3 in capture.markedBlocks){// eslint-disable-line no-unused-vars
+rowCount++;
+}
 console.log(
 'increasing row data from '+(this.data.length*4).toString()+'B to '+
 (this.data.length*4+rowCount*numFields*4).toString()+'B');
@@ -221,18 +224,18 @@ this.stacks,
 reactComponentTreeMap);
 
 var internedCaptureId=this.strings.intern(captureId);
-for(var _id3 in capture.refs){
-var ref=capture.refs[_id3];
-newData[dataOffset+idField]=parseInt(_id3,16);
+for(var _id4 in capture.refs){
+var ref=capture.refs[_id4];
+newData[dataOffset+idField]=parseInt(_id4,16);
 newData[dataOffset+typeField]=this.strings.intern(getTypeName(ref));
 newData[dataOffset+sizeField]=ref.size;
 newData[dataOffset+traceField]=internedCaptureId;
-var pathNode=rootPathMap[_id3];
+var pathNode=rootPathMap[_id4];
 if(pathNode===undefined){
 throw'did not find path for ref!';
 }
 newData[dataOffset+pathField]=pathNode.id;
-var reactTree=reactComponentTreeMap[_id3];
+var reactTree=reactComponentTreeMap[_id4];
 if(reactTree===undefined){
 newData[dataOffset+reactField]=
 this.stacks.insert(this.stacks.root,'<not-under-tree>').id;
@@ -241,6 +244,16 @@ newData[dataOffset+reactField]=reactTree.id;
 }
 dataOffset+=numFields;
 }
+for(var _id5 in capture.markedBlocks){
+var block=capture.markedBlocks[_id5];
+newData[dataOffset+idField]=parseInt(_id5,16);
+newData[dataOffset+typeField]=this.strings.intern('Marked Block Overhead');
+newData[dataOffset+sizeField]=block.capacity-block.size;
+newData[dataOffset+traceField]=internedCaptureId;
+newData[dataOffset+pathField]=this.stacks.root;
+newData[dataOffset+reactField]=this.stacks.root;
+dataOffset+=numFields;
+}
 this.data=newData;
 },
 getAggrow:function getAggrow(){
diff --git a/local-cli/server/middleware/heapCapture/src/heapCapture.js b/local-cli/server/middleware/heapCapture/src/heapCapture.js
index 716cde012..e130e8a7b 100644
--- a/local-cli/server/middleware/heapCapture/src/heapCapture.js
+++ b/local-cli/server/middleware/heapCapture/src/heapCapture.js
@@ -204,6 +204,9 @@ function captureRegistry() {
       for (const id in capture.refs) { // eslint-disable-line no-unused-vars
         rowCount++;
       }
+      for (const id in capture.markedBlocks) { // eslint-disable-line no-unused-vars
+        rowCount++;
+      }
       console.log(
         'increasing row data from ' + (this.data.length * 4).toString() + 'B to ' +
         (this.data.length * 4 + rowCount * numFields * 4).toString() + 'B'
@@ -241,6 +244,16 @@ function captureRegistry() {
         }
         dataOffset += numFields;
       }
+      for (const id in capture.markedBlocks) {
+        const block = capture.markedBlocks[id];
+        newData[dataOffset + idField] = parseInt(id, 16);
+        newData[dataOffset + typeField] = this.strings.intern('Marked Block Overhead');
+        newData[dataOffset + sizeField] = block.capacity - block.size;
+        newData[dataOffset + traceField] = internedCaptureId;
+        newData[dataOffset + pathField] = this.stacks.root;
+        newData[dataOffset + reactField] = this.stacks.root;
+        dataOffset += numFields;
+      }
       this.data = newData;
     },
     getAggrow: function getAggrow() {