Changeset 32808 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

May 2, 2008, 3:29:47 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Make JavaScriptGlue and JavaScriptCore API functions implicitly call initializeThreading
for the sake of non-WebKit clients.

JavaScriptCore:

• API/JSBase.cpp: (JSGarbageCollect):
• API/JSContextRef.cpp: (JSGlobalContextCreate): These are the JavaScriptCore API bottlenecks. There are a few other JSStringRef and JSClassRef functions that can be called earlier, but they do not do anything that requires initializeThreading.

• kjs/InitializeThreading.cpp: (KJS::doInitializeThreading): (KJS::initializeThreading): On Darwin, make the initialization happen under pthread_once, since there is no guarantee that non-WebKit clients won't try to call this function re-entrantly.

• kjs/InitializeThreading.h:
• wtf/Threading.h: Spell out initializeThreading contract.

• wtf/ThreadingPthreads.cpp: (WTF::isMainThread): Make sure that results are correct on Darwin, even if threading was initialized from a secondary thread.

JavaScriptGlue:

• JavaScriptGlue.cpp: (JSRunCreate): (JSCollect): (JSCreateJSArrayFromCFArray): (JSLockInterpreter): These are all possible JavaScriptGlue entry points.

Location:

trunk/JavaScriptCore/kjs

Files:

• InitializeThreading.cpp (modified) (1 diff)
• InitializeThreading.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/InitializeThreading.cpp

@@ -42 +42 @@
 namespace KJS {
 
-void initializeThreading()
+#if PLATFORM(DARWIN)
+static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
+#endif
+
+static void initializeThreadingOnce()
 {
     WTF::initializeThreading();
 #if USE(MULTIPLE_THREADS)
-    if (!s_dtoaP5Mutex) {
-        s_dtoaP5Mutex = new Mutex;
-        Heap::threadHeap();
-        UString::null();
-        Identifier::initializeIdentifierThreading();
-        CommonIdentifiers::shared();
-        lexer();
-        initDateMath();
-        JSGlobalObject::threadClassInfoHashTables();
-        JSGlobalObject::head();
+    s_dtoaP5Mutex = new Mutex;
+    Heap::threadHeap();
+    UString::null();
+    Identifier::initializeIdentifierThreading();
+    CommonIdentifiers::shared();
+    lexer();
+    initDateMath();
+    JSGlobalObject::threadClassInfoHashTables();
+    JSGlobalObject::head();
+#endif
+}
+
+void initializeThreading()
+{
+#if PLATFORM(DARWIN)
+    pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
+#else
+    static bool initializedThreading = false;
+    if (!initializedThreading) {
+        initializeThreadingOnce();
+        initializedThreading = true;
     }
 #endif

trunk/JavaScriptCore/kjs/InitializeThreading.h

@@ -32 +32 @@
 namespace KJS {
 
+    // This function must be called from the main thread. It is safe to call it repeatedly.
+    // Darwin is an exception to this rule: it is OK to call this function from any thread, even reentrantly.
     void initializeThreading();