jayji pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cc4c40769d106fdc3c8faaa57f867b7e5ca47fa2
commit cc4c40769d106fdc3c8faaa57f867b7e5ca47fa2
Author: Jean Guyomarc'h <j...@guyomarch.bzh>
Date: Mon Jun 5 19:00:22 2017 +0200
eina: attempt to make the code more portable
This fixes the build on macOS.
---
configure.ac | 2 ++
src/lib/eina/eina_debug_bt.c | 20 ++++++++++++++++++++
src/lib/eina/eina_debug_timer.c | 2 +-
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a3240180b7..de1ffef1f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -683,6 +683,8 @@ geteuid \
getuid \
pause \
gmtime_r \
+pthread_getcpuclockid \
+clock_gettime \
])
AC_FUNC_ALLOCA
diff --git a/src/lib/eina/eina_debug_bt.c b/src/lib/eina/eina_debug_bt.c
index a98b852efe..e8c01c1b3e 100644
--- a/src/lib/eina/eina_debug_bt.c
+++ b/src/lib/eina/eina_debug_bt.c
@@ -153,15 +153,35 @@ _signal_handler(int sig EINA_UNUSED,
eina_semaphore_release(&_wait_for_bts_sem, 1);
return;
found:
+ /*
+ * Below is very non-portable code!
+ *
+ * - clock_gettime() is not implemented on macOS < 10.12
+ * - sched_getcpu() is not implemented on macOS
+ * - pthread_getcpuclockid() is not implemented on macOS
+ * - CLOCK_THREAD_CPUTIME_ID should be identical to pthread_getcpuclockid(),
+ * but it requires POSIX thingies to be defined.
+ */
+#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_SCHED_GETCPU)
// store thread info like what cpu core we are on now (not reliable
// but hey - better than nothing), the amount of cpu time total
// we have consumed (it's cumulative so subtracing deltas can give
// you an average amount of cpu time consumed between now and the
// previous time we looked) and also a full backtrace
_bt_cpu[slot] = sched_getcpu();
+# ifdef HAVE_PTHREAD_GETCPUCLOCKID
+ /* Try pthread_getcpuclockid() first */
pthread_getcpuclockid(self, &cid);
+# elif defined(_POSIX_THREAD_CPUTIME)
+ /* Fallback to POSIX clock id. */
+ cid = CLOCK_THREAD_CPUTIME_ID;
+# else
+ /* Boom, we lost */
+# error Cannot determine the clock id for clock_gettime()
+# endif
clock_gettime(cid, &(_bt_ts[slot]));
_bt_buf_len[slot] = _eina_debug_unwind_bt(_bt_buf[slot], EINA_MAX_BT);
+#endif /* HAVE_CLOCK_GETTIME && HAVE_SCHED_GETCPU */
// now wake up the monitor to let them know we are done collecting our
// backtrace info
eina_semaphore_release(&_wait_for_bts_sem, 1);
diff --git a/src/lib/eina/eina_debug_timer.c b/src/lib/eina/eina_debug_timer.c
index ece2db6903..fa3fd1a549 100644
--- a/src/lib/eina/eina_debug_timer.c
+++ b/src/lib/eina/eina_debug_timer.c
@@ -84,7 +84,7 @@ end:
static void *
_monitor(void *_data EINA_UNUSED)
{
-#ifndef _WIN32
+#ifdef HAVE_SYS_EPOLL_H
#define MAX_EVENTS 4
struct epoll_event event;
struct epoll_event events[MAX_EVENTS];
--
