JavaScriptCore-903.tar.gz

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

diff --git a/runtime/InitializeThreading.cpp b/runtime/InitializeThreading.cpp
index fea89f875e5c8afe4ade5e56c0ed1dbe4893f2a6..27611b757b34be5c564ce03bb0553ba736e64660 100644 (file)
--- a/runtime/InitializeThreading.cpp
+++ b/runtime/InitializeThreading.cpp
@@ -29,35 +29,42 @@
 #include "config.h"
 #include "InitializeThreading.h"
 
 #include "config.h"
 #include "InitializeThreading.h"
 

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

 #include "dtoa.h"
 #include "Identifier.h"
 #include "JSGlobalObject.h"
 #include "UString.h"
 #include <wtf/DateMath.h>
 #include <wtf/Threading.h>
 #include "dtoa.h"
 #include "Identifier.h"
 #include "JSGlobalObject.h"
 #include "UString.h"
 #include <wtf/DateMath.h>
 #include <wtf/Threading.h>

+#include <wtf/WTFThreadData.h>

 
 using namespace WTF;
 
 namespace JSC {
 
 
 using namespace WTF;
 
 namespace JSC {
 

-#if PLATFORM(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
+#if OS(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)

 static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
 #endif
 
 static void initializeThreadingOnce()
 {
 static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
 #endif
 
 static void initializeThreadingOnce()
 {

+    // StringImpl::empty() does not construct its static string in a threadsafe fashion,
+    // so ensure it has been initialized from here.
+    StringImpl::empty();
+

     WTF::initializeThreading();
     WTF::initializeThreading();

-    initializeUString();
+    wtfThreadData();
+    JSGlobalData::storeVPtrs();

 #if ENABLE(JSC_MULTIPLE_THREADS)
     s_dtoaP5Mutex = new Mutex;
 #if ENABLE(JSC_MULTIPLE_THREADS)
     s_dtoaP5Mutex = new Mutex;

-    WTF::initializeDates();
+    initializeDates();
+    RegisterFile::initializeThreading();

 #endif
 }
 
 void initializeThreading()
 {
 #endif
 }
 
 void initializeThreading()
 {

-#if PLATFORM(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
+#if OS(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)

     pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
 #else
     static bool initializedThreading = false;
     pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
 #else
     static bool initializedThreading = false;