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

Unified Diff: third_party/tcmalloc/vendor/src/profiler.cc

Issue 9701040: Revert 126715 - Update the tcmalloc vendor branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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/vendor/src/profile-handler.cc ('k') | third_party/tcmalloc/vendor/src/span.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/vendor/src/profiler.cc
===================================================================
--- third_party/tcmalloc/vendor/src/profiler.cc (revision 126727)
+++ third_party/tcmalloc/vendor/src/profiler.cc (working copy)
@@ -55,8 +55,8 @@
#endif
#include <sys/time.h>
#include <string>
-#include <gperftools/profiler.h>
-#include <gperftools/stacktrace.h>
+#include <google/profiler.h>
+#include <google/stacktrace.h>
#include "base/commandlineflags.h"
#include "base/logging.h"
#include "base/googleinit.h"
@@ -284,7 +284,7 @@
}
}
-#if !(defined(__CYGWIN__) || defined(__CYGWIN32__))
+#if !(defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(__native_client__)
extern "C" PERFTOOLS_DLL_DECL void ProfilerRegisterThread() {
ProfileHandlerRegisterThread();
@@ -316,12 +316,14 @@
CpuProfiler::instance_.GetCurrentState(state);
}
-#else // OS_CYGWIN
+#else // !defined(OS_CYGWIN) && !defined(__native_client__)
// 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; }
@@ -335,7 +337,7 @@
memset(state, 0, sizeof(*state));
}
-#endif // OS_CYGWIN
+#endif // !defined(OS_CYGWIN) && !defined(__native_client__)
// DEPRECATED routines
extern "C" PERFTOOLS_DLL_DECL void ProfilerEnable() { }
« no previous file with comments | « third_party/tcmalloc/vendor/src/profile-handler.cc ('k') | third_party/tcmalloc/vendor/src/span.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698