Changeset 20019 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.cpp

Timestamp:

Mar 7, 2007, 7:37:06 AM (18 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Maciej.

​http://bugs.webkit.org/show_bug.cgi?id=12997

Wrap pthread-specific assertion in #if USE(MULTIPLE_THREADS).

• kjs/collector.cpp: (KJS::Collector::markMainThreadOnlyObjects):

WebCore:

Reviewed by Maciej Stachowiak.

Fixed <rdar://problem/4576242> | ​http://bugs.webkit.org/show_bug.cgi?id=12586
PAC file: malloc deadlock sometimes causes a hang @ www.apple.com/pro/profiles/ (12586)

No test because this is very difficult to repro, and the new ASSERTs in
JavaScriptCore catch the underlying cause while running normal layout tests.

This is a modified version of r14752 on the branch.

The fix is to use a bit inside each node, instead of a hash table, to track
which node subtrees are in the process of being marked. This avoids a call
to malloc inside mark().

• bindings/js/kjs_binding.cpp: (KJS::domObjects): (KJS::domNodesPerDocument):
• bindings/js/kjs_dom.cpp: (KJS::DOMNode::mark):
• dom/Node.cpp: (WebCore::Node::Node):
• dom/Node.h:

File:

• trunk/JavaScriptCore/wtf/FastMalloc.cpp (modified) (7 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -66 +66 @@
 #include "FastMalloc.h"
 
+#include "Assertions.h"
+
 #ifndef USE_SYSTEM_MALLOC
 #ifndef NDEBUG
@@ -74 +76 @@
 #endif
 
+#ifndef NDEBUG
+namespace WTF {
+
+static bool isForbidden = false;
+void fastMallocForbid()
+{
+    isForbidden = true;
+}
+
+void fastMallocAllow()
+{
+    isForbidden = false;
+}
+
+} // namespace WTF
+#endif
+
 #if USE_SYSTEM_MALLOC
 
@@ -85 +104 @@
 void *fastMalloc(size_t n) 
 {
+    ASSERT(!isForbidden);
     return malloc(n);
 }
@@ -90 +110 @@
 void *fastCalloc(size_t n_elements, size_t element_size)
 {
+    ASSERT(!isForbidden);
     return calloc(n_elements, element_size);
 }
@@ -95 +116 @@
 void fastFree(void* p)
 {
+    ASSERT(!isForbidden);
     free(p);
 }
@@ -100 +122 @@
 void *fastRealloc(void* p, size_t n)
 {
+    ASSERT(!isForbidden);
     return realloc(p, n);
 }
@@ -1881 +1904 @@
 #ifdef WTF_CHANGES
     ASSERT(isMultiThreaded || pthread_main_np());
+    ASSERT(!isForbidden);
 #endif