Changeset 58114 in webkit for trunk/JavaScriptCore/wtf/WTFThreadData.h

Timestamp:

Apr 22, 2010, 1:31:04 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=37978
Unify JSC::IdentifierTable and WebCore::AtomicStringTable implementations.

Reviewed by Geoff Garen.

These two classes both implement a HashSet of uniqued StringImpls, with
translator classes to avoid unnecessary object creation. The only difference
between the classes is which flag (isIdentifier or inTable) is set.
Combine the two classes using a template predicated on which flag to use.

New class AtomicStringTable created, containing all the goodness from
IdentifierTable & AtomicStringTable, expect for Identifier's literalTable,
which has been moved onto JSGlobalData. Removed duplicate string translator
classes. Renamed StringImpl's inTable flag to more explicit 'isAtomic',
and set this on the empty string (which matches Identifier behaviour, and
removes a redundant check for zero-length).

• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Identifier.cpp:

(JSC::createLiteralTable):
(JSC::deleteLiteralTable):
(JSC::Identifier::add):
(JSC::Identifier::addSlowCase):

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

(JSC::JSGlobalData::JSGlobalData):
(JSC::JSGlobalData::~JSGlobalData):

• runtime/JSGlobalData.h:
• wtf/WTFThreadData.cpp:

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

• wtf/WTFThreadData.h:

(WTF::WTFThreadData::atomicStringTable):

• wtf/text/AtomicString.cpp:

(WebCore::table):
(WebCore::operator==):
(WebCore::AtomicString::add):
(WebCore::AtomicString::find):
(WebCore::AtomicString::remove):

• wtf/text/AtomicStringTable.h: Added.

(WTF::CStringTranslator::hash):
(WTF::CStringTranslator::equal):
(WTF::CStringTranslator::translate):
(WTF::UCharBufferTranslator::hash):
(WTF::UCharBufferTranslator::equal):
(WTF::UCharBufferTranslator::translate):
(WTF::HashAndCharactersTranslator::hash):
(WTF::HashAndCharactersTranslator::equal):
(WTF::HashAndCharactersTranslator::translate):
(WTF::IdentifierOrAtomicStringTable::remove):
(WTF::::~IdentifierOrAtomicStringTable):
(WTF::::add):
(WTF::::find):

• wtf/text/StringImpl.cpp:

(WebCore::StringImpl::~StringImpl):

• wtf/text/StringImpl.h:

(WebCore::StringImpl::isAtomic):
(WebCore::StringImpl::setIsAtomic):
(WebCore::equal):

• wtf/text/StringImplBase.h:

(WTF::StringImplBase::StringImplBase):

File:

• trunk/JavaScriptCore/wtf/WTFThreadData.h (modified) (5 diffs)

trunk/JavaScriptCore/wtf/WTFThreadData.h

@@ -28 +28 @@
 #define WTFThreadData_h
 
-#include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/text/StringHash.h>
 
 // This was ENABLE(WORKERS) in WebCore, but this is not defined when compiling JSC.
@@ -47 +44 @@
 
 // FIXME: This is a temporary layering violation while we move more string code to WTF.
+namespace JSC {
+class IdentifierTable;
+}
+
+// FIXME: This is a temporary layering violation while we move more string code to WTF.
 namespace WebCore {
 class AtomicStringTable;
-class StringImpl;
 }
-using WebCore::StringImpl;
-
-typedef void (*AtomicStringTableDestructor)(WebCore::AtomicStringTable*);
-
-#if USE(JSC)
-// FIXME: This is a temporary layering violation while we move more string code to WTF.
-namespace JSC {
-
-typedef HashMap<const char*, RefPtr<StringImpl>, PtrHash<const char*> > LiteralIdentifierTable;
-
-class IdentifierTable : public FastAllocBase {
-public:
-    ~IdentifierTable();
-
-    std::pair<HashSet<StringImpl*>::iterator, bool> add(StringImpl* value);
-    template<typename U, typename V>
-    std::pair<HashSet<StringImpl*>::iterator, bool> add(U value);
-
-    void remove(StringImpl* r) { m_table.remove(r); }
-
-    LiteralIdentifierTable& literalTable() { return m_literalTable; }
-
-private:
-    HashSet<StringImpl*> m_table;
-    LiteralIdentifierTable m_literalTable;
-};
-
-}
-#endif
 
 namespace WTF {
@@ -88 +60 @@
     ~WTFThreadData();
 
-    WebCore::AtomicStringTable* atomicStringTable()
+    WebCore::AtomicStringTable& atomicStringTable()
     {
-        return m_atomicStringTable;
+        return *m_atomicStringTable;
     }
 
@@ -120 +92 @@
 private:
     WebCore::AtomicStringTable* m_atomicStringTable;
-    AtomicStringTableDestructor m_atomicStringTableDestructor;
 
 #if USE(JSC)
@@ -133 +104 @@
 #endif
     friend WTFThreadData& wtfThreadData();
-    friend class WebCore::AtomicStringTable;
 };