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

Timestamp:

May 3, 2010, 4:03:37 PM (15 years ago)

Author:

[email protected]

Message:

Rolling out r58114 - this introduced memory leaks of
AtomicStrings then workers terminated.

Reviewed by NOBODY (reverting previous commit).

• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• jit/ThunkGenerators.cpp:

(JSC::ThunkHelpers::stringImplDataOffset):

• runtime/Identifier.cpp:

(JSC::IdentifierTable::~IdentifierTable):
(JSC::IdentifierTable::add):
(JSC::IdentifierCStringTranslator::hash):
(JSC::IdentifierCStringTranslator::equal):
(JSC::IdentifierCStringTranslator::translate):
(JSC::Identifier::add):
(JSC::IdentifierUCharBufferTranslator::hash):
(JSC::IdentifierUCharBufferTranslator::equal):
(JSC::IdentifierUCharBufferTranslator::translate):
(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:

(JSC::IdentifierTable::remove):
(JSC::IdentifierTable::literalTable):
(WTF::WTFThreadData::atomicStringTable):

• wtf/text/AtomicString.cpp:

(WebCore::AtomicStringTable::create):
(WebCore::AtomicStringTable::table):
(WebCore::AtomicStringTable::destroy):
(WebCore::stringTable):
(WebCore::CStringTranslator::hash):
(WebCore::CStringTranslator::equal):
(WebCore::CStringTranslator::translate):
(WebCore::operator==):
(WebCore::AtomicString::add):
(WebCore::equal):
(WebCore::UCharBufferTranslator::hash):
(WebCore::UCharBufferTranslator::equal):
(WebCore::UCharBufferTranslator::translate):
(WebCore::HashAndCharactersTranslator::hash):
(WebCore::HashAndCharactersTranslator::equal):
(WebCore::HashAndCharactersTranslator::translate):
(WebCore::AtomicString::find):
(WebCore::AtomicString::remove):

• wtf/text/AtomicStringTable.h: Removed.
• wtf/text/StringImpl.cpp:

(WebCore::StringImpl::~StringImpl):

• wtf/text/StringImpl.h:

(WebCore::StringImpl::inTable):
(WebCore::StringImpl::setInTable):
(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.
@@ -44 +47 @@
 
 // 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 {
@@ -60 +88 @@
     ~WTFThreadData();
 
-    WebCore::AtomicStringTable& atomicStringTable()
+    WebCore::AtomicStringTable* atomicStringTable()
     {
-        return *m_atomicStringTable;
+        return m_atomicStringTable;
     }
 
@@ -92 +120 @@
 private:
     WebCore::AtomicStringTable* m_atomicStringTable;
+    AtomicStringTableDestructor m_atomicStringTableDestructor;
 
 #if USE(JSC)
@@ -104 +133 @@
 #endif
     friend WTFThreadData& wtfThreadData();
+    friend class WebCore::AtomicStringTable;
 };