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

Timestamp:

Sep 19, 2011, 11:54:33 AM (14 years ago)

Author:

[email protected]

Message:

Rename NewSpace to MarkedSpace
​https://bugs.webkit.org/show_bug.cgi?id=68375

Reviewed by Gavin Barraclough.

Rename NewSpace to a more accurate name, and update all uses.
This patch doesn't rename the files themselves as that will
just make the patch appear bigger than it is.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• heap/Heap.cpp:

(JSC::CountFunctor::TakeIfEmpty::TakeIfEmpty):
(JSC::CountFunctor::TakeIfEmpty::operator()):
(JSC::Heap::Heap):
(JSC::Heap::reportExtraMemoryCostSlowCase):
(JSC::Heap::tryAllocate):
(JSC::Heap::allocateSlowCase):
(JSC::Heap::collect):
(JSC::Heap::canonicalizeBlocks):
(JSC::Heap::resetAllocator):
(JSC::Heap::isValidAllocation):
(JSC::Heap::shrink):

• heap/Heap.h:

(JSC::Heap::markedSpace):
(JSC::Heap::sizeClassFor):
(JSC::Heap::allocate):

• heap/NewSpace.cpp:

(JSC::MarkedSpace::MarkedSpace):
(JSC::MarkedSpace::addBlock):
(JSC::MarkedSpace::removeBlock):
(JSC::MarkedSpace::resetAllocator):
(JSC::MarkedSpace::canonicalizeBlocks):

• heap/NewSpace.h:

(JSC::MarkedSpace::waterMark):
(JSC::MarkedSpace::highWaterMark):
(JSC::MarkedSpace::setHighWaterMark):
(JSC::MarkedSpace::sizeClassFor):
(JSC::MarkedSpace::allocate):
(JSC::MarkedSpace::forEachBlock):
(JSC::MarkedSpace::SizeClass::SizeClass):
(JSC::MarkedSpace::SizeClass::resetAllocator):
(JSC::MarkedSpace::SizeClass::canonicalizeBlock):

• jit/JITInlineMethods.h:

(JSC::JIT::emitAllocateBasicJSObject):

File:

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

trunk/Source/JavaScriptCore/heap/NewSpace.h

@@ -33 +33 @@
 #include <wtf/Vector.h>
 
-#define ASSERT_CLASS_FITS_IN_CELL(class) COMPILE_ASSERT(sizeof(class) < NewSpace::maxCellSize, class_fits_in_cell)
+#define ASSERT_CLASS_FITS_IN_CELL(class) COMPILE_ASSERT(sizeof(class) < MarkedSpace::maxCellSize, class_fits_in_cell)
 
 namespace JSC {
@@ -43 +43 @@
     class SlotVisitor;
 
-    class NewSpace {
-        WTF_MAKE_NONCOPYABLE(NewSpace);
+    class MarkedSpace {
+        WTF_MAKE_NONCOPYABLE(MarkedSpace);
     public:
         static const size_t maxCellSize = 1024;
@@ -60 +60 @@
         };
 
-        NewSpace(Heap*);
+        MarkedSpace(Heap*);
 
         SizeClass& sizeClassFor(size_t);
@@ -98 +98 @@
     };
 
-    inline size_t NewSpace::waterMark()
+    inline size_t MarkedSpace::waterMark()
     {
         return m_waterMark;
     }
 
-    inline size_t NewSpace::highWaterMark()
+    inline size_t MarkedSpace::highWaterMark()
     {
         return m_highWaterMark;
     }
 
-    inline void NewSpace::setHighWaterMark(size_t highWaterMark)
+    inline void MarkedSpace::setHighWaterMark(size_t highWaterMark)
     {
         m_highWaterMark = highWaterMark;
     }
 
-    inline NewSpace::SizeClass& NewSpace::sizeClassFor(size_t bytes)
+    inline MarkedSpace::SizeClass& MarkedSpace::sizeClassFor(size_t bytes)
     {
         ASSERT(bytes && bytes < maxCellSize);
@@ -121 +121 @@
     }
 
-    inline void* NewSpace::allocate(SizeClass& sizeClass)
+    inline void* MarkedSpace::allocate(SizeClass& sizeClass)
     {
         MarkedBlock::FreeCell* firstFreeCell = sizeClass.firstFreeCell;
@@ -162 +162 @@
     }
     
-    template <typename Functor> inline typename Functor::ReturnType NewSpace::forEachBlock(Functor& functor)
+    template <typename Functor> inline typename Functor::ReturnType MarkedSpace::forEachBlock(Functor& functor)
     {
         for (size_t i = 0; i < preciseCount; ++i) {
@@ -185 +185 @@
     }
 
-    template <typename Functor> inline typename Functor::ReturnType NewSpace::forEachBlock()
+    template <typename Functor> inline typename Functor::ReturnType MarkedSpace::forEachBlock()
     {
         Functor functor;
@@ -191 +191 @@
     }
 
-    inline NewSpace::SizeClass::SizeClass()
+    inline MarkedSpace::SizeClass::SizeClass()
         : firstFreeCell(0)
         , currentBlock(0)
@@ -199 +199 @@
     }
 
-    inline void NewSpace::SizeClass::resetAllocator()
+    inline void MarkedSpace::SizeClass::resetAllocator()
     {
         nextBlock = blockList.head();
     }
     
-    inline void NewSpace::SizeClass::canonicalizeBlock()
+    inline void MarkedSpace::SizeClass::canonicalizeBlock()
     {
         if (currentBlock) {