From b55d70bc5f59e3837bf1a52230e396e2fa2479db Mon Sep 17 00:00:00 2001 From: David Rajchenbach-Teller Date: Sat, 19 Sep 2015 15:46:17 +0200 Subject: [PATCH] Bug 1205840 - Typo fixes in AddonWatcher.jsm. r=felipe --- toolkit/components/perfmonitoring/AddonWatcher.jsm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/toolkit/components/perfmonitoring/AddonWatcher.jsm b/toolkit/components/perfmonitoring/AddonWatcher.jsm index 2a3e13ef4a2..d816a3b5f24 100644 --- a/toolkit/components/perfmonitoring/AddonWatcher.jsm +++ b/toolkit/components/perfmonitoring/AddonWatcher.jsm @@ -62,6 +62,7 @@ var AddonWatcher = { * @type {number} */ _latestWakeup: Date.now(), + _latestSnapshot: null, /** * Initialize and launch the AddonWatcher. @@ -168,7 +169,7 @@ var AddonWatcher = { return true; } - let diff = snapshot.processData.subtract(previousSnapshot.processData); + let diff = currentSnapshot.processData.subtract(previousSnapshot.processData); if (diff.totalCPUTime >= deltaT * THREAD_TAKES_LOTS_OF_CPU_FACTOR ) { // The main thread itself is using lots of CPU, perhaps because of // an add-on. We need to investigate. @@ -198,7 +199,7 @@ var AddonWatcher = { return Task.spawn(function*() { try { - let previousSnapshot = this._latestSnapshot; // FIXME: Implement + let previousSnapshot = this._latestSnapshot; let snapshot = this._latestSnapshot = yield this._monitor.promiseSnapshot(); let isSystemTooBusy = this._isSystemTooBusy(currentWakeup - previousWakeup, snapshot, previousSnapshot); @@ -242,7 +243,7 @@ var AddonWatcher = { // The main event loop is behaving weirdly, most likely because of // the system being busy or asleep, so results are not trustworthy. // Ignore. - continue; + return; } // Report misbehaviors to Telemetry