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

Unified Diff: third_party/tcmalloc/vendor/src/profile-handler.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
« no previous file with comments | « third_party/tcmalloc/vendor/src/pprof ('k') | third_party/tcmalloc/vendor/src/profiler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/vendor/src/profile-handler.cc
===================================================================
--- third_party/tcmalloc/vendor/src/profile-handler.cc (revision 92996)
+++ third_party/tcmalloc/vendor/src/profile-handler.cc (working copy)
@@ -36,7 +36,7 @@
#include "config.h"
#include "profile-handler.h"
-#if !(defined(__CYGWIN__) || defined(__CYGWIN32__))
+#if !(defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(__native_client__)
#include <stdio.h>
#include <errno.h>
@@ -478,12 +478,14 @@
ProfileHandler::Instance()->GetState(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 ProfileHandlerRegisterThread() {
}
@@ -501,4 +503,4 @@
extern "C" void ProfileHandlerGetState(ProfileHandlerState* state) {
}
-#endif // OS_CYGWIN
+#endif // !defined(OS_CYGWIN) && !defined(__native_client__)
« no previous file with comments | « third_party/tcmalloc/vendor/src/pprof ('k') | third_party/tcmalloc/vendor/src/profiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698