Bug 1141817 - Fix yield statement to correctly return memory actor st…

…ate so that the performance tool can poll for allocations during recording. r=vp
shellylin · Mar 12, 2015 · 52f6873 · 52f6873
1 parent b64b2d9
commit 52f6873
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/browser/devtools/performance/modules/front.js b/browser/devtools/performance/modules/front.js
@@ -353,7 +353,7 @@ PerformanceFront.prototype = {
    */
   _pullAllocationSites: Task.async(function *() {
     let memoryData = yield this._request("memory", "getAllocations");
-    let isStillAttached = yield this._request("memory", "getState") == "attached";
+    let isStillAttached = (yield this._request("memory", "getState")) === "attached";
 
     this.emit("allocations", {
       sites: memoryData.allocations,

diff --git a/browser/devtools/performance/test/browser_perf-front.js b/browser/devtools/performance/test/browser_perf-front.js
@@ -10,6 +10,9 @@ let WAIT_TIME = 1000;
 function spawnTest () {
   let { target, front } = yield initBackend(SIMPLE_URL);
 
+  let count = 0;
+  let counter = () => count++;
+
   let {
     profilerStartTime,
     timelineStartTime,
@@ -25,7 +28,14 @@ function spawnTest () {
   ok(typeof memoryStartTime === "number",
     "The front.startRecording() emits a memory start time.");
 
-  yield busyWait(WAIT_TIME);
+  // Record allocation events to ensure it's called more than once
+  // so we know it's polling
+  front.on("allocations", counter);
+
+  yield Promise.all([
+    busyWait(WAIT_TIME),
+    waitUntil(() => count > 1)
+  ]);
 
   let {
     profilerEndTime,
@@ -35,6 +45,8 @@ function spawnTest () {
     withAllocations: true
   });
 
+  front.off("allocations", counter);
+
   ok(typeof profilerEndTime === "number",
     "The front.stopRecording() emits a profiler end time.");
   ok(typeof timelineEndTime === "number",
@@ -49,6 +61,9 @@ function spawnTest () {
   ok(memoryEndTime > memoryStartTime,
     "The memoryEndTime is after memoryStartTime.");
 
+  is((yield front._request("memory", "getState")), "detached",
+    "memory actor is detached when stopping recording with allocations");
+
   yield removeTab(target.tab);
   finish();
 }