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

Unified Diff: third_party/tcmalloc/vendor/src/heap-checker.cc

Issue 7430002: Update the tcmalloc vendor branch to r111 (perftools version 1.8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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
Index: third_party/tcmalloc/vendor/src/heap-checker.cc
===================================================================
--- third_party/tcmalloc/vendor/src/heap-checker.cc (revision 92996)
+++ third_party/tcmalloc/vendor/src/heap-checker.cc (working copy)
@@ -52,7 +52,7 @@
#include <time.h>
#include <assert.h>
-#ifdef HAVE_LINUX_PTRACE_H
+#if defined(HAVE_LINUX_PTRACE_H) && !defined(__native_client__)
#include <linux/ptrace.h>
#endif
#ifdef HAVE_SYS_SYSCALL_H
@@ -278,10 +278,6 @@
static const int heap_checker_info_level = 0;
//----------------------------------------------------------------------
-// Cancel our InitialMallocHook_* if present.
-static void CancelInitialMallocHooks(); // defined below
-
-//----------------------------------------------------------------------
// HeapLeakChecker's own memory allocator that is
// independent of the normal program allocator.
//----------------------------------------------------------------------
@@ -1473,7 +1469,7 @@
IgnoredObjectsMap;
}
if (!ignored_objects->insert(make_pair(AsInt(ptr), object_size)).second) {
- RAW_LOG(FATAL, "Object at %p is already being ignored", ptr);
+ RAW_LOG(WARNING, "Object at %p is already being ignored", ptr);
}
}
}
« no previous file with comments | « third_party/tcmalloc/vendor/src/google/malloc_hook.h ('k') | third_party/tcmalloc/vendor/src/libc_override.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698