Bug 735916 - Fix javascript.options.mem.log (r=terrence)
authorBill McCloskey <wmccloskey@mozilla.com>
Wed, 14 Mar 2012 16:50:35 -0700 (2012-03-14)
changeset 89421 09f0b5bc33017cfacee4bcc9aee55e7ee9ed93a2
parent 89420 20cc9a2c361f78a745102612eb5b1cc39811c72a
child 89423 c868d585c8a5084a2efdbd230c1a73d60f1e61a7
push id22251
push userbmo@edmorley.co.uk
push dateThu, 15 Mar 2012 12:49:51 +0000 (2012-03-15)
treeherdermozilla-central@082d016c341f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs735916
milestone14.0a1
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
Bug 735916 - Fix javascript.options.mem.log (r=terrence)
dom/base/nsJSEnvironment.cpp
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -3491,22 +3491,22 @@ DOMGCSliceCallback(JSRuntime *aRt, js::G
     PRTime now = PR_Now();
     PRTime delta = 0;
     if (sFirstCollectionTime) {
       delta = now - sFirstCollectionTime;
     } else {
       sFirstCollectionTime = now;
     }
 
-    NS_NAMED_LITERAL_STRING(kFmt, "GC(T+%.1f) %s");
-    nsString msg, gcstats;
+    NS_NAMED_LITERAL_STRING(kFmt, "GC(T+%.1f) ");
+    nsString prefix, gcstats;
     gcstats.Adopt(aDesc.formatMessage(aRt));
-    msg.Adopt(nsTextFormatter::smprintf(kFmt.get(),
-                                        double(delta) / PR_USEC_PER_SEC,
-                                        gcstats.get()));
+    prefix.Adopt(nsTextFormatter::smprintf(kFmt.get(),
+                                           double(delta) / PR_USEC_PER_SEC));
+    nsString msg = prefix + gcstats;
     nsCOMPtr<nsIConsoleService> cs = do_GetService(NS_CONSOLESERVICE_CONTRACTID);
     if (cs) {
       cs->LogStringMessage(msg.get());
     }
   }
 
   // Prevent cycle collections and shrinking during incremental GC.
   if (aProgress == js::GC_CYCLE_BEGIN) {