Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: third_party/tcmalloc/chromium/src/stack_trace_table.cc

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebasec Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/tcmalloc/chromium/src/span.cc ('k') | third_party/tcmalloc/chromium/src/stacktrace.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/chromium/src/stack_trace_table.cc
diff --git a/third_party/tcmalloc/chromium/src/stack_trace_table.cc b/third_party/tcmalloc/chromium/src/stack_trace_table.cc
index faeca6be263a617f0e1959ee82f776654c029910..d258a4f8a23de3ef7380e4dfe5673d08c2f71ac5 100644
--- a/third_party/tcmalloc/chromium/src/stack_trace_table.cc
+++ b/third_party/tcmalloc/chromium/src/stack_trace_table.cc
@@ -35,7 +35,7 @@
#include <string.h> // for NULL, memset
#include "base/spinlock.h" // for SpinLockHolder
#include "common.h" // for StackTrace
-#include "internal_logging.h" // for MESSAGE, ASSERT
+#include "internal_logging.h" // for ASSERT, Log
#include "page_heap_allocator.h" // for PageHeapAllocator
#include "static_vars.h" // for Static
@@ -93,7 +93,8 @@ void StackTraceTable::AddTrace(const StackTrace& t) {
bucket_total_++;
b = Static::bucket_allocator()->New();
if (b == NULL) {
- MESSAGE("tcmalloc: could not allocate bucket", sizeof(*b));
+ Log(kLog, __FILE__, __LINE__,
+ "tcmalloc: could not allocate bucket", sizeof(*b));
error_ = true;
} else {
b->hash = h;
@@ -114,8 +115,9 @@ void** StackTraceTable::ReadStackTracesAndClear() {
const int out_len = bucket_total_ * 3 + depth_total_ + 1;
void** out = new void*[out_len];
if (out == NULL) {
- MESSAGE("tcmalloc: allocation failed for stack traces\n",
- out_len * sizeof(*out));
+ Log(kLog, __FILE__, __LINE__,
+ "tcmalloc: allocation failed for stack traces",
+ out_len * sizeof(*out));
return NULL;
}
« no previous file with comments | « third_party/tcmalloc/chromium/src/span.cc ('k') | third_party/tcmalloc/chromium/src/stacktrace.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698