Changeset 95510 in webkit

Timestamp:

Sep 19, 2011 8:35:49 PM (13 years ago)

Author:

ggaren@apple.com

Message:

Removed ENABLE_JSC_MULTIPLE_THREADS and related #ifdefs.
​https://bugs.webkit.org/show_bug.cgi?id=68422

As discussed on webkit-dev. All ports build with threads enabled in JSC now.

This may break WinCE and other ports that have not built and tested with
this configuration. I've filed bugs for port maintainers. It's time for
WebKit to move forward.

Reviewed by Sam Weinig.

• API/APIShims.h:

(JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock):

• API/JSContextRef.cpp:
• heap/MachineStackMarker.cpp:

(JSC::MachineThreads::MachineThreads):
(JSC::MachineThreads::~MachineThreads):
(JSC::MachineThreads::gatherConservativeRoots):

• heap/MachineStackMarker.h:
• runtime/InitializeThreading.cpp:

(JSC::initializeThreadingOnce):
(JSC::initializeThreading):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::sharedInstance):

• runtime/JSGlobalData.h:

(JSC::JSGlobalData::makeUsableFromMultipleThreads):

• runtime/JSLock.cpp:
• runtime/Structure.cpp:
• wtf/Platform.h:

Location:

trunk/Source/JavaScriptCore

Files:

• API/APIShims.h (modified) (1 diff)
• API/JSContextRef.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• heap/MachineStackMarker.cpp (modified) (9 diffs)
• heap/MachineStackMarker.h (modified) (3 diffs)
• runtime/InitializeThreading.cpp (modified) (2 diffs)
• runtime/JSGlobalData.cpp (modified) (2 diffs)
• runtime/JSGlobalData.h (modified) (1 diff)
• runtime/JSLock.cpp (modified) (3 diffs)
• runtime/Structure.cpp (modified) (1 diff)
• wtf/Platform.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/APIShims.h

@@ -41 +41 @@
     {
         UNUSED_PARAM(registerThread);
-#if ENABLE(JSC_MULTIPLE_THREADS)
         if (registerThread)
             globalData->heap.machineThreads().addCurrentThread();
-#endif
         m_globalData->heap.activityCallback()->synchronize();
         m_globalData->timeoutChecker.start();

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -93 +93 @@
     APIEntryShim entryShim(globalData.get(), false);
 
-#if ENABLE(JSC_MULTIPLE_THREADS)
     globalData->makeUsableFromMultipleThreads();
-#endif
 
     if (!globalObjectClass) {

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-19  Geoffrey Garen  <ggaren@apple.com>
+
+        Removed ENABLE_JSC_MULTIPLE_THREADS and related #ifdefs.
+        https://bugs.webkit.org/show_bug.cgi?id=68422
+        
+        As discussed on webkit-dev. All ports build with threads enabled in JSC now.
+        
+        This may break WinCE and other ports that have not built and tested with
+        this configuration. I've filed bugs for port maintainers. It's time for
+        WebKit to move forward.
+
+        Reviewed by Sam Weinig.
+
+        * API/APIShims.h:
+        (JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock):
+        * API/JSContextRef.cpp:
+        * heap/MachineStackMarker.cpp:
+        (JSC::MachineThreads::MachineThreads):
+        (JSC::MachineThreads::~MachineThreads):
+        (JSC::MachineThreads::gatherConservativeRoots):
+        * heap/MachineStackMarker.h:
+        * runtime/InitializeThreading.cpp:
+        (JSC::initializeThreadingOnce):
+        (JSC::initializeThreading):
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::sharedInstance):
+        * runtime/JSGlobalData.h:
+        (JSC::JSGlobalData::makeUsableFromMultipleThreads):
+        * runtime/JSLock.cpp:
+        * runtime/Structure.cpp:
+        * wtf/Platform.h:
+
 2011-09-19  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp

@@ -77 +77 @@
 #endif
 
-#if ENABLE(JSC_MULTIPLE_THREADS) && USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
 #include <signal.h>
 #endif
@@ -98 +98 @@
 #endif
 }
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
 
 #if OS(DARWIN)
@@ -146 +144 @@
 };
 
-#endif
-
 MachineThreads::MachineThreads(Heap* heap)
     : m_heap(heap)
-#if ENABLE(JSC_MULTIPLE_THREADS)
     , m_registeredThreads(0)
     , m_threadSpecific(0)
-#endif
 {
 }
@@ -159 +153 @@
 MachineThreads::~MachineThreads()
 {
-#if ENABLE(JSC_MULTIPLE_THREADS)
     if (m_threadSpecific) {
         int error = pthread_key_delete(m_threadSpecific);
@@ -171 +164 @@
         t = next;
     }
-#endif
-}
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
+}
 
 static inline PlatformThread getCurrentPlatformThread()
@@ -244 +234 @@
 }
 
-#endif
-
 #if COMPILER(GCC)
 #define REGISTER_BUFFER_ALIGNMENT __attribute__ ((aligned (sizeof(void*))))
@@ -275 +263 @@
     conservativeRoots.add(stackBegin, stackEnd);
 }
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
 
 static inline void suspendThread(const PlatformThread& platformThread)
