Changeset 42676 in webkit for trunk/JavaScriptCore/interpreter/RegisterFile.h

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/interpreter/RegisterFile.h (modified) (3 diffs)

trunk/JavaScriptCore/interpreter/RegisterFile.h

@@ -45 +45 @@
 #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_REGISTER_FILE)
+#define TAG_FOR_REGISTERFILE_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
+#else
+#define TAG_FOR_REGISTERFILE_MEMORY VM_MAKE_TAG(65)
+#endif
+#else
+#define TAG_FOR_REGISTERFILE_MEMORY -1
+#endif
+
 namespace JSC {
 
@@ -166 +178 @@
         size_t bufferLength = (capacity + maxGlobals) * sizeof(Register);
     #if HAVE(MMAP)
-    #if PLATFORM(DARWIN) && defined(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
-        #define OPTIONAL_TAG VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
-    #else
-        #define OPTIONAL_TAG -1
-    #endif
-        m_buffer = static_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, OPTIONAL_TAG, 0));
+        m_buffer = static_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, TAG_FOR_REGISTERFILE_MEMORY, 0));
         if (m_buffer == MAP_FAILED) {
             fprintf(stderr, "Could not allocate register file: %d\n", errno);
@@ -228 +235 @@
 } // namespace JSC
 
+#undef TAG_FOR_REGISTERFILE_MEMORY
+
 #endif // RegisterFile_h