Index: third_party/tcmalloc/chromium/src/page_heap_allocator.h |
=================================================================== |
--- third_party/tcmalloc/chromium/src/page_heap_allocator.h (revision 124832) |
+++ third_party/tcmalloc/chromium/src/page_heap_allocator.h (working copy) |
@@ -37,7 +37,7 @@ |
#include "common.h" // for MetaDataAlloc |
#include "free_list.h" // for FL_Push/FL_Pop |
-#include "internal_logging.h" // for ASSERT |
+#include "internal_logging.h" // for ASSERT, CRASH |
#include "system-alloc.h" // for TCMalloc_SystemAddGuard |
namespace tcmalloc { |
@@ -71,10 +71,9 @@ |
// suitably aligned memory. |
free_area_ = reinterpret_cast<char*>(MetaDataAlloc(kAllocIncrement)); |
if (free_area_ == NULL) { |
- Log(kCrash, __FILE__, __LINE__, |
- "FATAL ERROR: Out of memory trying to allocate internal " |
- "tcmalloc data (bytes, object-size)", |
- kAllocIncrement, sizeof(T)); |
+ CRASH("FATAL ERROR: Out of memory trying to allocate internal " |
+ "tcmalloc data (%d bytes, object-size %d)\n", |
+ kAllocIncrement, static_cast<int>(sizeof(T))); |
} |
// This guard page protects the metadata from being corrupted by a |
@@ -86,10 +85,9 @@ |
free_area_ += guard_size; |
free_avail_ = kAllocIncrement - guard_size; |
if (free_avail_ < sizeof(T)) { |
- Log(kCrash, __FILE__, __LINE__, |
- "FATAL ERROR: Insufficient memory to guard internal tcmalloc " |
- "data (%d bytes, object-size %d, guard-size %d)\n", |
- kAllocIncrement, static_cast<int>(sizeof(T)), guard_size); |
+ CRASH("FATAL ERROR: Insufficient memory to guard internal tcmalloc " |
+ "data (%d bytes, object-size %d, guard-size %d)\n", |
+ kAllocIncrement, static_cast<int>(sizeof(T)), guard_size); |
} |
} |
result = free_area_; |