Merge backout of changeset d6add78eff55 (Increase maximum collections at shutdown from 5 to 10 to see if it fixes the leaks on Windows mochitests 2/5).
authorL. David Baron <dbaron@dbaron.org>
Fri, 23 Oct 2009 00:47:36 -0400
changeset 34115 69a4a21d9b84850c0478e7990213b6f29738f7ec
parent 34113 3c17a37fd4d2e0832ca7cd7ba966b2fb82cb8be7 (current diff)
parent 34114 11a42c6d5aa8367c5158d11cc4a53fd5102616c0 (diff)
child 34116 8c379aa3c98f6749d3c43a1cbab7e0cf3a596026
push id9890
push userdbaron@mozilla.com
push dateFri, 23 Oct 2009 04:48:01 +0000
treeherdermozilla-central@69a4a21d9b84 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.3a1pre
Merge backout of changeset d6add78eff55 (Increase maximum collections at shutdown from 5 to 10 to see if it fixes the leaks on Windows mochitests 2/5).
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -155,17 +155,17 @@
 #ifdef DEBUG_CC
 #define IF_DEBUG_CC_PARAM(_p) , _p
 #define IF_DEBUG_CC_ONLY_PARAM(_p) _p
 #else
 #define IF_DEBUG_CC_PARAM(_p)
 #define IF_DEBUG_CC_ONLY_PARAM(_p)
 #endif
 
-#define DEFAULT_SHUTDOWN_COLLECTIONS 10
+#define DEFAULT_SHUTDOWN_COLLECTIONS 5
 #ifdef DEBUG_CC
 #define SHUTDOWN_COLLECTIONS(params) params.mShutdownCollections
 #else
 #define SHUTDOWN_COLLECTIONS(params) DEFAULT_SHUTDOWN_COLLECTIONS
 #endif
 
 // Various parameters of this collector can be tuned using environment
 // variables.