Bug 806239 - When we dump memory reports after minimizing memory usage, we shouldn't also dump the reports before minimizing. r=njn
authorJustin Lebar <justin.lebar@gmail.com>
Sun, 28 Oct 2012 20:18:40 -0400
changeset 111780 9e606320e6a54b57a1dfa50d23429cf6d4c87fa7
parent 111779 7d95543f47506a5975dfb42cedb1ff20cb51ce91
child 111781 698b72833c2b19972a73b1edc09f22511095c02a
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersnjn
bugs806239
milestone19.0a1
Bug 806239 - When we dump memory reports after minimizing memory usage, we shouldn't also dump the reports before minimizing. r=njn
xpcom/base/MemoryInfoDumper.cpp
--- a/xpcom/base/MemoryInfoDumper.cpp
+++ b/xpcom/base/MemoryInfoDumper.cpp
@@ -319,16 +319,17 @@ MemoryInfoDumper::DumpMemoryReportsToFil
     nsRefPtr<DumpMemoryReportsRunnable> callback =
       new DumpMemoryReportsRunnable(identifier,
           /* minimizeMemoryUsage = */ false,
           /* dumpChildProcesses = */ false);
     nsCOMPtr<nsIMemoryReporterManager> mgr =
       do_GetService("@mozilla.org/memory-reporter-manager;1");
     NS_ENSURE_TRUE(mgr,);
     mgr->MinimizeMemoryUsage(callback);
+    return;
   }
 
   DumpMemoryReportsToFileImpl(identifier);
 }
 
 /* static */ void
 MemoryInfoDumper::DumpGCAndCCLogsToFile(
   const nsAString& aIdentifier,