Changeset 95510 in webkit for trunk/Source/JavaScriptCore/runtime/JSLock.cpp

Timestamp:

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

Author:

[email protected]

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:

File:

• trunk/Source/JavaScriptCore/runtime/JSLock.cpp (modified) (3 diffs)

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