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

Timestamp:

Jun 8, 2011, 2:39:27 PM (14 years ago)

Author:

[email protected]

Message:

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

Reviewed by Oliver Hunt.

Took some responsibilities away from NewSpace
​https://bugs.webkit.org/show_bug.cgi?id=62325

NewSpace is basically just an allocator now.

Heap acts as a controller, responsible for managing the set of all
MarkedBlocks.

This is in preparation for moving parts of the controller logic into
separate helper classes that can act on arbitrary sets of MarkedBlocks
that may or may not be in NewSpace.

• heap/Heap.cpp: (JSC::Heap::Heap): (JSC::Heap::destroy): (JSC::Heap::allocate): (JSC::Heap::markRoots): (JSC::Heap::clearMarks): (JSC::Heap::sweep): (JSC::Heap::objectCount): (JSC::Heap::size): (JSC::Heap::capacity): (JSC::Heap::collect): (JSC::Heap::resetAllocator): (JSC::Heap::allocateBlock): (JSC::Heap::freeBlocks): (JSC::Heap::shrink): Moved the set of MarkedBlocks from NewSpace to Heap, along with all functions that operate on the set of MarkedBlocks. Also moved responsibility for deciding whether to allocate a new MarkedBlock, and for allocating it.

• heap/Heap.h: (JSC::Heap::contains): (JSC::Heap::forEach): Ditto.

• heap/NewSpace.cpp: (JSC::NewSpace::addBlock): (JSC::NewSpace::removeBlock): (JSC::NewSpace::resetAllocator):
• heap/NewSpace.h: (JSC::NewSpace::waterMark): (JSC::NewSpace::allocate): Ditto.

File:

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

trunk/Source/JavaScriptCore/heap/NewSpace.h

@@ -59 +59 @@
 
         NewSpace(Heap*);
-        void destroy();
-
-        size_t highWaterMark();
-        void setHighWaterMark(size_t);
 
         SizeClass& sizeClassFor(size_t);
         void* allocate(SizeClass&);
 
-        void clearMarks();
-        void markRoots();
+        void addBlock(SizeClass&, MarkedBlock*);
+        void removeBlock(MarkedBlock*);
+
+        size_t waterMark();
+        size_t highWaterMark();
+        void setHighWaterMark(size_t);
+
         void resetAllocator();
-        void sweep();
-        void shrink();
-
-        size_t size() const;
-        size_t capacity() const;
-        size_t objectCount() const;
-
-        bool contains(const void*);
-
-        template<typename Functor> void forEach(Functor&);
 
     private:
@@ -92 +83 @@
         static const size_t impreciseCount = impreciseCutoff / impreciseStep - 1;
 
-        typedef HashSet<MarkedBlock*>::iterator BlockIterator;
-
-        MarkedBlock* allocateBlock(SizeClass&);
-        void freeBlocks(DoublyLinkedList<MarkedBlock>&);
-
-        void clearMarks(MarkedBlock*);
-
         SizeClass m_preciseSizeClasses[preciseCount];
         SizeClass m_impreciseSizeClasses[impreciseCount];
-        HashSet<MarkedBlock*> m_blocks;
         size_t m_waterMark;
         size_t m_highWaterMark;
@@ -107 +90 @@
     };
 
-    inline bool NewSpace::contains(const void* x)
+    inline size_t NewSpace::waterMark()
     {
-        if (!MarkedBlock::isAtomAligned(x))
-            return false;
-
-        MarkedBlock* block = MarkedBlock::blockFor(x);
-        if (!block || !m_blocks.contains(block))
-            return false;
-            
-        return true;
-    }
-
-    template <typename Functor> inline void NewSpace::forEach(Functor& functor)
-    {
-        BlockIterator end = m_blocks.end();
-        for (BlockIterator it = m_blocks.begin(); it != end; ++it)
-            (*it)->forEach(functor);
+        return m_waterMark;
     }
 
@@ -153 +122 @@
         }
 
-        if (m_waterMark < m_highWaterMark)
-            return allocateBlock(sizeClass)->allocate();
-
         return 0;
     }