From 49f0cfc01c59e5a08390bf8cf73bd23c423748b9 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Fri, 24 Jan 2014 13:26:07 -0500 Subject: [PATCH] Backed out changeset 6febd7a30de3 (bug 962808) for mochitest-bc failures. --- .../components/sessionstore/src/SessionSaver.jsm | 9 ++------- toolkit/components/telemetry/Histograms.json | 16 ---------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/browser/components/sessionstore/src/SessionSaver.jsm b/browser/components/sessionstore/src/SessionSaver.jsm index 1c720f8e0c8c..416a52f70084 100644 --- a/browser/components/sessionstore/src/SessionSaver.jsm +++ b/browser/components/sessionstore/src/SessionSaver.jsm @@ -256,7 +256,7 @@ let SessionSaverInternal = { * Write the given state object to disk. */ _writeState: function (state) { - stopWatchStart("SERIALIZE_DATA_MS", "SERIALIZE_DATA_LONGEST_OP_MS", "WRITE_STATE_LONGEST_OP_MS"); + stopWatchStart("SERIALIZE_DATA_MS", "SERIALIZE_DATA_LONGEST_OP_MS"); let data = JSON.stringify(state); stopWatchFinish("SERIALIZE_DATA_MS", "SERIALIZE_DATA_LONGEST_OP_MS"); @@ -265,7 +265,6 @@ let SessionSaverInternal = { // Don't touch the file if an observer has deleted all state data. if (!data) { - stopWatchCancel("WRITE_STATE_LONGEST_OP_MS"); return Promise.resolve(); } @@ -278,11 +277,7 @@ let SessionSaverInternal = { // Write (atomically) to a session file, using a tmp file. Once the session // file is successfully updated, save the time stamp of the last save and // notify the observers. - stopWatchStart("SEND_SERIALIZED_STATE_LONGEST_OP_MS"); - let promise = SessionFile.write(data); - stopWatchFinish("WRITE_STATE_LONGEST_OP_MS", - "SEND_SERIALIZED_STATE_LONGEST_OP_MS"); - promise.then(() => { + return SessionFile.write(data).then(() => { this.updateLastSaveTime(); notify(null, "sessionstore-state-write-complete"); }, console.error); diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index fc7f5d2cfa4b..da8aa1527167 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -3317,22 +3317,6 @@ "extended_statistics_ok": true, "description": "Session restore: Time to read the session data from the file on disk (ms)" }, - "FX_SESSION_RESTORE_SEND_SERIALIZED_STATE_LONGEST_OP_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Session restore: Time spent on the main thread sending the session data off the main thread for writing (ms)" - }, - "FX_SESSION_RESTORE_WRITE_STATE_LONGEST_OP_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Session restore: Time spent on the main thread serializing, broadcasting and sending the session data for writing (ms)" - }, "FX_SESSION_RESTORE_WRITE_FILE_MS": { "expires_in_version": "never", "kind": "exponential",