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

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.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/ConservativeSet.h

@@ -38 +38 @@
 public:
     ConservativeSet(Heap*);
+    ~ConservativeSet();
 
     void add(void* begin, void* end);
@@ -43 +44 @@
 
 private:
+    static const size_t inlineCapacity = 128;
+    static const size_t nonInlineCapacity = 8192 / sizeof(JSCell*);
+    
+    void grow();
+
     Heap* m_heap;
-    Vector<JSCell*, 64> m_vector;
+    JSCell** m_set;
+    size_t m_size;
+    size_t m_capacity;
+    JSCell* m_inlineSet[inlineCapacity];
 };
 
 inline ConservativeSet::ConservativeSet(Heap* heap)
     : m_heap(heap)
+    , m_set(m_inlineSet)
+    , m_size(0)
+    , m_capacity(inlineCapacity)
 {
+}
+
+inline ConservativeSet::~ConservativeSet()
+{
+    if (m_set != m_inlineSet)
+        OSAllocator::decommitAndRelease(m_set, m_capacity * sizeof(JSCell*));
 }
 
 inline void ConservativeSet::mark(MarkStack& markStack)
 {
-    for (size_t i = 0; i < m_vector.size(); ++i)
-        markStack.append(m_vector[i]);
+    for (size_t i = 0; i < m_size; ++i)
+        markStack.append(m_set[i]);
 }