JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / JSLock.cpp

diff --git a/runtime/JSLock.cpp b/runtime/JSLock.cpp
index a1cffbd23de29c7b0e2c8f16559c61f97dc6b62e..fc543f0e82f72f768b8c75645885bcc1f163ace0 100644 (file)
--- a/runtime/JSLock.cpp
+++ b/runtime/JSLock.cpp
@@ -21,16 +21,21 @@
 #include "config.h"
 #include "JSLock.h"
 
 #include "config.h"
 #include "JSLock.h"
 

-#include "Collector.h"
+#include "Heap.h"

 #include "CallFrame.h"
 #include "CallFrame.h"

+#include "JSObject.h"
+#include "ScopeChain.h"

 
 

-#if ENABLE(JSC_MULTIPLE_THREADS)
+#if USE(PTHREADS)

 #include <pthread.h>
 #endif
 
 namespace JSC {
 
 #include <pthread.h>
 #endif
 
 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.
 static pthread_mutex_t JSMutex = PTHREAD_MUTEX_INITIALIZER;
 
 // Acquire this mutex before accessing lock-related data.
 static pthread_mutex_t JSMutex = PTHREAD_MUTEX_INITIALIZER;


@@ -65,6 +70,12 @@ JSLock::JSLock(ExecState* exec)
     lock(m_lockBehavior);
 }
 
     lock(m_lockBehavior);
 }
 

+JSLock::JSLock(JSGlobalData* globalData)
+    : m_lockBehavior(globalData->isSharedInstance() ? LockForReal : SilenceAssertionsOnly)
+{
+    lock(m_lockBehavior);
+}
+

 void JSLock::lock(JSLockBehavior lockBehavior)
 {
 #ifdef NDEBUG
 void JSLock::lock(JSLockBehavior lockBehavior)
 {
 #ifdef NDEBUG


@@ -202,7 +213,7 @@ JSLock::DropAllLocks::~DropAllLocks()
     --lockDropDepth;
 }
 
     --lockDropDepth;
 }
 

-#else
+#else // ENABLE(JSC_MULTIPLE_THREADS) && (OS(DARWIN) || USE(PTHREADS))

 
 JSLock::JSLock(ExecState*)
     : m_lockBehavior(SilenceAssertionsOnly)
 
 JSLock::JSLock(ExecState*)
     : m_lockBehavior(SilenceAssertionsOnly)


@@ -249,6 +260,6 @@ JSLock::DropAllLocks::~DropAllLocks()
 {
 }
 
 {
 }
 

-#endif // USE(MULTIPLE_THREADS)
+#endif // ENABLE(JSC_MULTIPLE_THREADS) && (OS(DARWIN) || USE(PTHREADS))

 
 } // namespace JSC
 
 } // namespace JSC