Changeset 77391 in webkit for trunk/Source/JavaScriptCore/runtime/WeakGCMap.h

Timestamp:

Feb 2, 2011, 11:21:17 AM (14 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam Weinig.

A little more Heap refactoring
​https://bugs.webkit.org/show_bug.cgi?id=53577

SunSpider reports no change.

Split out MarkedBlock into its own file / class.

Did the following renames:

isCellMarked => isMarked
checkMarkCell => testAndSetMarked
markCell => setMarked
cellOffset => cellNumber
collectorBlock => blockFor

• Android.mk:
• CMakeLists.txt:
• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Heap.cpp: (JSC::WeakGCHandlePool::update):
• runtime/Heap.h: (JSC::Heap::isMarked): (JSC::Heap::testAndSetMarked): (JSC::Heap::setMarked):
• runtime/JSArray.h: (JSC::MarkStack::markChildren): (JSC::MarkStack::drain):
• runtime/JSCell.h: (JSC::JSCell::MarkStack::internalAppend):
• runtime/MarkedBlock.cpp: Added.
• runtime/MarkedBlock.h: Added. (JSC::MarkedBlock::blockFor): (JSC::MarkedBlock::cellNumber): (JSC::MarkedBlock::isMarked): (JSC::MarkedBlock::testAndSetMarked): (JSC::MarkedBlock::setMarked): (JSC::MarkedBlock::isCellAligned): (JSC::MarkedBlock::isPossibleCell):
• runtime/MarkedSpace.h: (JSC::MarkedSpace::isMarked): (JSC::MarkedSpace::testAndSetMarked): (JSC::MarkedSpace::setMarked):
• runtime/SmallStrings.cpp: (JSC::isMarked):
• runtime/WeakGCMap.h: (JSC::WeakGCMap::isValid): (JSC::::get): (JSC::::take): (JSC::::set):

File:

• trunk/Source/JavaScriptCore/runtime/WeakGCMap.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/WeakGCMap.h

@@ -79 +79 @@
     const_iterator uncheckedEnd() const { return m_map.end(); }
 
-    bool isValid(iterator it) const { return Heap::isCellMarked(it->second.get()); }
-    bool isValid(const_iterator it) const { return Heap::isCellMarked(it->second.get()); }
+    bool isValid(iterator it) const { return Heap::isMarked(it->second.get()); }
+    bool isValid(const_iterator it) const { return Heap::isMarked(it->second.get()); }
 
 private:
@@ -92 +92 @@
     if (result == HashTraits<MappedType*>::emptyValue())
         return result;
-    if (!Heap::isCellMarked(result))
+    if (!Heap::isMarked(result))
         return HashTraits<MappedType*>::emptyValue();
     return result;
@@ -103 +103 @@
     if (result == HashTraits<MappedType*>::emptyValue())
         return result;
-    if (!Heap::isCellMarked(result))
+    if (!Heap::isMarked(result))
         return HashTraits<MappedType*>::emptyValue();
     return result;
@@ -111 +111 @@
 pair<typename WeakGCMap<KeyType, MappedType>::iterator, bool> WeakGCMap<KeyType, MappedType>::set(const KeyType& key, MappedType* value)
 {
-    Heap::markCell(value); // If value is newly allocated, it's not marked, so mark it now.
+    Heap::setMarked(value); // If value is newly allocated, it's not marked, so mark it now.
     pair<iterator, bool> result = m_map.add(key, value);
     if (!result.second) { // pre-existing entry
-        result.second = !Heap::isCellMarked(result.first->second.get());
+        result.second = !Heap::isMarked(result.first->second.get());
         result.first->second = value;
     }