Changeset 34412 in webkit for trunk/JavaScriptCore/kjs/identifier.cpp

Timestamp:

Jun 6, 2008, 11:03:24 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Combine per-thread objects into one, to make it easier to support legacy clients (for
which they shouldn't be really per-thread).

No change on SunSpider total.

• JavaScriptCore.xcodeproj/project.pbxproj: Added JSGlobalData.{h,cpp}

• kjs/JSGlobalData.cpp: Added. (KJS::JSGlobalData::JSGlobalData): (KJS::JSGlobalData::~JSGlobalData): (KJS::JSGlobalData::threadInstance):
• kjs/JSGlobalData.h: Added. This class encapsulates all data that should be per-thread (or shared between legacy clients). It will also keep a Heap pointer, but right now, Heap (Collector) methods are all static.

• kjs/identifier.h: (KJS::Identifier::Identifier): Added a constructor explicitly taking JSGlobalData to access IdentifierTable. Actually, all of them should, but this will be a separate patch.

• kjs/identifier.cpp: (KJS::IdentifierTable::literalTable): (KJS::createIdentifierTable): (KJS::deleteIdentifierTable): (KJS::Identifier::add): (KJS::Identifier::addSlowCase): Combined IdentifierTable and LiteralIdentifierTable into a single class for simplicity.

• kjs/grammar.y: kjsyyparse now takes JSGlobalData, not just a Lexer.

• kjs/nodes.cpp: (KJS::Node::Node): (KJS::EvalFunctionCallNode::emitCode): (KJS::ScopeNode::ScopeNode): Changed to access Lexer and Parser via JSGlobalData::threadInstance(). This is also a temporary measure, they will need to use JSGlobalData explicitly.

• VM/CodeGenerator.cpp: (KJS::CodeGenerator::CodeGenerator):
• VM/CodeGenerator.h:
• VM/Machine.cpp: (KJS::callEval):
• kjs/CommonIdentifiers.cpp: (KJS::CommonIdentifiers::CommonIdentifiers):
• kjs/CommonIdentifiers.h:
• kjs/DebuggerCallFrame.cpp: (KJS::DebuggerCallFrame::evaluate):
• kjs/ExecState.cpp: (KJS::ExecState::ExecState):
• kjs/ExecState.h: (KJS::ExecState::globalData): (KJS::ExecState::identifierTable): (KJS::ExecState::propertyNames): (KJS::ExecState::emptyList): (KJS::ExecState::lexer): (KJS::ExecState::parser): (KJS::ExecState::arrayTable): (KJS::ExecState::dateTable): (KJS::ExecState::mathTable): (KJS::ExecState::numberTable): (KJS::ExecState::RegExpImpTable): (KJS::ExecState::RegExpObjectImpTable): (KJS::ExecState::stringTable):
• kjs/InitializeThreading.cpp: (KJS::initializeThreadingOnce):
• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::init):
• kjs/JSGlobalObject.h: (KJS::JSGlobalObject::JSGlobalObjectData::JSGlobalObjectData): (KJS::JSGlobalObject::head): (KJS::JSGlobalObject::globalData):
• kjs/Parser.cpp: (KJS::Parser::parse):
• kjs/Parser.h:
• kjs/function.cpp: (KJS::FunctionImp::getParameterName): (KJS::IndexToNameMap::unMap): (KJS::globalFuncEval):
• kjs/function_object.cpp: (KJS::FunctionObjectImp::construct):
• kjs/interpreter.cpp: (KJS::Interpreter::checkSyntax): (KJS::Interpreter::evaluate):
• kjs/lexer.cpp: (kjsyylex):
• kjs/lexer.h:
• kjs/testkjs.cpp: (prettyPrintScript): Updated for the above changes. Most of threadInstance uses here will need to be replaced with explicitly passed pointers to support legacy JSC clients.

• JavaScriptCore.exp: Removed KJS::parser().

File:

• trunk/JavaScriptCore/kjs/identifier.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -29 +29 @@
 #include <wtf/FastMalloc.h>
 #include <wtf/HashSet.h>
