Bug 1159810 - Kill full gc timer when gc starts, r=mccr8
☠☠ backed out by d1c2ecd59fc0 ☠ ☠
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Mon, 04 May 2015 23:44:14 +0300
changeset 242316 256f10c0dbdc63abafd2442c9689964912a33a02
parent 242315 f4f4e2be37652cb1dc23f066725a0f8868bb411b
child 242317 af219306ed21b1c66722f7eaf219837dbc7f584e
push id28689
push usercbook@mozilla.com
push dateTue, 05 May 2015 10:05:09 +0000
treeherderautoland@754579ec0e68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1159810
milestone40.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 1159810 - Kill full gc timer when gc starts, r=mccr8
dom/base/nsJSEnvironment.cpp
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -2212,16 +2212,17 @@ DOMGCSliceCallback(JSRuntime *aRt, JS::G
 {
   NS_ASSERTION(NS_IsMainThread(), "GCs must run on the main thread");
 
   switch (aProgress) {
     case JS::GC_CYCLE_BEGIN: {
       // Prevent cycle collections and shrinking during incremental GC.
       sCCLockedOut = true;
 
+      nsJSContext::KillGCTimer();
       nsJSContext::KillShrinkGCBuffersTimer();
 
       break;
     }
 
     case JS::GC_CYCLE_END: {
       PRTime delta = GetCollectionTimeDelta();