Changeset 88519 in webkit for trunk/Source/JavaScriptCore/heap/NewSpace.h

Timestamp:

Jun 9, 2011, 9:38:23 PM (14 years ago)

Author:

[email protected]

Message:

2011-06-09 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Added OldSpace to the project
​https://bugs.webkit.org/show_bug.cgi?id=62417

Currently unused.

Added OldSpace, the ability to iterate NewSpace vs OldSpace, and a
per-block flag for testing whether you're in NewSpace vs OldSpace.

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj: Build!

• heap/MarkedBlock.cpp: (JSC::MarkedBlock::MarkedBlock):
• heap/MarkedBlock.h: (JSC::MarkedBlock::inNewSpace): (JSC::MarkedBlock::setInNewSpace): Added inNewSpace flag, for use in write barrier.

• heap/NewSpace.cpp: (JSC::NewSpace::addBlock): (JSC::NewSpace::removeBlock):
• heap/NewSpace.h: (JSC::NewSpace::forEachBlock): Added forEachBlock, to use for NewSpace-specific operations.

• heap/OldSpace.cpp: Added. (JSC::OldSpace::OldSpace): (JSC::OldSpace::addBlock): (JSC::OldSpace::removeBlock):
• heap/OldSpace.h: Added. (JSC::OldSpace::forEachBlock): New class for holding promoted blocks. Not in use yet.

File:

• trunk/Source/JavaScriptCore/heap/NewSpace.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/NewSpace.h

@@ -62 +62 @@
         SizeClass& sizeClassFor(size_t);
         void* allocate(SizeClass&);
+        void resetAllocator();
 
         void addBlock(SizeClass&, MarkedBlock*);
@@ -70 +71 @@
         void setHighWaterMark(size_t);
 
-        void resetAllocator();
+        template<typename Functor> typename Functor::ReturnType forEachBlock(Functor&); // Safe to remove the current item while iterating.
+        template<typename Functor> typename Functor::ReturnType forEachBlock();
 
     private:
@@ -125 +127 @@
     }
 
+    template <typename Functor> inline typename Functor::ReturnType NewSpace::forEachBlock(Functor& functor)
+    {
+        for (size_t i = 0; i < preciseCount; ++i) {
+            SizeClass& sizeClass = m_preciseSizeClasses[i];
+            MarkedBlock* next;
+            for (MarkedBlock* block = sizeClass.blockList.head(); block; block = next) {
+                next = block->next();
+                functor(block);
+            }
+        }
+
+        for (size_t i = 0; i < impreciseCount; ++i) {
+            SizeClass& sizeClass = m_impreciseSizeClasses[i];
+            MarkedBlock* next;
+            for (MarkedBlock* block = sizeClass.blockList.head(); block; block = next) {
+                next = block->next();
+                functor(block);
+            }
+        }
+
+        return functor.returnValue();
+    }
+
+    template <typename Functor> inline typename Functor::ReturnType NewSpace::forEachBlock()
+    {
+        Functor functor;
+        return forEachBlock(functor);
+    }
+
     inline NewSpace::SizeClass::SizeClass()
         : nextBlock(0)