Changeset 105270 in webkit

Timestamp:

Jan 18, 2012 6:15:05 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Cross-platform processor core counter
​https://bugs.webkit.org/show_bug.cgi?id=76530

Patch by Roland Takacs <​takacs.roland@stud.u-szeged.hu> on 2012-01-18
Reviewed by Zoltan Herczeg.

Source/JavaScriptCore:

Two files have been created that include the processor core counter function.
It used to be in ParallelJobsGeneric.h/cpp before.

• GNUmakefile.list.am:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Options.cpp:

(JSC::Options::initializeOptions):

• wtf/CMakeLists.txt:
• wtf/NumberOfCores.cpp: Added.

(WTF::numberOfProcessorCores):

• wtf/NumberOfCores.h: Added.
• wtf/ParallelJobsGeneric.cpp:

(WTF::ParallelEnvironment::ParallelEnvironment):

• wtf/ParallelJobsGeneric.h:

Source/WTF:

Two files have been added to the project, namely NumberOfCores.h/cpp,
that include a CPU core number determining function.

• WTF.pro:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/GNUmakefile.list.am (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.gypi (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• JavaScriptCore/runtime/Options.cpp (modified) (2 diffs)
• JavaScriptCore/wtf/CMakeLists.txt (modified) (2 diffs)
• JavaScriptCore/wtf/NumberOfCores.cpp (added)
• JavaScriptCore/wtf/NumberOfCores.h (added)
• JavaScriptCore/wtf/ParallelJobsGeneric.cpp (modified) (5 diffs)
• JavaScriptCore/wtf/ParallelJobsGeneric.h (modified) (2 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/WTF.pro (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-01-18  Roland Takacs  <takacs.roland@stud.u-szeged.hu>
+
+        Cross-platform processor core counter
+        https://bugs.webkit.org/show_bug.cgi?id=76530
+
+        Reviewed by Zoltan Herczeg.
+
+        Two files have been created that include the processor core counter function.
+        It used to be in ParallelJobsGeneric.h/cpp before.
+
+        * GNUmakefile.list.am:
+        * JavaScriptCore.gypi:
+        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * runtime/Options.cpp:
+        (JSC::Options::initializeOptions):
+        * wtf/CMakeLists.txt:
+        * wtf/NumberOfCores.cpp: Added.
+        (WTF::numberOfProcessorCores):
+        * wtf/NumberOfCores.h: Added.
+        * wtf/ParallelJobsGeneric.cpp:
+        (WTF::ParallelEnvironment::ParallelEnvironment):
+        * wtf/ParallelJobsGeneric.h:
+
 2012-01-18  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/Source/JavaScriptCore/GNUmakefile.list.am

@@ -619 +619 @@
         Source/JavaScriptCore/wtf/NotFound.h \
         Source/JavaScriptCore/wtf/NullPtr.h \
+        Source/JavaScriptCore/wtf/NumberOfCores.cpp \
+        Source/JavaScriptCore/wtf/NumberOfCores.h \
         Source/JavaScriptCore/wtf/OSAllocator.h \
         Source/JavaScriptCore/wtf/OSRandomSource.cpp \

trunk/Source/JavaScriptCore/JavaScriptCore.gypi

@@ -572 +572 @@
             'wtf/MallocZoneSupport.h',
             'wtf/NullPtr.cpp',
+            'wtf/NumberOfCores.cpp',
+            'wtf/NumberOfCores.h',
             'wtf/OSAllocatorPosix.cpp',
             'wtf/OSAllocatorWin.cpp',

trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj

@@ -950 +950 @@
                 </File>
                 <File
+                        RelativePath="..\..\wtf\NumberOfCores.cpp"
+                        >
+                </File>
+                <File
+                        RelativePath="..\..\wtf\NumberOfCores.h"
+                        >
+                </File>
+                <File
                         RelativePath="..\..\wtf\OSAllocatorWin.cpp"
                         >

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -732 +732 @@
                 E4D8CEFB12FC439600BC9F5A /* BloomFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D8CE9B12FC42E100BC9F5A /* BloomFilter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 F3BD31ED126735770065467F /* TextPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BD31D0126730180065467F /* TextPosition.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                F69E86C314C6E551002C2C62 /* NumberOfCores.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F69E86C114C6E551002C2C62 /* NumberOfCores.cpp */; };
+                F69E86C414C6E551002C2C62 /* NumberOfCores.h in Headers */ = {isa = PBXBuildFile; fileRef = F69E86C214C6E551002C2C62 /* NumberOfCores.h */; };
                 FDA15C1E12B0305C003A583A /* Complex.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15C1612B03028003A583A /* Complex.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 FE1B447A0ECCD73B004F4DD1 /* StdLibExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = FE1B44790ECCD73B004F4DD1 /* StdLibExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1543 +1545 @@
                 F692A8860255597D01FF60F7 /* UString.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = UString.h; sourceTree = "<group>"; tabWidth = 8; };
                 F692A8870255597D01FF60F7 /* JSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
+                F69E86C114C6E551002C2C62 /* NumberOfCores.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NumberOfCores.cpp; path = wtf/NumberOfCores.cpp; sourceTree = "<group>"; };
+                F69E86C214C6E551002C2C62 /* NumberOfCores.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NumberOfCores.h; path = wtf/NumberOfCores.h; sourceTree = "<group>"; };
                 FDA15C1612B03028003A583A /* Complex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Complex.h; sourceTree = "<group>"; };
                 FE1B44790ECCD73B004F4DD1 /* StdLibExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StdLibExtras.h; sourceTree = "<group>"; };
@@ -1623 +1627 @@
                         isa = PBXGroup;
                         children = (
+                                F69E86C114C6E551002C2C62 /* NumberOfCores.cpp */,
+                                F69E86C214C6E551002C2C62 /* NumberOfCores.h */,
                                 8604F4F2143A6C4400B295F5 /* ChangeLog */,
                                 A718F8211178EB4B002465A7 /* create_regex_tables */,
@@ -3040 +3046 @@
                                 0F7B294D14C3CD4C007C3DB1 /* DFGCommon.h in Headers */,
                                 91A3905614C0F47200F67901 /* Uint8ClampedArray.h in Headers */,
+                                F69E86C414C6E551002C2C62 /* NumberOfCores.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -3577 +3584 @@
                                 0F0B83B014BCF71600885B4F /* CallLinkInfo.cpp in Sources */,
                                 0F0B83B414BCF86000885B4F /* MethodCallLinkInfo.cpp in Sources */,
+                                F69E86C314C6E551002C2C62 /* NumberOfCores.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -28 +28 @@
 
 #include <limits>
+#include <wtf/NumberOfCores.h>
 #include <wtf/PageBlock.h>
 
@@ -175 +176 @@
 
     int cpusToUse = 1;
-#if OS(DARWIN) && ENABLE(PARALLEL_GC)
-    int name[2];
-    size_t valueSize = sizeof(cpusToUse);
-    name[0] = CTL_HW;
-    name[1] = HW_AVAILCPU;
-    sysctl(name, 2, &cpusToUse, &valueSize, 0, 0);
+#if ENABLE(PARALLEL_GC)
+    cpusToUse = WTF::numberOfProcessorCores();
 #endif
     // We don't scale so well beyond 4.

trunk/Source/JavaScriptCore/wtf/CMakeLists.txt

@@ -54 +54 @@
     NotFound.h
     NullPtr.h
+    NumberOfCores.h
     OSAllocator.h
     OSRandomSource.h
@@ -147 +148 @@
     MD5.cpp
     OSRandomSource.cpp
+    NumberOfCores.cpp
     PageAllocationAligned.cpp
     PageBlock.cpp

trunk/Source/JavaScriptCore/wtf/ParallelJobsGeneric.cpp

@@ -32 +32 @@
 #include "ParallelJobs.h"
 #include "UnusedParam.h"
+#include <wtf/NumberOfCores.h>
 
 #if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD)
@@ -46 +47 @@
 Vector< RefPtr<ParallelEnvironment::ThreadPrivate> >* ParallelEnvironment::s_threadPool = 0;
 
-int ParallelEnvironment::s_maxNumberOfParallelThreads = -1;
-
 ParallelEnvironment::ParallelEnvironment(ThreadFunction threadFunction, size_t sizeOfParameter, int requestedJobNumber) :
     m_threadFunction(threadFunction),
@@ -54 +53 @@
     ASSERT_ARG(requestedJobNumber, requestedJobNumber >= 1);
 
-    if (s_maxNumberOfParallelThreads == -1)
-        determineMaxNumberOfParallelThreads();
+    int maxNumberOfCores = numberOfProcessorCores();
 
-    if (!requestedJobNumber || requestedJobNumber > s_maxNumberOfParallelThreads)
-        requestedJobNumber = static_cast<unsigned>(s_maxNumberOfParallelThreads);
+    if (!requestedJobNumber || requestedJobNumber > maxNumberOfCores)
+        requestedJobNumber = static_cast<unsigned>(maxNumberOfCores);
 
     if (!s_threadPool)
@@ -66 +64 @@
     int maxNumberOfNewThreads = requestedJobNumber - 1;
 
-    for (int i = 0; i < s_maxNumberOfParallelThreads && m_threads.size() < static_cast<unsigned>(maxNumberOfNewThreads); ++i) {
+    for (int i = 0; i < maxNumberOfCores && m_threads.size() < static_cast<unsigned>(maxNumberOfNewThreads); ++i) {
         if (s_threadPool->size() < static_cast<unsigned>(i) + 1U)
             s_threadPool->append(ThreadPrivate::create());
@@ -92 +90 @@
     for (i = 0; i < m_threads.size(); ++i)
         m_threads[i]->waitForFinish();
-}
-
-void ParallelEnvironment::determineMaxNumberOfParallelThreads()
-{
-    const int defaultIfUnavailable = 2;
-#if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD)
-    unsigned result;
-    size_t length = sizeof(result);
-    int name[] = {
-        CTL_HW,
-        HW_NCPU
-    };
-    int sysctlResult = sysctl(name, sizeof(name) / sizeof(int), &result, &length, 0, 0);
-    s_maxNumberOfParallelThreads = sysctlResult < 0 ? defaultIfUnavailable : result;
-#elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
-    long sysconfResult = sysconf(_SC_NPROCESSORS_ONLN);
-    s_maxNumberOfParallelThreads = sysconfResult < 0 ? defaultIfUnavailable : static_cast<int>(sysconfResult);
-#elif OS(WINDOWS)
-    UNUSED_PARAM(defaultIfUnavailable);
-
-    SYSTEM_INFO sysInfo;
-    GetSystemInfo(&sysInfo);
-    s_maxNumberOfParallelThreads = sysInfo.dwNumberOfProcessors;
-#else
-    s_maxNumberOfParallelThreads = defaultIfUnavailable;
-#endif
 }
 

trunk/Source/JavaScriptCore/wtf/ParallelJobsGeneric.h

@@ -85 +85 @@
 
 private:
-    static void determineMaxNumberOfParallelThreads();
-
     ThreadFunction m_threadFunction;
     size_t m_sizeOfParameter;
@@ -93 +91 @@
     Vector< RefPtr<ThreadPrivate> > m_threads;
     static Vector< RefPtr<ThreadPrivate> >* s_threadPool;
-    static int s_maxNumberOfParallelThreads;
 };
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-01-18  Roland Takacs  <takacs.roland@stud.u-szeged.hu>
+
+        Cross-platform processor core counter
+        https://bugs.webkit.org/show_bug.cgi?id=76530
+
+        Reviewed by Zoltan Herczeg.
+
+        Two files have been added to the project, namely NumberOfCores.h/cpp,
+        that include a CPU core number determining function.
+
+        * WTF.pro:
+
 2012-01-17  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WTF/WTF.pro

@@ -83 +83 @@
     NotFound.h \
     NullPtr.h \
+    NumberOfCores.h \
     OSAllocator.h \
     OSRandomSource.h \
@@ -189 +190 @@
     MetaAllocator.cpp \
     NullPtr.cpp \
+    NumberOfCores.cpp \
     OSRandomSource.cpp \
     qt/MainThreadQt.cpp \