Backout bc20093cfc9d (bug 816656) for build failures during prepare-package
authorEd Morley <emorley@mozilla.com>
Mon, 03 Dec 2012 18:47:04 +0000
changeset 114803 f2ce0bb43518
parent 114802 eeca66c44a67
child 114804 bce4d044b15e
push id18990
push useremorley@mozilla.com
push dateMon, 03 Dec 2012 18:47:30 +0000
treeherdermozilla-inbound@f2ce0bb43518 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs816656
milestone20.0a1
backs outbc20093cfc9d
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