Backout bc20093cfc9d (bug 816656) for build failures during prepare-package
authorEd Morley <emorley@mozilla.com>
Mon, 03 Dec 2012 18:47:04 +0000
changeset 123908 f2ce0bb4351899fe9e3325d7f5f89df8b3fd1626
parent 123907 eeca66c44a6727d84c725908182c4a0e1a6bb235
child 123909 bce4d044b15e08971633c39c38c974c43174e192
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs816656
milestone20.0a1
backs outbc20093cfc9d0b2e932ebc4f74b0b37d20f732a4
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout bc20093cfc9d (bug 816656) for build failures during prepare-package
startupcache/StartupCache.cpp
--- a/startupcache/StartupCache.cpp
+++ b/startupcache/StartupCache.cpp
@@ -134,19 +134,17 @@ StartupCache::~StartupCache()
   if (mTimer) {
     mTimer->Cancel();
   }
 
   // Generally, the in-memory table should be empty here,
   // but an early shutdown means either mTimer didn't run 
   // or the write thread is still running.
   WaitOnWriteThread();
-  // If we shutdown quickly timer wont have fired. Instead of writing
-  // it on the main thread and block the shutdown we simply wont update
-  // the startup cache.
+  WriteToDisk();
   gStartupCache = nullptr;
   (void)::NS_UnregisterMemoryReporter(mMappingMemoryReporter);
   (void)::NS_UnregisterMemoryReporter(mDataMemoryReporter);
   mMappingMemoryReporter = nullptr;
   mDataMemoryReporter = nullptr;
 }
 
 nsresult