Changeset 35097 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Jul 10, 2008, 10:55:26 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Mark Rowe.

Eliminate CollectorHeapIntrospector.

CollectorHeapIntrospector was added primarily in the hopes to improve leaks tool output,
a result that it didn't deliver. Also, it helped by labeling JSC heap regions as reported by
vmmap tool, but at the same time, it made them mislabeled as malloc'd ones - the correct
way to label mapped regions is to use a VM tag.

So, it makes more sense to remove it completely than to make it work with multiple heaps.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/AllInOneFile.cpp:
• kjs/InitializeThreading.cpp: (KJS::initializeThreading):
• kjs/collector.cpp:
• kjs/collector.h:
• kjs/CollectorHeapIntrospector.cpp: Removed.
• kjs/CollectorHeapIntrospector.h: Removed.

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -50 +50 @@
 #include <mach/vm_map.h>
 
-#include "CollectorHeapIntrospector.h"
-
 #elif PLATFORM(WIN_OS)
 
@@ -118 +116 @@
 static NEVER_INLINE CollectorBlock* allocateBlock()
 {
-#if PLATFORM(DARWIN)    
+#if PLATFORM(DARWIN)
     vm_address_t address = 0;
+    // FIXME: tag the region as a JavaScriptCore heap when we get a registered VM tag: <rdar://problem/6054788>.
     vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, VM_FLAGS_ANYWHERE, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT);
 #elif PLATFORM(WIN_OS)
@@ -489 +488 @@
 }
 
-#if PLATFORM(DARWIN)
-void Heap::initializeHeapIntrospector()
-{
-    ASSERT(pthread_main_np());
-    CollectorHeapIntrospector::init(&primaryHeap, &numberHeap);
-}
-#endif
 #endif