Changeset 32822 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

May 2, 2008, 1:05:47 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoffrey Garen.

Get rid of static data in nodes.cpp (well, at least of non-debug one).

No measurable change on SunSpider.

• kjs/InitializeThreading.cpp: (KJS::initializeThreadingOnce):
• kjs/nodes.cpp: (KJS::newTrackedObjects): (KJS::trackedObjectExtraRefCounts): (KJS::initializeNodesThreading): (KJS::ParserRefCounted::ParserRefCounted): (KJS::ParserRefCounted::ref): (KJS::ParserRefCounted::deref): (KJS::ParserRefCounted::refcount): (KJS::ParserRefCounted::deleteNewObjects):
• kjs/nodes.h: Made newTrackedObjects and trackedObjectExtraRefCounts per-thread.

Location:

trunk/JavaScriptCore/kjs

Files:

• InitializeThreading.cpp (modified) (2 diffs)
• nodes.cpp (modified) (5 diffs)
• nodes.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/InitializeThreading.cpp

@@ -36 +36 @@
 #include "JSGlobalObject.h"
 #include "lexer.h"
+#include "nodes.h"
 #include "Parser.h"
 #include "ustring.h"
@@ -59 +60 @@
     JSGlobalObject::threadClassInfoHashTables();
     JSGlobalObject::head();
+    initializeNodesThreading();
 #endif
 }

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -42 +42 @@
 #include <wtf/HashSet.h>
 #include <wtf/MathExtras.h>
+#if USE(MULTIPLE_THREADS)
+#include <wtf/ThreadSpecific.h>
+#endif
+
+using namespace WTF;
 
 namespace KJS {
@@ -118 +123 @@
 #define LOG_CHANNEL_PREFIX Log
 #endif
+
 static WTFLogChannel LogKJSNodeLeaks = { 0x00000000, "", WTFLogChannelOn };
 
@@ -132 +138 @@
 #endif
 
-static HashSet<ParserRefCounted*>* newTrackedObjects;
-static HashCountedSet<ParserRefCounted*>* trackedObjectExtraRefCounts;
+static HashSet<ParserRefCounted*>* newTrackedObjects()
+{
+#if USE(MULTIPLE_THREADS)
+    static ThreadSpecific<HashSet<ParserRefCounted*> > sharedInstance;
+    return sharedInstance;
+#else
+    static HashSet<ParserRefCounted*> sharedInstance;
+    return &sharedInstance;
+#endif
+}
+
+static HashCountedSet<ParserRefCounted*>* trackedObjectExtraRefCounts()
+{
+#if USE(MULTIPLE_THREADS)
+    static ThreadSpecific<HashCountedSet<ParserRefCounted*> > sharedInstance;
+    return sharedInstance;
+#else
+    static HashCountedSet<ParserRefCounted*> sharedInstance;
+    return &sharedInstance;
+#endif
+}
+
+void initializeNodesThreading()
+{
+    newTrackedObjects();
+    trackedObjectExtraRefCounts();
+}
 
 ParserRefCounted::ParserRefCounted()
@@ -140 +171 @@
     ++ParserRefCountedCounter::count;
 #endif
-    if (!newTrackedObjects)
-        newTrackedObjects = new HashSet<ParserRefCounted*>;
-    newTrackedObjects->add(this);
-    ASSERT(newTrackedObjects->contains(this));
+    newTrackedObjects()->add(this);
+    ASSERT(newTrackedObjects()->contains(this));
 }
 
