Changeset 34760 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Jun 24, 2008, 2:51:07 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Cameron Zwarich.

Make ParserRefCountedCounter actually perform a leak check.

• kjs/nodes.cpp: (KJS::ParserRefCountedCounter::~ParserRefCountedCounter): Check for leaks in destructor, not in constructor. (KJS::ParserRefCountedCounter::increment): (KJS::ParserRefCountedCounter::decrement): (KJS::ParserRefCounted::ParserRefCounted): (KJS::ParserRefCounted::~ParserRefCounted): While at it, also made counting thread-safe.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -43 +43 @@
 #include <wtf/HashSet.h>
 #include <wtf/MathExtras.h>
+#include <wtf/Threading.h>
 
 namespace KJS {
@@ -60 +61 @@
 
 struct ParserRefCountedCounter {
-    static unsigned count;
-    ParserRefCountedCounter()
+    ~ParserRefCountedCounter()
     {
         if (count)
             LOG(KJSNodeLeaks, "LEAK: %u KJS::Node\n", count);
     }
+
+    static void increment();
+    static void decrement();
+
+private:
+    static volatile int count;
 };
-unsigned ParserRefCountedCounter::count = 0;
+
+volatile int ParserRefCountedCounter::count = 0;
+
+#if USE(MULTIPLE_THREADS)
+void ParserRefCountedCounter::increment()
+{
+    atomicIncrement(&count);
+}
+
+void ParserRefCountedCounter::decrement()
+{
+    atomicDecrement(&count);
+}
+
+#else
+
+void ParserRefCountedCounter::increment()
+{
+    ++count;
+}
+
+void ParserRefCountedCounter::decrement()
+{
+    --count;
+}
+#endif
+
 static ParserRefCountedCounter parserRefCountedCounter;
+
 #endif
 
@@ -77 +110 @@
 {
 #ifndef NDEBUG
-    ++ParserRefCountedCounter::count;
+    ParserRefCountedCounter::increment();
 #endif
     if (!newTrackedObjects)
@@ -88 +121 @@
 {
 #ifndef NDEBUG
-    --ParserRefCountedCounter::count;
+    ParserRefCountedCounter::decrement();
 #endif
 }