Changeset 37563 in webkit for trunk/JavaScriptCore/kjs/StructureID.cpp

Timestamp:

Oct 13, 2008, 2:41:40 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-10-13 Sam Weinig <​[email protected]>

Reviewed by Dan Bernstein.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21577
5 false positive StructureID leaks

• Add leak ignore set to StructureID to selectively ignore leaking some StructureIDs.
• Add create method to JSGlolalData to be used when the data will be intentionally leaked and ignore all leaks caused the StructureIDs stored in it.

• JavaScriptCore.exp:
• kjs/JSGlobalData.cpp: (JSC::JSGlobalData::createLeaked):
• kjs/JSGlobalData.h:
• kjs/StructureID.cpp: (JSC::StructureID::StructureID): (JSC::StructureID::~StructureID): (JSC::StructureID::startIgnoringLeaks): (JSC::StructureID::stopIgnoringLeaks):
• kjs/StructureID.h:

WebCore:

2008-10-13 Sam Weinig <​[email protected]>

Reviewed by Dan Bernstein.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21577
5 false positive StructureID leaks

In WebCore, we intentionally leak the common JSGlobalData which in turn
leaks 5 StructureIDs. Use the new JSGlobalData::createLeaked in order to
ignore the StructureIDs leaked within.

• bindings/js/JSDOMWindowBase.cpp: (WebCore::JSDOMWindowBase::commonJSGlobalData):

File:

• trunk/JavaScriptCore/kjs/StructureID.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -40 +40 @@
 #ifndef NDEBUG    
 static WTF::RefCountedLeakCounter structureIDCounter("StructureID");
+
+static bool shouldIgnoreLeaks;
+static HashSet<StructureID*> ignoreSet;
 #endif
 
@@ -58 +61 @@
 
 #ifndef NDEBUG
-    structureIDCounter.increment();
+    if (shouldIgnoreLeaks)
+        ignoreSet.add(this);
+    else
+        structureIDCounter.increment();
 #endif
 }
@@ -73 +79 @@
 
 #ifndef NDEBUG
-    structureIDCounter.decrement();
+    HashSet<StructureID*>::iterator it = ignoreSet.find(this);
+    if (it != ignoreSet.end())
+        ignoreSet.remove(it);
+    else
+        structureIDCounter.decrement();
+#endif
+}
+
+void StructureID::startIgnoringLeaks()
+{
+#ifndef NDEBUG
+    shouldIgnoreLeaks = true;
+#endif
+}
+
+void StructureID::stopIgnoringLeaks()
+{
+#ifndef NDEBUG
+    shouldIgnoreLeaks = false;
 #endif
 }