From: Alex Rønne Petersen <alexrp@xamarin.com>
Date: Wed, 25 Mar 2015 12:22:39 +0000 (+0100)
Subject: [profiler] Disable `perf` events by default.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=ce418756c94a2d040513b89342cf7d79114b8281;p=mono.git

[profiler] Disable `perf` events by default.

As it turns out, `perf` support crashes/hangs on a lot of Linux
kernels in the wild, and produces no output on some Android devices.
So, given that using a signal + helper thread is more reliable, use
it by default and make `perf` support optional.

The configure flag is now `--enable-perf-events`.
---

diff --git a/configure.ac b/configure.ac
index e32184ac590..73a96466a08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2512,10 +2512,10 @@ fi
 
 AC_ARG_ENABLE(bcl-opt, [  --disable-bcl-opt	BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes)
 
-AC_ARG_ENABLE(perf-events, [  --disable-perf-events Disable using `perf` for profiling on Linux], test_perf_events=$enableval, test_perf_events=yes)
-if test "x$test_perf_events" != "xyes"; then
-	AC_DEFINE(DISABLE_PERF_EVENTS, 1, [Disable using `perf` for profiling on Linux])
-	AC_SUBST(DISABLE_PERF_EVENTS)
+AC_ARG_ENABLE(perf-events, [  --enable-perf-events Enable using `perf` for profiling on Linux], test_perf_events=$enableval, test_perf_events=no)
+if test "x$test_perf_events" == "xyes"; then
+	AC_DEFINE(ENABLE_PERF_EVENTS, 1, [Enable using `perf` for profiling on Linux])
+	AC_SUBST(ENABLE_PERF_EVENTS)
 fi
 
 AC_MSG_CHECKING([if big-arrays are to be enabled])
diff --git a/mono/profiler/proflog.c b/mono/profiler/proflog.c
index 9afa74dfacf..c2108f23252 100644
--- a/mono/profiler/proflog.c
+++ b/mono/profiler/proflog.c
@@ -78,7 +78,7 @@
 #include <sys/syscall.h>
 #include "perf_event.h"
 
-#ifndef DISABLE_PERF_EVENTS
+#ifdef ENABLE_PERF_EVENTS
 #define USE_PERF_EVENTS 1
 
 static int read_perf_mmap (MonoProfiler* prof, int cpu);