Changeset 10724 in webkit for trunk/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp

Timestamp:

Oct 3, 2005, 10:57:13 PM (20 years ago)

Author:

mjs

Message:

Patch from George Staikos <​[email protected]>, reviewed and tweaked a bit by me.

• more Linux build fixes

• kjs/operations.cpp:
• kxmlcore/FastMalloc.h:
• kxmlcore/TCSystemAlloc.cpp: (TCMalloc_SystemAlloc):

File:

• trunk/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp

@@ -67 +67 @@
 // the mmap address space (1300MBish) are disjoint, so we need both allocators
 // to get as much virtual memory as possible.
+#ifndef KXC_CHANGES
 static bool use_devmem = false;
+#endif
 static bool use_sbrk = false;
 static bool use_mmap = true;
@@ -169 +171 @@
 #endif /* HAVE_MMAP */
 
+#ifndef KXC_CHANGES
 static void* TryDevMem(size_t size, size_t alignment) {
   static bool initialized = false;
@@ -239 +242 @@
   return reinterpret_cast<void*>(ptr);
 }
+#endif
 
 void* TCMalloc_SystemAlloc(size_t size, size_t alignment) {
@@ -255 +259 @@
   // more trying all allocators even if they failed before.
   for (int i = 0; i < 2; i++) {
+
+#ifndef KXC_CHANGES
     if (use_devmem && !devmem_failure) {
       void* result = TryDevMem(size, alignment);
       if (result != NULL) return result;
     }
+#endif
     
 #ifdef HAVE_SBRK