Index: third_party/tcmalloc/vendor/src/profiler.cc |
diff --git a/third_party/tcmalloc/vendor/src/profiler.cc b/third_party/tcmalloc/vendor/src/profiler.cc |
index a57953efd526a006c516dffd2b01d43567760a78..dfb6aab52f4a9d7aa0e6e9c9a0a596c24e322efd 100644 |
--- a/third_party/tcmalloc/vendor/src/profiler.cc |
+++ b/third_party/tcmalloc/vendor/src/profiler.cc |
@@ -55,8 +55,8 @@ typedef int ucontext_t; // just to quiet the compiler, mostly |
#endif |
#include <sys/time.h> |
#include <string> |
-#include <google/profiler.h> |
-#include <google/stacktrace.h> |
+#include <gperftools/profiler.h> |
+#include <gperftools/stacktrace.h> |
#include "base/commandlineflags.h" |
#include "base/logging.h" |
#include "base/googleinit.h" |
@@ -284,7 +284,7 @@ void CpuProfiler::prof_handler(int sig, siginfo_t*, void* signal_ucontext, |
} |
} |
-#if !(defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(__native_client__) |
+#if !(defined(__CYGWIN__) || defined(__CYGWIN32__)) |
extern "C" PERFTOOLS_DLL_DECL void ProfilerRegisterThread() { |
ProfileHandlerRegisterThread(); |
@@ -316,14 +316,12 @@ extern "C" PERFTOOLS_DLL_DECL void ProfilerGetCurrentState( |
CpuProfiler::instance_.GetCurrentState(state); |
} |
-#else // !defined(OS_CYGWIN) && !defined(__native_client__) |
+#else // OS_CYGWIN |
// ITIMER_PROF doesn't work under cygwin. ITIMER_REAL is available, but doesn't |
// work as well for profiling, and also interferes with alarm(). Because of |
// these issues, unless a specific need is identified, profiler support is |
// disabled under Cygwin. |
-// |
-// Native Client runtime also does not have signals working. |
extern "C" void ProfilerRegisterThread() { } |
extern "C" void ProfilerFlush() { } |
extern "C" int ProfilingIsEnabledForAllThreads() { return 0; } |
@@ -337,7 +335,7 @@ extern "C" void ProfilerGetCurrentState(ProfilerState* state) { |
memset(state, 0, sizeof(*state)); |
} |
-#endif // !defined(OS_CYGWIN) && !defined(__native_client__) |
+#endif // OS_CYGWIN |
// DEPRECATED routines |
extern "C" PERFTOOLS_DLL_DECL void ProfilerEnable() { } |