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

Timestamp:

Mar 13, 2011, 9:56:46 PM (14 years ago)

Author:

[email protected]

Message:

A few Heap-related renames (sans file moves, which should come next)
​https://bugs.webkit.org/show_bug.cgi?id=56283

Reviewed by Sam Weinig.

ConservativeSet => ConservativeRoots. "Set" was misleading, since items
are not uniqued. Also, "Roots" is more specific about what's in the set.

MachineStackMarker => MachineThreads. "Threads" is more descriptive of
the fact that this class maintains a set of all threads using JSC.
"Stack" was misleading, since this class traverses stacks and registers.
"Mark" was misleading, since this class doesn't mark anything anymore.

registerThread => addCurrentThread. "Current" is more specific.
unregisterThread => removeCurrentThread. "Current" is more specific.

"currentThreadRegistrar" => threadSpecific. The only point of this data
structure is to register a thread-specific destructor with a pointer to
this.

"mark...Conservatively" => "gather". "Mark" is not true, since these
functions don't mark anything. "Conservatively" is redundant, since they
take "ConservativeRoots" as an argument.

• API/APIShims.h:

(JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock):

• JavaScriptCore.exp:
• runtime/ConservativeSet.cpp:

(JSC::ConservativeRoots::grow):
(JSC::ConservativeRoots::add):

• runtime/ConservativeSet.h:

(JSC::ConservativeRoots::ConservativeRoots):
(JSC::ConservativeRoots::~ConservativeRoots):
(JSC::ConservativeRoots::size):
(JSC::ConservativeRoots::roots):

• runtime/Heap.cpp:

(JSC::Heap::Heap):
(JSC::Heap::markRoots):

• runtime/Heap.h:

(JSC::Heap::machineThreads):

• runtime/JSGlobalData.h:

(JSC::JSGlobalData::makeUsableFromMultipleThreads):

• runtime/MachineStackMarker.cpp:

(JSC::MachineThreads::MachineThreads):
(JSC::MachineThreads::~MachineThreads):
(JSC::MachineThreads::makeUsableFromMultipleThreads):
(JSC::MachineThreads::addCurrentThread):
(JSC::MachineThreads::removeThread):
(JSC::MachineThreads::removeCurrentThread):
(JSC::MachineThreads::gatherFromCurrentThreadInternal):
(JSC::MachineThreads::gatherFromCurrentThread):
(JSC::MachineThreads::gatherFromOtherThread):
(JSC::MachineThreads::gatherConservativeRoots):

• runtime/MachineStackMarker.h:
• runtime/MarkStack.h:

(JSC::MarkStack::append):

File:

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

trunk/Source/JavaScriptCore/runtime/ConservativeSet.cpp

@@ -36 +36 @@
 }
 
-void ConservativeSet::grow()
+void ConservativeRoots::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*));
+    JSCell** newRoots = static_cast<JSCell**>(OSAllocator::reserveAndCommit(newCapacity * sizeof(JSCell*)));
+    memcpy(newRoots, m_roots, m_size * sizeof(JSCell*));
+    if (m_roots != m_inlineRoots)
+        OSAllocator::decommitAndRelease(m_roots, m_capacity * sizeof(JSCell*));
     m_capacity = newCapacity;
-    m_set = newSet;
+    m_roots = newRoots;
 }
 
-void ConservativeSet::add(void* begin, void* end)
+void ConservativeRoots::add(void* begin, void* end)
 {
     ASSERT(begin <= end);
@@ -61 +61 @@
             grow();
 
-        m_set[m_size++] = reinterpret_cast<JSCell*>(*it);
+        m_roots[m_size++] = reinterpret_cast<JSCell*>(*it);
     }
 }