-#if USE(MULTIPLE_THREADS)
-#include <wtf/ThreadSpecific.h>
-using namespace WTF;
-#endif
 
 namespace KJS {
+
+typedef HashMap<const char*, RefPtr<UString::Rep>, PtrHash<const char*> > LiteralIdentifierTable;
 
 class IdentifierTable {
@@ -62 +60 @@
     void remove(UString::Rep* r) { m_table.remove(r); }
 
+    LiteralIdentifierTable& literalTable() { return m_literalTable; }
+
 private:
     HashSet<UString::Rep*> m_table;
-};
-
-typedef HashMap<const char*, RefPtr<UString::Rep>, PtrHash<const char*> > LiteralIdentifierTable;
-
-static inline IdentifierTable& identifierTable()
-{
-#if USE(MULTIPLE_THREADS)
-    static ThreadSpecific<IdentifierTable> table;
-    return *table;
-#else
-    static IdentifierTable table;
-    return table;
-#endif
-}
-
-static inline LiteralIdentifierTable& literalIdentifierTable()
-{
-#if USE(MULTIPLE_THREADS)
-    static ThreadSpecific<LiteralIdentifierTable> table;
-    return *table;
-#else
-    static LiteralIdentifierTable table;
-    return table;
-#endif
-}
-
-void Identifier::initializeIdentifierThreading()
-{
-    identifierTable();
-    literalIdentifierTable();
+    LiteralIdentifierTable m_literalTable;
+};
+
+IdentifierTable* createIdentifierTable()
+{
+    return new IdentifierTable;
+}
+
+void deleteIdentifierTable(IdentifierTable* table)
+{
+    delete table;
 }
 
@@ -156 +137 @@
     }
 
-    LiteralIdentifierTable& literalTableLocalRef = literalIdentifierTable();
-
-    const LiteralIdentifierTable::iterator& iter = literalTableLocalRef.find(c);
-    if (iter != literalTableLocalRef.end())
+    IdentifierTable& identifierTable = *JSGlobalData::threadInstance().identifierTable;
+    LiteralIdentifierTable& literalIdentifierTable = identifierTable.literalTable();
+
+    const LiteralIdentifierTable::iterator& iter = literalIdentifierTable.find(c);
+    if (iter != literalIdentifierTable.end())
         return iter->second;
 
-    UString::Rep* addedString = *identifierTable().add<const char*, CStringTranslator>(c).first;
-    literalTableLocalRef.add(c, addedString);
+    UString::Rep* addedString = *identifierTable.add<const char*, CStringTranslator>(c).first;
+    literalIdentifierTable.add(c, addedString);
+
+    return addedString;
+}
+
+PassRefPtr<UString::Rep> Identifier::add(JSGlobalData* globalData, const char* c)
+{
+    if (!c) {
+        UString::Rep::null.hash();
+        return &UString::Rep::null;
+    }
+
+    if (!c[0]) {
+        UString::Rep::empty.hash();
+        return &UString::Rep::empty;
+    }
+
+    IdentifierTable& identifierTable = *globalData->identifierTable;
+    LiteralIdentifierTable& literalIdentifierTable = identifierTable.literalTable();
+
+    const LiteralIdentifierTable::iterator& iter = literalIdentifierTable.find(c);
+    if (iter != literalIdentifierTable.end())
+        return iter->second;
+
+    UString::Rep* addedString = *identifierTable.add<const char*, CStringTranslator>(c).first;
+    literalIdentifierTable.add(c, addedString);
 
     return addedString;
@@ -207 +214 @@
     
     UCharBuffer buf = {s, length}; 
-    return *identifierTable().add<UCharBuffer, UCharBufferTranslator>(buf).first;
+    return *JSGlobalData::threadInstance().identifierTable->add<UCharBuffer, UCharBufferTranslator>(buf).first;
 }
 
@@ -219 +226 @@
     }
 
-    return *identifierTable().add(r).first;
+    return *JSGlobalData::threadInstance().identifierTable->add(r).first;
 }