build: Make function-trace default

Change-Id: Icbbd4ab162087793d550540218263d7a6e563c8c

diff --git a/meson_options.txt b/meson_options.txt
index 3ca74107526fed2b1c045cdfc22ffe25cddf65d0..425a695122d6285bda82d030df63d6a3dc4056b0 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1 @@
-option('function-trace', type: 'boolean', value: false, description: 'enable function trace: (default=false)')
 option('tests', type: 'boolean', value: true, description: 'Compile Enlightenment tests')

diff --git a/packaging/enlightenment.spec b/packaging/enlightenment.spec
index 909640a6c5cd0d9e424b8f1a44e0018ce68050c1..13658e41644af0c79aa0e660357d75536891bc26 100644 (file)
--- a/packaging/enlightenment.spec
+++ b/packaging/enlightenment.spec
@@ -130,7 +130,6 @@ meson setup \
     --prefix /usr \
     --libdir %{_libdir} \
     --bindir %{_bindir} \
-    -Dfunction-trace=true \
     %{?disable_tests:-Dtests=false}%{!?disable_tests:-Dtests=true}
 
 %install

diff --git a/src/bin/meson.build b/src/bin/meson.build
index b4d62f00bd4270d072fedc00960d3c16700aa98c..b47491466e644a41f04126a4913fbe4c2b05ea7d 100644 (file)
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -1,7 +1,3 @@
-if get_option('function-trace')
-  config_h.set('ENABLE_FUNCTION_TRACE', '1')
-endif
-
 cc.check_header('fnmatch.h', required: true)
 
 if cc.has_header('features.h')

diff --git a/src/include/e_log.h b/src/include/e_log.h
index 426b6d243c1a1c603b22130483c9f33dd24a64d2..788ea373576ce83761a28e8c0276dbb9170a3b0a 100644 (file)
--- a/src/include/e_log.h
+++ b/src/include/e_log.h
@@ -33,19 +33,18 @@ extern "C" {
 #undef PRCTL_BACKTRACE
 #undef DLOG_BACKTRACE
 
-#ifdef ENABLE_FUNCTION_TRACE
-# include <sys/prctl.h>
-# undef PR_TASK_PERF_USER_TRACE
-# define PR_TASK_PERF_USER_TRACE 666
-# define PRCTL(str, x...) \
+#include <sys/prctl.h>
+#undef PR_TASK_PERF_USER_TRACE
+#define PR_TASK_PERF_USER_TRACE 666
+#define PRCTL(str, x...) \
    ({ \
     char __buf__[256]; \
     snprintf(__buf__, sizeof(__buf__), str, ##x); \
     prctl(PR_TASK_PERF_USER_TRACE, __buf__, strlen(__buf__)); \
     })
 
-# include <execinfo.h>
-# define PRCTL_BACKTRACE()                               \
+#include <execinfo.h>
+#define PRCTL_BACKTRACE()                               \
    ({                                                    \
     void *__buf__[256];                                  \
     char **__strings__;                                  \
@@ -60,8 +59,8 @@ extern "C" {
     }                                                    \
 })
 
-# ifdef HAVE_DLOG
-#  define DLOG_BACKTRACE()                               \
+#ifdef HAVE_DLOG
+# define DLOG_BACKTRACE()                               \
    ({                                                    \
     void *__buf__[256];                                  \
     char **__strings__;                                  \
@@ -75,11 +74,6 @@ extern "C" {
        free(__strings__);                                \
     }                                                    \
 })
-# endif
-#else
-# define PRCTL
-# define PRCTL_BACKTRACE
-# define DLOG_BACKTRACE
 #endif
 
 static inline Ecore_Window