Changeset 28135 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.cpp

Timestamp:

Nov 29, 2007, 12:46:14 AM (17 years ago)

Author:

[email protected]

Message:

Merging updated system alloc and spinlock code from r38 of TCMalloc.

Reviewed by Geoff

This is needed as a precursor to the merge of TCMalloc proper.

File:

• trunk/JavaScriptCore/wtf/FastMalloc.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -498 +498 @@
 static uint64_t metadata_system_bytes = 0;
 static void* MetaDataAlloc(size_t bytes) {
-  void* result = TCMalloc_SystemAlloc(bytes);
+  void* result = TCMalloc_SystemAlloc(bytes, 0);
   if (result != NULL) {
     metadata_system_bytes += bytes;
@@ -1040 +1040 @@
   ASSERT(kMaxPages >= kMinSystemAlloc);
   Length ask = (n>kMinSystemAlloc) ? n : static_cast<Length>(kMinSystemAlloc);
-  void* ptr = TCMalloc_SystemAlloc(ask << kPageShift, kPageSize);
+  void* ptr = TCMalloc_SystemAlloc(ask << kPageShift, 0, kPageSize);
   if (ptr == NULL) {
     if (n < ask) {
       // Try growing just "n" pages
       ask = n;
-      ptr = TCMalloc_SystemAlloc(ask << kPageShift, kPageSize);
+      ptr = TCMalloc_SystemAlloc(ask << kPageShift, 0, kPageSize);
     }
     if (ptr == NULL) return false;
@@ -1362 +1362 @@
 
 void TCMalloc_Central_FreeList::Init(size_t cl) {
-  lock_.Init();
   size_class_ = cl;
   DLL_Init(&empty_);