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

Timestamp:

Apr 16, 2008, 2:30:01 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Implement an abstraction for thread-specific storage, use it to get rid of some static objects.

SunSpider results were not conclusive, possibly up to 0.2% slowdown.

• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCore.vcproj/WTF/WTF.vcproj: Added ThreadSpecific.h

• wtf/ThreadSpecific.h: Added. (WTF::::ThreadSpecific): (WTF::::~ThreadSpecific): (WTF::::get): (WTF::::set): (WTF::::destroy): (WTF::T): (WTF::::operator): Only implemented for platforms that use pthreads.

• kjs/CommonIdentifiers.cpp: (KJS::CommonIdentifiers::shared):
• kjs/CommonIdentifiers.h:
• kjs/InitializeThreading.cpp: (KJS::initializeThreading):
• kjs/Parser.cpp: (KJS::parser):
• kjs/Parser.h:
• kjs/identifier.cpp: (KJS::identifierTable): (KJS::literalIdentifierTable): (KJS::Identifier::initializeIdentifierThreading):
• kjs/identifier.h:
• kjs/lexer.cpp: (KJS::lexer):
• kjs/lexer.h: Make static instances per-thread.

File:

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

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -29 +29 @@
 #include <wtf/FastMalloc.h>
 #include <wtf/HashSet.h>
+#if USE(MULTIPLE_THREADS)
+#include <wtf/ThreadSpecific.h>
+#endif
 
 namespace WTF {
@@ -51 +54 @@
 typedef HashSet<UString::Rep*> IdentifierTable;
 typedef HashMap<const char*, UString::Rep*, PtrHash<const char*> > LiteralIdentifierTable;
-static IdentifierTable* table;
-static LiteralIdentifierTable* literalTable;
 
 static inline IdentifierTable& identifierTable()
 {
-    ASSERT(JSLock::lockCount() > 0);
-
-    if (!table)
-        table = new IdentifierTable;
+#if USE(MULTIPLE_THREADS)
+    static ThreadSpecific<IdentifierTable> table;
     return *table;
+#else
+    static IdentifierTable table;
+    return table;
+#endif
 }
 
 static inline LiteralIdentifierTable& literalIdentifierTable()
 {
-    ASSERT(JSLock::lockCount() > 0);
-
-    if (!literalTable)
-        literalTable = new LiteralIdentifierTable;
-    return *literalTable;
-}
-
+#if USE(MULTIPLE_THREADS)
+    static ThreadSpecific<LiteralIdentifierTable> table;
+    return *table;
+#else
+    static LiteralIdentifierTable table;
+    return table;
+#endif
+}
+
+void Identifier::initializeIdentifierThreading()
+{
+    identifierTable();
+    literalIdentifierTable();
+}
 
 bool Identifier::equal(const UString::Rep *r, const char *s)