Changeset 57829 in webkit for trunk/JavaScriptCore/wtf/WTFThreadData.cpp

Timestamp:

Apr 19, 2010, 1:05:53 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=37745
Move string uniquing tables to (new) WTFThreadData class.

Reviewed by Sam Weinig.

Remove AtomicString's dependency on ThreadGlobalData so that we can move
WebCore's string classes up to WTF.

JavaScriptCore:

WTFThreadData.cpp/.h are based on ThreadGlobalData from WebCore.
Moved JSC & WebCore's string uniquing tables to this class.

This patch introduces a temporary layering violation in providing forward
declarations of classes from JSC and WTF; this will be resolved as we move
more string code up to WTF.

• API/APIShims.h:

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

• API/JSContextRef.cpp:
• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Completion.cpp:

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

• runtime/Identifier.cpp:

(JSC::Identifier::remove):
(JSC::Identifier::checkCurrentIdentifierTable):

• runtime/Identifier.h:
• runtime/InitializeThreading.cpp:

(JSC::initializeThreadingOnce):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::create):

• wtf/WTFThreadData.cpp: Copied from WebCore/platform/ThreadGlobalData.cpp.

(WTF::WTFThreadData::WTFThreadData):
(WTF::WTFThreadData::~WTFThreadData):

• wtf/WTFThreadData.h: Copied from WebCore/platform/ThreadGlobalData.h.

(WTF::WTFThreadData::atomicStringTable):
(WTF::WTFThreadData::initializeIdentifierTable):
(WTF::WTFThreadData::currentIdentifierTable):
(WTF::WTFThreadData::setCurrentIdentifierTable):
(WTF::WTFThreadData::resetCurrentIdentifierTable):
(WTF::wtfThreadData):

JavaScriptGlue:

• ForwardingHeaders/wtf/WTFThreadData.h: Added.
• JSUtils.cpp: Update

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

WebCore:

• ForwardingHeaders/wtf/WTFThreadData.h: Added.
• platform/ThreadGlobalData.cpp: Remove m_atomicStringTable, all wtfThreadData() to ensure threadsafely initialized.

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

• platform/ThreadGlobalData.h: Remove m_atomicStringTable.

(WebCore::ThreadGlobalData::eventNames):

• platform/text/AtomicString.cpp:

(WebCore::AtomicStringTable::create):
(WebCore::AtomicStringTable::table):
(WebCore::AtomicStringTable::destroy):
(WebCore::stringTable): Access the AtomicStringTable on wtfThreadData() rather then threadGlobalData().

File:

• trunk/JavaScriptCore/wtf/WTFThreadData.cpp (copied) (copied from trunk/WebCore/platform/ThreadGlobalData.cpp ) (2 diffs)

trunk/JavaScriptCore/wtf/WTFThreadData.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 
 #include "config.h"
-#include "ThreadGlobalData.h"
+#include "WTFThreadData.h"
 
-#include "EventNames.h"
-#include "StringImpl.h"
-#include "ThreadTimers.h"
-#include <wtf/UnusedParam.h>
+namespace WTF {
 
-#if USE(ICU_UNICODE)
-#include "TextCodecICU.h"
+#if WTFTHREADDATA_MULTITHREADED
+ThreadSpecific<WTFThreadData>* WTFThreadData::staticData;
+#else
+WTFThreadData* WTFThreadData::staticData;
 #endif
 
-#if PLATFORM(MAC)
-#include "TextCodecMac.h"
-#endif
-
-#if ENABLE(WORKERS)
-#include <wtf/Threading.h>
-#include <wtf/ThreadSpecific.h>
-using namespace WTF;
-#endif
-
-namespace WebCore {
-
-#if ENABLE(WORKERS)
-ThreadSpecific<ThreadGlobalData>* ThreadGlobalData::staticData;
-#else
-ThreadGlobalData* ThreadGlobalData::staticData;
-#endif
-
-ThreadGlobalData::ThreadGlobalData()
-    : m_atomicStringTable(new HashSet<StringImpl*>)
-    , m_eventNames(new EventNames)
-    , m_threadTimers(new ThreadTimers)
-#ifndef NDEBUG
-    , m_isMainThread(isMainThread())
-#endif
-#if USE(ICU_UNICODE)
-    , m_cachedConverterICU(new ICUConverterWrapper)
-#endif
-#if PLATFORM(MAC)
-    , m_cachedConverterTEC(new TECConverterWrapper)
+WTFThreadData::WTFThreadData()
+    : m_atomicStringTable(0)
+    , m_atomicStringTableDestructor(0)
+#if USE(JSC)
+    , m_defaultIdentifierTable(0)
+    , m_currentIdentifierTable(0)
 #endif
 {
-    // StringImpl::empty() does not construct its static string in a threadsafe fashion,
-    // so ensure it has been initialized from here.
-    //
-    // This constructor will have been called on the main thread before being called on
-    // any other thread, and is only called once per thread.
-    StringImpl::empty();
 }
 
-ThreadGlobalData::~ThreadGlobalData()
+WTFThreadData::~WTFThreadData()
 {
-#if PLATFORM(MAC)
-    delete m_cachedConverterTEC;
-#endif
-#if USE(ICU_UNICODE)
-    delete m_cachedConverterICU;
-#endif
-    delete m_eventNames;
-    delete m_atomicStringTable;
-    delete m_threadTimers;
+    if (m_atomicStringTableDestructor)
+        m_atomicStringTableDestructor(m_atomicStringTable);
 }