@@ -483 +469 @@
 }
 
-#endif
-
 void MachineThreads::gatherConservativeRoots(ConservativeRoots& conservativeRoots, void* stackCurrent)
 {
     gatherFromCurrentThread(conservativeRoots, stackCurrent);
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
 
     if (m_threadSpecific) {
@@ -511 +493 @@
 #endif
     }
-#endif
 }
 

trunk/Source/JavaScriptCore/heap/MachineStackMarker.h

@@ -23 +23 @@
 #define MachineThreads_h
 
+#include <pthread.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/ThreadingPrimitives.h>
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
-#include <pthread.h>
-#endif
 
 namespace JSC {
@@ -43 +40 @@
         void gatherConservativeRoots(ConservativeRoots&, void* stackCurrent);
 
-#if ENABLE(JSC_MULTIPLE_THREADS)
         void makeUsableFromMultipleThreads();
         void addCurrentThread(); // Only needs to be called by clients that can use the same heap from multiple threads.
-#endif
 
     private:
         void gatherFromCurrentThread(ConservativeRoots&, void* stackCurrent);
 
-#if ENABLE(JSC_MULTIPLE_THREADS)
         class Thread;
 
@@ -58 +52 @@
 
         void gatherFromOtherThread(ConservativeRoots&, Thread*);
-#endif
 
         Heap* m_heap;
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
         Mutex m_registeredThreadsMutex;
         Thread* m_registeredThreads;
         pthread_key_t m_threadSpecific;
-#endif
     };
 

trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp

@@ -45 +45 @@
 namespace JSC {
 
-#if OS(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
+#if OS(DARWIN)
 static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
 #endif
@@ -60 +60 @@
     ExecutableAllocator::initializeAllocator();
 #endif
-#if ENABLE(JSC_MULTIPLE_THREADS)
     RegisterFile::initializeThreading();
-#endif
 }
 
 void initializeThreading()
 {
-#if OS(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
+#if OS(DARWIN)
     pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
 #else

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -51 +51 @@
 #include "Nodes.h"
 #include "Parser.h"
+#if ENABLE(REGEXP_TRACING)
+#include "RegExp.h"
+#endif
 #include "RegExpCache.h"
 #include "RegExpObject.h"
 #include "StrictEvalActivation.h"
+#include <wtf/Threading.h>
 #include <wtf/WTFThreadData.h>
-#if ENABLE(REGEXP_TRACING)
-#include "RegExp.h"
-#endif
-
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
-#include <wtf/Threading.h>
-#endif
-
 #if PLATFORM(MAC)
 #include <CoreFoundation/CoreFoundation.h>
@@ -388 +383 @@
     if (!instance) {
         instance = adoptRef(new JSGlobalData(APIShared, ThreadStackTypeSmall, SmallHeap)).leakRef();
-#if ENABLE(JSC_MULTIPLE_THREADS)
         instance->makeUsableFromMultipleThreads();
-#endif
     }
     return *instance;

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -130 +130 @@
         ~JSGlobalData();
 
-#if ENABLE(JSC_MULTIPLE_THREADS)
-        // Will start tracking threads that use the heap, which is resource-heavy.
         void makeUsableFromMultipleThreads() { heap.machineThreads().makeUsableFromMultipleThreads(); }
-#endif
 
         GlobalDataType globalDataType;

trunk/Source/JavaScriptCore/runtime/JSLock.cpp

@@ -36 +36 @@
 // automatically protected against concurrent access from multiple threads.
 // So it's safe to disable it on non-mac platforms where we don't have native pthreads.
-#if ENABLE(JSC_MULTIPLE_THREADS) && (OS(DARWIN) || USE(PTHREADS))
+#if (OS(DARWIN) || USE(PTHREADS))
 
 // Acquire this mutex before accessing lock-related data.
@@ -214 +214 @@
 }
 
-#else // ENABLE(JSC_MULTIPLE_THREADS) && (OS(DARWIN) || USE(PTHREADS))
+#else // (OS(DARWIN) || USE(PTHREADS))
 
 JSLock::JSLock(ExecState*)
@@ -261 +261 @@
 }
 
-#endif // ENABLE(JSC_MULTIPLE_THREADS) && (OS(DARWIN) || USE(PTHREADS))
+#endif // (OS(DARWIN) || USE(PTHREADS))
 
 } // namespace JSC

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -35 +35 @@
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/RefPtr.h>
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
 #include <wtf/Threading.h>
-#endif
 
 #define DUMP_STRUCTURE_ID_STATISTICS 0

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -509 +509 @@
 #endif
 
-#if !defined(ENABLE_JSC_MULTIPLE_THREADS)
-#define ENABLE_JSC_MULTIPLE_THREADS 1
-#endif
-
 #if !defined(ENABLE_WTF_MULTIPLE_THREADS)
 #define ENABLE_WTF_MULTIPLE_THREADS 1
@@ -1045 +1041 @@
 
 #if !defined(ENABLE_LAZY_BLOCK_FREEING)
-#if ENABLE(JSC_MULTIPLE_THREADS)
 #define ENABLE_LAZY_BLOCK_FREEING 1
-#endif
 #endif