Changeset 76457 in webkit for trunk/Source/JavaScriptCore/runtime/ConservativeSet.cpp

Timestamp:

Jan 22, 2011, 9:03:16 PM (14 years ago)

Author:

[email protected]

Message:

2011-01-22 Geoffrey Garen <​[email protected]>

Reviewed by Dan Bernstein.

ASSERT running run-webkit-tests --threaded.
​https://bugs.webkit.org/show_bug.cgi?id=52971

SunSpider and v8 report no change.

• runtime/ConservativeSet.cpp: (JSC::ConservativeSet::grow): (JSC::ConservativeSet::add):
• runtime/ConservativeSet.h: Tweaked the inline capacity to 128, and the growth policy to 2X, to make SunSpider and v8 happy. (JSC::ConservativeSet::ConservativeSet): (JSC::ConservativeSet::~ConservativeSet): (JSC::ConservativeSet::mark): Use OSAllocator directly, instead of malloc. Malloc is forbidden during a multi-threaded mark phase because it can cause deadlock.

2011-01-22 Geoffrey Garen <​[email protected]>

Reviewed by Dan Bernstein.

Beefed up --threaded mode to catch even more kinds of errors.
​https://bugs.webkit.org/show_bug.cgi?id=52971

• DumpRenderTree/pthreads/JavaScriptThreadingPthreads.cpp: Use a shared context group to force JSC to mark multiple threads. (This used to be the default, but it changed in SnowLeopard.) (runJavaScriptThread): Do more locking and unlocking, and more allocation, to give threading mistakes more chances to show themselves. (startJavaScriptThreads): (stopJavaScriptThreads):

File:

• trunk/Source/JavaScriptCore/runtime/ConservativeSet.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/ConservativeSet.cpp

@@ -34 +34 @@
 }
 
+void ConservativeSet::grow()
+{
+    size_t newCapacity = m_capacity == inlineCapacity ? nonInlineCapacity : m_capacity * 2;
+    JSCell** newSet = static_cast<JSCell**>(OSAllocator::reserveAndCommit(newCapacity * sizeof(JSCell*)));
+    memcpy(newSet, m_set, m_size * sizeof(JSCell*));
+    if (m_set != m_inlineSet)
+        OSAllocator::decommitAndRelease(m_set, m_capacity * sizeof(JSCell*));
+    m_capacity = newCapacity;
+    m_set = newSet;
+}
+
 void ConservativeSet::add(void* begin, void* end)
 {
@@ -44 +55 @@
         if (!m_heap->contains(*it))
             continue;
-        m_vector.append(reinterpret_cast<JSCell*>(*it));
+
+        if (m_size == m_capacity)
+            grow();
+
+        m_set[m_size++] = reinterpret_cast<JSCell*>(*it);
     }
 }