| Index: third_party/tcmalloc/chromium/src/debugallocation.cc
|
| diff --git a/third_party/tcmalloc/chromium/src/debugallocation.cc b/third_party/tcmalloc/chromium/src/debugallocation.cc
|
| index 6a4f2865d4b432fe9b8bb30ad67fca9e9e500d7a..e0a732210e54e62a98e38a81c1431bbaecf0b654 100644
|
| --- a/third_party/tcmalloc/chromium/src/debugallocation.cc
|
| +++ b/third_party/tcmalloc/chromium/src/debugallocation.cc
|
| @@ -486,7 +486,7 @@ class MallocBlock {
|
| // the address space could take more.
|
| static size_t max_size_t = ~0;
|
| if (size > max_size_t - sizeof(MallocBlock)) {
|
| - RAW_LOG(ERROR, "Massive size passed to malloc: %"PRIuS"", size);
|
| + RAW_LOG(ERROR, "Massive size passed to malloc: %" PRIuS "", size);
|
| return NULL;
|
| }
|
| MallocBlock* b = NULL;
|
| @@ -961,15 +961,15 @@ static void TraceStack(void) {
|
| // This protects MALLOC_TRACE, to make sure its info is atomically written.
|
| static SpinLock malloc_trace_lock(SpinLock::LINKER_INITIALIZED);
|
|
|
| -#define MALLOC_TRACE(name, size, addr) \
|
| - do { \
|
| - if (FLAGS_malloctrace) { \
|
| - SpinLockHolder l(&malloc_trace_lock); \
|
| - TracePrintf(TraceFd(), "%s\t%"PRIuS"\t%p\t%"GPRIuPTHREAD, \
|
| - name, size, addr, PRINTABLE_PTHREAD(pthread_self())); \
|
| - TraceStack(); \
|
| - TracePrintf(TraceFd(), "\n"); \
|
| - } \
|
| +#define MALLOC_TRACE(name, size, addr) \
|
| + do { \
|
| + if (FLAGS_malloctrace) { \
|
| + SpinLockHolder l(&malloc_trace_lock); \
|
| + TracePrintf(TraceFd(), "%s\t%" PRIuS "\t%p\t%" GPRIuPTHREAD, name, size, \
|
| + addr, PRINTABLE_PTHREAD(pthread_self())); \
|
| + TraceStack(); \
|
| + TracePrintf(TraceFd(), "\n"); \
|
| + } \
|
| } while (0)
|
|
|
| // ========================================================================= //
|
| @@ -1227,7 +1227,7 @@ extern "C" PERFTOOLS_DLL_DECL void* tc_new(size_t size) {
|
| void* ptr = debug_cpp_alloc(size, MallocBlock::kNewType, false);
|
| MallocHook::InvokeNewHook(ptr, size);
|
| if (ptr == NULL) {
|
| - RAW_LOG(FATAL, "Unable to allocate %"PRIuS" bytes: new failed.", size);
|
| + RAW_LOG(FATAL, "Unable to allocate %" PRIuS " bytes: new failed.", size);
|
| }
|
| return ptr;
|
| }
|
| @@ -1254,7 +1254,7 @@ extern "C" PERFTOOLS_DLL_DECL void* tc_newarray(size_t size) {
|
| void* ptr = debug_cpp_alloc(size, MallocBlock::kArrayNewType, false);
|
| MallocHook::InvokeNewHook(ptr, size);
|
| if (ptr == NULL) {
|
| - RAW_LOG(FATAL, "Unable to allocate %"PRIuS" bytes: new[] failed.", size);
|
| + RAW_LOG(FATAL, "Unable to allocate %" PRIuS " bytes: new[] failed.", size);
|
| }
|
| return ptr;
|
| }
|
|
|