Changeset 30576 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Feb 25, 2008, 2:44:23 PM (17 years ago)

Author:

[email protected]

Message:

2008-02-25 Mark Mentovai <​[email protected]>

Reviewed by Mark Rowe.

Enable CollectorHeapIntrospector to build by itself, as well as in an AllInOneFile build.
​http://bugs.webkit.org/show_bug.cgi?id=17538

• kjs/CollectorHeapIntrospector.cpp: Provide "using" declaration for WTF::RemoteMemoryReader.
• kjs/collector.h: Move CollectorHeap declaration here...
• kjs/collector.cpp: ... from here.

Location:

trunk/JavaScriptCore/kjs

Files:

• CollectorHeapIntrospector.cpp (modified) (1 diff)
• collector.cpp (modified) (1 diff)
• collector.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/CollectorHeapIntrospector.cpp

@@ -32 +32 @@
 #include "collector.h"
 #include "MallocZoneSupport.h"
+
+using WTF::RemoteMemoryReader;
 
 namespace KJS {

trunk/JavaScriptCore/kjs/collector.cpp

@@ -84 +84 @@
 const size_t LOW_WATER_FACTOR = 4;
 const size_t ALLOCATIONS_PER_COLLECTION = 4000;
-
-enum OperationInProgress { NoOperation, Allocation, Collection };
-
-struct CollectorHeap {
-  CollectorBlock** blocks;
-  size_t numBlocks;
-  size_t usedBlocks;
-  size_t firstBlockWithPossibleSpace;
-  
-  size_t numLiveObjects;
-  size_t numLiveObjectsAtLastCollect;
-  size_t extraCost;
-
-  OperationInProgress operationInProgress;
-};
 
 static CollectorHeap primaryHeap = { 0, 0, 0, 0, 0, 0, 0, NoOperation };

trunk/JavaScriptCore/kjs/collector.h

@@ -157 +157 @@
   };
 
+  enum OperationInProgress { NoOperation, Allocation, Collection };
+
+  struct CollectorHeap {
+    CollectorBlock** blocks;
+    size_t numBlocks;
+    size_t usedBlocks;
+    size_t firstBlockWithPossibleSpace;
+
+    size_t numLiveObjects;
+    size_t numLiveObjectsAtLastCollect;
+    size_t extraCost;
+
+    OperationInProgress operationInProgress;
+  };
+
   inline const CollectorBlock* Collector::cellBlock(const JSCell* cell)
   {