@@ -155 +184 @@
 void ParserRefCounted::ref()
 {
+    HashSet<ParserRefCounted*>* localNewTrackedObjects = newTrackedObjects();
+
     // bumping from 0 to 1 is just removing from the new nodes set
-    if (newTrackedObjects) {
-        HashSet<ParserRefCounted*>::iterator it = newTrackedObjects->find(this);
-        if (it != newTrackedObjects->end()) {
-            newTrackedObjects->remove(it);
-            ASSERT(!trackedObjectExtraRefCounts || !trackedObjectExtraRefCounts->contains(this));
-            return;
-        }
-    }
-
-    ASSERT(!newTrackedObjects || !newTrackedObjects->contains(this));
-
-    if (!trackedObjectExtraRefCounts)
-        trackedObjectExtraRefCounts = new HashCountedSet<ParserRefCounted*>;
-    trackedObjectExtraRefCounts->add(this);
+    HashSet<ParserRefCounted*>::iterator it = localNewTrackedObjects->find(this);
+    if (it != localNewTrackedObjects->end()) {
+        localNewTrackedObjects->remove(it);
+        ASSERT(!trackedObjectExtraRefCounts()->contains(this));
+        return;
+    }
+
+    ASSERT(!localNewTrackedObjects->contains(this));
+
+    trackedObjectExtraRefCounts()->add(this);
 }
 
 void ParserRefCounted::deref()
 {
-    ASSERT(!newTrackedObjects || !newTrackedObjects->contains(this));
-
-    if (!trackedObjectExtraRefCounts) {
-        delete this;
-        return;
-    }
-
-    HashCountedSet<ParserRefCounted*>::iterator it = trackedObjectExtraRefCounts->find(this);
-    if (it == trackedObjectExtraRefCounts->end())
+    ASSERT(!newTrackedObjects()->contains(this));
+    HashCountedSet<ParserRefCounted*>* localTrackedObjectExtraRefCounts = trackedObjectExtraRefCounts();
+
+    HashCountedSet<ParserRefCounted*>::iterator it = localTrackedObjectExtraRefCounts->find(this);
+    if (it == localTrackedObjectExtraRefCounts->end())
         delete this;
     else
-        trackedObjectExtraRefCounts->remove(it);
+        localTrackedObjectExtraRefCounts->remove(it);
 }
 
 unsigned ParserRefCounted::refcount()
 {
-    if (newTrackedObjects && newTrackedObjects->contains(this)) {
-        ASSERT(!trackedObjectExtraRefCounts || !trackedObjectExtraRefCounts->contains(this));
+    HashCountedSet<ParserRefCounted*>* localTrackedObjectExtraRefCounts = trackedObjectExtraRefCounts();
+
+    if (newTrackedObjects()->contains(this)) {
+        ASSERT(!localTrackedObjectExtraRefCounts->contains(this));
         return 0;
     }
 
-    ASSERT(!newTrackedObjects || !newTrackedObjects->contains(this));
-
-    if (!trackedObjectExtraRefCounts)
+    ASSERT(!newTrackedObjects()->contains(this));
+
+    if (!localTrackedObjectExtraRefCounts)
         return 1;
 
-    return 1 + trackedObjectExtraRefCounts->count(this);
+    return 1 + localTrackedObjectExtraRefCounts->count(this);
 }
 
 void ParserRefCounted::deleteNewObjects()
 {
-    if (!newTrackedObjects)
-        return;
-
+    HashSet<ParserRefCounted*>* localNewTrackedObjects = newTrackedObjects();
 #ifndef NDEBUG
-    HashSet<ParserRefCounted*>::iterator end = newTrackedObjects->end();
-    for (HashSet<ParserRefCounted*>::iterator it = newTrackedObjects->begin(); it != end; ++it)
-        ASSERT(!trackedObjectExtraRefCounts || !trackedObjectExtraRefCounts->contains(*it));
+    HashSet<ParserRefCounted*>::iterator end = localNewTrackedObjects->end();
+    for (HashSet<ParserRefCounted*>::iterator it = localNewTrackedObjects->begin(); it != end; ++it)
+        ASSERT(!trackedObjectExtraRefCounts()->contains(*it));
 #endif
-    deleteAllValues(*newTrackedObjects);
-    delete newTrackedObjects;
-    newTrackedObjects = 0;
+    deleteAllValues(*localNewTrackedObjects);
+    localNewTrackedObjects->clear();
 }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -3010 +3010 @@
     };
 
+    void initializeNodesThreading();
+
 } // namespace KJS