Ticket #26717: patch-src-util-timer.c.diff

src/util/timer.c

@@ -22 +22 @@
 
 #include "timer.h"
 
+#ifdef __APPLE__
+
+#pragma weak clock_gettime
+
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <mach/mach.h>
+#include <mach/clock.h>
+#include <mach/mach_time.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sched.h>
+
+typedef enum {
+        CLOCK_REALTIME,
+        CLOCK_MONOTONIC,
+        CLOCK_PROCESS_CPUTIME_ID,
+        CLOCK_THREAD_CPUTIME_ID
+} clockid_t;
+
+static mach_timebase_info_data_t __clock_gettime_inf;
+
+static int clock_gettime(clockid_t clk_id, struct timespec *tp) {
+        kern_return_t   ret;
+        clock_serv_t    clk;
+        clock_id_t clk_serv_id;
+        mach_timespec_t tm;
+
+        uint64_t start, end, delta, nano;
+
+        task_basic_info_data_t tinfo;
+        task_thread_times_info_data_t ttinfo;
+        mach_msg_type_number_t tflag;
+
+        int retval = -1;
+        switch (clk_id) {
+                case CLOCK_REALTIME:
+                case CLOCK_MONOTONIC:
+                        clk_serv_id = clk_id == CLOCK_REALTIME ? CALENDAR_CLOCK : SYSTEM_CLOCK;
+                        if (KERN_SUCCESS == (ret = host_get_clock_service(mach_host_self(), clk_serv_id, &clk))) {
+                                if (KERN_SUCCESS == (ret = clock_get_time(clk, &tm))) {
+                                        tp->tv_sec  = tm.tv_sec;
+                                        tp->tv_nsec = tm.tv_nsec;
+                                        retval = 0;
+                                }
+                        }
+                        if (KERN_SUCCESS != ret) {
+                                errno = EINVAL;
+                                retval = -1;
+                        }
+                break;
+                case CLOCK_PROCESS_CPUTIME_ID:
+                case CLOCK_THREAD_CPUTIME_ID:
+                        start = mach_absolute_time();
+                        if (clk_id == CLOCK_PROCESS_CPUTIME_ID) {
+                                getpid();
+                        } else {
+                                sched_yield();
+                        }
+                        end = mach_absolute_time();
+                        delta = end - start;
+                        if (0 == __clock_gettime_inf.denom) {
+                                mach_timebase_info(&__clock_gettime_inf);
+                        }
+                        nano = delta * __clock_gettime_inf.numer / __clock_gettime_inf.denom;
+                        tp->tv_sec = nano * 1e-9;
+                        tp->tv_nsec = nano - (tp->tv_sec * 1e9);
+                        retval = 0;
+                break;
+                default:
+                        errno = EINVAL;
+                        retval = -1;
+        }
+        return retval;
+}
+
+#endif // __APPLE__
+
 GSList* timeout_list;
 struct timeval next_timeout;
 GHashTable* multi_timeouts;