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

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

Issue 7430007: Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch. 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
Index: third_party/tcmalloc/chromium/src/profiler.cc
===================================================================
--- third_party/tcmalloc/chromium/src/profiler.cc (revision 94429)
+++ third_party/tcmalloc/chromium/src/profiler.cc (working copy)
@@ -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() { }

Powered by Google App Engine
This is Rietveld 408576698