Changeset 32808 in webkit for trunk/JavaScriptCore/API/JSBase.cpp

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.

File:

• trunk/JavaScriptCore/API/JSBase.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -30 +30 @@
 #include "APICast.h"
 #include <kjs/ExecState.h>
+#include <kjs/InitializeThreading.h>
+#include <kjs/interpreter.h>
 #include <kjs/JSGlobalObject.h>
 #include <kjs/JSLock.h>
-#include <kjs/interpreter.h>
 #include <kjs/object.h>
 
@@ -77 +78 @@
 }
 
-void JSGarbageCollect(JSContextRef)
+void JSGarbageCollect(JSContextRef ctx)
 {
+    // Unlikely, but it is legal to call JSGarbageCollect(0) before actually doing anything that would implicitly call initializeThreading().
+    if (!ctx)
+        initializeThreading();
+
     JSLock lock;