Changeset 57853 in webkit for trunk/JavaScriptCore/runtime/Identifier.cpp

Timestamp:

Apr 19, 2010, 4:26:29 PM (15 years ago)

Author:

[email protected]

Message:

This broke windows.

Reviewed by NOBODY (rolling out r57829).

JavaScriptCore:

• API/APIShims.h:

(JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock):
(JSC::APIEntryShimWithoutLock::~APIEntryShimWithoutLock):
(JSC::APICallbackShim::APICallbackShim):
(JSC::APICallbackShim::~APICallbackShim):

• API/JSContextRef.cpp:
• Android.mk:
• Android.v8.wtf.mk:
• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Completion.cpp:

(JSC::checkSyntax):
(JSC::evaluate):

• runtime/Identifier.cpp:

(JSC::Identifier::remove):
(JSC::Identifier::checkCurrentIdentifierTable):
(JSC::createIdentifierTableSpecificCallback):
(JSC::createIdentifierTableSpecific):

• runtime/Identifier.h:

(JSC::ThreadIdentifierTableData::ThreadIdentifierTableData):
(JSC::defaultIdentifierTable):
(JSC::setDefaultIdentifierTable):
(JSC::currentIdentifierTable):
(JSC::setCurrentIdentifierTable):
(JSC::resetCurrentIdentifierTable):

• runtime/InitializeThreading.cpp:

(JSC::initializeThreadingOnce):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::create):

• wtf/WTFThreadData.cpp: Removed.
• wtf/WTFThreadData.h: Removed.

JavaScriptGlue:

• ForwardingHeaders/wtf/WTFThreadData.h: Removed.
• JSUtils.cpp:

(JSGlueAPIEntry::JSGlueAPIEntry):
(JSGlueAPIEntry::~JSGlueAPIEntry):
(JSGlueAPICallback::JSGlueAPICallback):
(JSGlueAPICallback::~JSGlueAPICallback):

WebCore:

• ForwardingHeaders/wtf/WTFThreadData.h: Removed.
• platform/ThreadGlobalData.cpp:

(WebCore::ThreadGlobalData::ThreadGlobalData):
(WebCore::ThreadGlobalData::~ThreadGlobalData):

• platform/ThreadGlobalData.h:

(WebCore::ThreadGlobalData::atomicStringTable):

• platform/text/AtomicString.cpp:

(WebCore::stringTable):

File:

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

trunk/JavaScriptCore/runtime/Identifier.cpp

@@ -29 +29 @@
 #include <wtf/FastMalloc.h>
 #include <wtf/HashSet.h>
-#include <wtf/WTFThreadData.h>
 
 using WTF::ThreadSpecific;
@@ -230 +229 @@
 void Identifier::remove(UString::Rep* r)
 {
-    wtfThreadData().currentIdentifierTable()->remove(r);
+    currentIdentifierTable()->remove(r);
 }
     
@@ -254 +253 @@
     // Check the identifier table accessible through the threadspecific matches the
     // globalData's identifier table.
-    ASSERT_UNUSED(globalData, globalData->identifierTable == wtfThreadData().currentIdentifierTable());
+    ASSERT_UNUSED(globalData, globalData->identifierTable == currentIdentifierTable());
 }
 
@@ -271 +270 @@
 #endif
 
+ThreadSpecific<ThreadIdentifierTableData>* g_identifierTableSpecific = 0;
+
+#if ENABLE(JSC_MULTIPLE_THREADS)
+
+pthread_once_t createIdentifierTableSpecificOnce = PTHREAD_ONCE_INIT;
+static void createIdentifierTableSpecificCallback()
+{
+    ASSERT(!g_identifierTableSpecific);
+    g_identifierTableSpecific = new ThreadSpecific<ThreadIdentifierTableData>();
+}
+void createIdentifierTableSpecific()
+{
+    pthread_once(&createIdentifierTableSpecificOnce, createIdentifierTableSpecificCallback);
+    ASSERT(g_identifierTableSpecific);
+}
+
+#else 
+
+void createIdentifierTableSpecific()
+{
+    ASSERT(!g_identifierTableSpecific);
+    g_identifierTableSpecific = new ThreadSpecific<ThreadIdentifierTableData>();
+}
+
+#endif
+
 } // namespace JSC