Changeset 42705 in webkit for trunk/JavaScriptCore/runtime/Collector.cpp

Timestamp:

Apr 21, 2009, 12:23:10 AM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-04-20 Geoffrey Garen <​[email protected]>

Reviewed by Mark Rowe.

Tiger crash fix: Put VM tags in their own header file, and fixed up the
#ifdefs so they're not used on Tiger.

• JavaScriptCore.xcodeproj/project.pbxproj:
• interpreter/RegisterFile.h: (JSC::RegisterFile::RegisterFile):
• jit/ExecutableAllocatorFixedVMPool.cpp: (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
• jit/ExecutableAllocatorPosix.cpp: (JSC::ExecutablePool::systemAlloc):
• runtime/Collector.cpp: (JSC::allocateBlock):
• wtf/VMTags.h: Added.

JavaScriptGlue:

2009-04-20 Geoffrey Garen <​[email protected]>

Reviewed by Mark Rowe.

Tiger crash fix: Put VM tags in their own header file, and fixed up the
#ifdefs so they're not used on Tiger.

• ForwardingHeaders/wtf/VMTags.h: Copied from JavaScriptGlue/ForwardingHeaders/wtf/HashTraits.h.

WebCore:

2009-04-20 Geoffrey Garen <​[email protected]>

Reviewed by Mark Rowe.

Tiger crash fix: Put VM tags in their own header file, and fixed up the
#ifdefs so they're not used on Tiger.

• ForwardingHeaders/wtf/VMTags.h: Copied from WebCore/ForwardingHeaders/wtf/HashTraits.h.

WebKit/mac:

2009-04-20 Geoffrey Garen <​[email protected]>

Reviewed by Mark Rowe.

Tiger crash fix: Put VM tags in their own header file, and fixed up the
#ifdefs so they're not used on Tiger.

• ForwardingHeaders/wtf/VMTags.h: Copied from ForwardingHeaders/wtf/HashTraits.h.

File:

• trunk/JavaScriptCore/runtime/Collector.cpp (modified) (5 diffs)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -38 +38 @@
 #include <wtf/HashCountedSet.h>
 #include <wtf/UnusedParam.h>
+#include <wtf/VMTags.h>
 
 #if PLATFORM(DARWIN)
@@ -46 +47 @@
 #include <mach/thread_act.h>
 #include <mach/vm_map.h>
-#include <mach/vm_statistics.h>
 
 #elif PLATFORM(WIN_OS)
@@ -74 +74 @@
 #define DEBUG_COLLECTOR 0
 #define COLLECT_ON_EVERY_ALLOCATION 0
-
-#if PLATFORM(DARWIN)
-// On Mac OS X, the VM subsystem allows tagging memory requested from mmap and vm_map
-// in order to aid tools that inspect system memory use. 
-#if defined(VM_MEMORY_JAVASCRIPT_CORE)
-#define TAG_FOR_COLLECTOR_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_CORE)
-#else
-#define TAG_FOR_COLLECTOR_MEMORY VM_MAKE_TAG(63)
-#endif
-#endif
 
 using std::max;
@@ -195 +185 @@
     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 | TAG_FOR_COLLECTOR_MEMORY, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT);
+    vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, VM_FLAGS_ANYWHERE | VM_TAG_FOR_COLLECTOR_MEMORY, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT);
 #elif PLATFORM(SYMBIAN)
     // no memory map in symbian, need to hack with fastMalloc
@@ -1136 +1126 @@
 
 } // namespace JSC
-
-#if PLATFORM(DARWIN)
-#undef TAG_FOR_COLLECTOR_MEMORY
-#endif