Changeset 42676 in webkit for trunk/JavaScriptCore/jit/ExecutableAllocatorPosix.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/jit/ExecutableAllocatorPosix.cpp (modified) (3 diffs)

trunk/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp

@@ -37 +37 @@
 #endif
 
+#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_JIT_EXECUTABLE_ALLOCATOR)
+#define TAG_FOR_EXECUTABLEALLOCATOR_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR)
+#else
+#define TAG_FOR_EXECUTABLEALLOCATOR_MEMORY VM_MAKE_TAG(64)
+#endif
+#else
+#define TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
+#endif
+
 namespace JSC {
 
@@ -46 +58 @@
 ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
 {
-    #if PLATFORM(DARWIN) && defined(VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR)
-        #define OPTIONAL_TAG VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR)
-    #else
-        #define OPTIONAL_TAG -1
-    #endif
-
-    ExecutablePool::Allocation alloc = { reinterpret_cast<char*>(mmap(NULL, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, OPTIONAL_TAG, 0)), n };
+    ExecutablePool::Allocation alloc = { reinterpret_cast<char*>(mmap(NULL, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0)), n };
     return alloc;
 }
@@ -64 +70 @@
 }
 
+#undef TAG_FOR_EXECUTABLEALLOCATOR_MEMORY
+
 #endif // HAVE(ASSEMBLER)