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

Timestamp:

Jun 8, 2011, 1:16:23 PM (14 years ago)

Author:

[email protected]

Message:

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

Reviewed by Oliver Hunt.

Some more MarkedSpace => NewSpace renaming
​https://bugs.webkit.org/show_bug.cgi?id=62305

• JavaScriptCore.exp:
• JavaScriptCore.order:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• heap/Heap.cpp: (JSC::Heap::Heap): (JSC::Heap::destroy): (JSC::Heap::reportExtraMemoryCostSlowCase): (JSC::Heap::allocate): (JSC::Heap::markRoots): (JSC::Heap::objectCount): (JSC::Heap::size): (JSC::Heap::capacity): (JSC::Heap::collect): (JSC::Heap::isValidAllocation):
• heap/Heap.h: (JSC::Heap::markedSpace): (JSC::Heap::contains): (JSC::Heap::forEach): (JSC::Heap::allocate):
• runtime/JSCell.h:

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) < MarkedSpace::maxCellSize, class_fits_in_cell)
+#define ASSERT_CLASS_FITS_IN_CELL(class) COMPILE_ASSERT(sizeof(class) < NewSpace::maxCellSize, class_fits_in_cell)
 
 namespace JSC {
@@ -44 +44 @@
     typedef MarkStack SlotVisitor;
 
-    class MarkedSpace {
-        WTF_MAKE_NONCOPYABLE(MarkedSpace);
+    class NewSpace {
+        WTF_MAKE_NONCOPYABLE(NewSpace);
     public:
         static const size_t maxCellSize = 1024;
@@ -58 +58 @@
         };
 
-        MarkedSpace(Heap*);
+        NewSpace(Heap*);
         void destroy();
 
@@ -107 +107 @@
     };
 
-    inline bool MarkedSpace::contains(const void* x)
+    inline bool NewSpace::contains(const void* x)
     {
         if (!MarkedBlock::isAtomAligned(x))
@@ -119 +119 @@
     }
 
-    template <typename Functor> inline void MarkedSpace::forEach(Functor& functor)
+    template <typename Functor> inline void NewSpace::forEach(Functor& functor)
     {
         BlockIterator end = m_blocks.end();
@@ -126 +126 @@
     }
 
-    inline size_t MarkedSpace::highWaterMark()
+    inline size_t NewSpace::highWaterMark()
     {
         return m_highWaterMark;
     }
 
-    inline void MarkedSpace::setHighWaterMark(size_t highWaterMark)
+    inline void NewSpace::setHighWaterMark(size_t highWaterMark)
     {
         m_highWaterMark = highWaterMark;
     }
 
-    inline MarkedSpace::SizeClass& MarkedSpace::sizeClassFor(size_t bytes)
+    inline NewSpace::SizeClass& NewSpace::sizeClassFor(size_t bytes)
     {
         ASSERT(bytes && bytes < maxCellSize);
@@ -144 +144 @@
     }
 
-    inline void* MarkedSpace::allocate(SizeClass& sizeClass)
+    inline void* NewSpace::allocate(SizeClass& sizeClass)
     {
         for (MarkedBlock*& block = sizeClass.nextBlock ; block; block = block->next()) {
@@ -159 +159 @@
     }
 
-    inline MarkedSpace::SizeClass::SizeClass()
+    inline NewSpace::SizeClass::SizeClass()
         : nextBlock(0)
         , cellSize(0)
@@ -165 +165 @@
     }
 
-    inline void MarkedSpace::SizeClass::resetAllocator()
+    inline void NewSpace::SizeClass::resetAllocator()
     {
         nextBlock = blockList.head();