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

Timestamp:

Feb 24, 2011, 7:49:31 AM (15 years ago)

Author:

Patrick Gansterer

Message:

2011-02-24 Patrick Gansterer <Patrick Gansterer>

Reviewed by Alexey Proskuryakov.

Remove pthreads dependecy for JSLock
​https://bugs.webkit.org/show_bug.cgi?id=54832

JSLock is only needed to support an obsolete execution model where JavaScriptCore
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.

• runtime/JSLock.cpp:

File:

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

trunk/Source/JavaScriptCore/runtime/JSLock.cpp

@@ -25 +25 @@
 #include "CallFrame.h"
 
-#if ENABLE(JSC_MULTIPLE_THREADS)
+#if USE(PTHREADS)
 #include <pthread.h>
 #endif
@@ -31 +31 @@
 namespace JSC {
 
-#if ENABLE(JSC_MULTIPLE_THREADS)
+// JSLock is only needed to support an obsolete execution model where JavaScriptCore
+// 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))
 
 // Acquire this mutex before accessing lock-related data.
@@ -209 +212 @@
 }
 
-#else
+#else // ENABLE(JSC_MULTIPLE_THREADS) && (OS(DARWIN) || USE(PTHREADS))
 
 JSLock::JSLock(ExecState*)
@@ -256 +259 @@
 }
 
-#endif // USE(MULTIPLE_THREADS)
+#endif // ENABLE(JSC_MULTIPLE_THREADS) && (OS(DARWIN) || USE(PTHREADS))
 
 } // namespace JSC