Bug 912589 - have JSRuntime::helperThreadCount() return GetCPUCount(), not GetCPUCount()-1 (r=bhackett)
authorLuke Wagner <luke@mozilla.com>
Mon, 09 Sep 2013 14:24:06 -0500
changeset 159324 3ade0212edd0ecb9fedde60740a6c9202384d49b
parent 159323 074ec56640f6e1c213ce432831fd56fe1ef29b1c
child 159325 dc86c80d01c05309daada4b95283dbf748fa35cb
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhackett
bugs912589
milestone26.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 912589 - have JSRuntime::helperThreadCount() return GetCPUCount(), not GetCPUCount()-1 (r=bhackett)
js/src/vm/Runtime.h
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -1590,19 +1590,19 @@ struct JSRuntime : public JS::shadow::Ru
     }
 
     void requestHelperThreadCount(size_t count) {
         requestedHelperThreadCount = count;
     }
 
     /* Number of helper threads which should be created for this runtime. */
     size_t helperThreadCount() const {
-#ifdef JS_THREADSAFE
+#ifdef JS_WORKER_THREADS
         if (requestedHelperThreadCount < 0)
-            return js::GetCPUCount() - 1;
+            return js::GetCPUCount();
         return requestedHelperThreadCount;
 #else
         return 0;
 #endif
     }
 
     void setCanUseHelperThreadsForIonCompilation(bool value) {
         useHelperThreadsForIonCompilation_ = value;