Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch.

third_party/tcmalloc/chromium/src/heap-checker.cc

Index: third_party/tcmalloc/chromium/src/heap-checker.cc
===================================================================
--- third_party/tcmalloc/chromium/src/heap-checker.cc	(revision 94429)
+++ third_party/tcmalloc/chromium/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.
 //----------------------------------------------------------------------
@@ -1219,6 +1215,7 @@
                      "checking work happening in IgnoreLiveThreadsLocked!");
   }
   ResumeAllProcessThreads(num_threads, thread_pids);
+  RAW_LOG(INFO, "IsOneThread returning %d", num_threads);
   return num_threads;
 }
 
@@ -1276,6 +1273,7 @@
     // (The threads can't (de)allocate due to lock on the delete hook but
     //  if not suspended they could still mess with the pointer
     //  graph while we walk it).
+    RAW_LOG(INFO, "want_and_can_run_in_main_thread: %d", want_and_can_run_in_main_thread);
     int r = want_and_can_run_in_main_thread
             ? IgnoreLiveThreadsLocked(NULL, 1, &self_thread_pid, dummy_ap)
             : ListAllProcessThreads(NULL, IgnoreLiveThreadsLocked);
@@ -1473,7 +1471,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);
     }
   }
 }