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

Timestamp:

Apr 20, 2009, 11:12:39 AM (16 years ago)

Author:

[email protected]

Message:

2009-04-20 Sam Weinig <​[email protected]>

Reviewed by Kevin McCullough.

Always tag mmaped memory on darwin and clean up #defines
now that they are a little bigger.

• interpreter/RegisterFile.h: (JSC::RegisterFile::RegisterFile):
• jit/ExecutableAllocatorFixedVMPool.cpp: (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
• jit/ExecutableAllocatorPosix.cpp: (JSC::ExecutablePool::systemAlloc):
• runtime/Collector.cpp: (JSC::allocateBlock):

File:

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

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -75 +75 @@
 #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;
 
@@ -183 +193 @@
 {
 #if PLATFORM(DARWIN)
-    #if defined(VM_MEMORY_JAVASCRIPT_CORE)
-        #define TAG VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_CORE)
-    #else
-        #define TAG 0
-    #endif
     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, 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 | 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
@@ -1131 +1136 @@
 
 } // namespace JSC
+
+#if PLATFORM(DARWIN)
+#undef TAG_FOR_COLLECTOR_MEMORY
+#endif