Merged third_party/tcmalloc/vendor/src(google-perftools r87) into...

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 41942)
+++ third_party/tcmalloc/chromium/src/heap-checker.cc	(working copy)
@@ -47,11 +47,9 @@
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
-#ifdef HAVE_POLL_H
-#include <poll.h>
-#endif
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <time.h>
 #include <assert.h>
 
 #ifdef HAVE_LINUX_PTRACE_H
@@ -1834,7 +1832,9 @@
 //
 /*static*/ void HeapLeakChecker::InternalInitStart() {
   { SpinLockHolder l(&heap_checker_lock);
-    RAW_CHECK(!internal_init_start_has_run, "Only one call is expected");
+    RAW_CHECK(!internal_init_start_has_run,
+              "Heap-check constructor called twice.  Perhaps you both linked"
+              " in the heap checker, and also used LD_PRELOAD to load it?");
     internal_init_start_has_run = true;
 
     if (FLAGS_heap_check.empty()) {
@@ -2298,7 +2298,8 @@
   }
   if (FLAGS_heap_check_after_destructors) {
     if (HeapLeakChecker::DoMainHeapCheck()) {
-      poll(0, 0, 500);
+      const struct timespec sleep_time = { 0, 500000000 };  // 500 ms
+      nanosleep(&sleep_time, NULL);
         // Need this hack to wait for other pthreads to exit.
         // Otherwise tcmalloc find errors
         // on a free() call from pthreads.