DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

utils: use clock_get_time() for clock_gettime() on Apple.

Browse source 
It turns out that mach_absolute_time() is not monotonic at all.  While
at it, convert the CLOCK_REALTIME implementation to using
clock_get_time() as well.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou 2015-01-21 21:21:28 +08:00 committed by Felix Fietkau
parent 08c27ceb01
commit ad9aa180d3
2 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
utils.c
View file

@ -54,41 +54,50 @@ void *__calloc_a(size_t len, ...)
}
#ifdef __APPLE__
#include <mach/mach_time.h>
#include <mach/mach_host.h> /* host_get_clock_service() */
#include <mach/mach_port.h> /* mach_port_deallocate() */
#include <mach/mach_init.h> /* mach_host_self(), mach_task_self() */
#include <mach/clock.h> /* clock_get_time() */
static void clock_gettime_realtime(struct timespec *tv)
static clock_serv_t clock_realtime;
static clock_serv_t clock_monotonic;
static void __constructor clock_name_init(void)
{
struct timeval _tv;
mach_port_t host_self = mach_host_self();
gettimeofday(&_tv, NULL);
tv->tv_sec = _tv.tv_sec;
tv->tv_nsec = _tv.tv_usec * 1000;
host_get_clock_service(host_self, CLOCK_REALTIME, &clock_realtime);
host_get_clock_service(host_self, CLOCK_MONOTONIC, &clock_monotonic);
}
static void clock_gettime_monotonic(struct timespec *tv)
static void __destructor clock_name_dealloc(void)
{
mach_timebase_info_data_t info;
float sec;
uint64_t val;
mach_port_t self = mach_task_self();
mach_timebase_info(&info);
val = mach_absolute_time();
tv->tv_nsec = (val * info.numer / info.denom) % 1000000000;
sec = val;
sec *= info.numer;
sec /= info.denom;
sec /= 1000000000;
tv->tv_sec = sec;
mach_port_deallocate(self, clock_realtime);
mach_port_deallocate(self, clock_monotonic);
}
void clock_gettime(int type, struct timespec *tv)
int clock_gettime(int type, struct timespec *tv)
{
if (type == CLOCK_REALTIME)
return clock_gettime_realtime(tv);
else
return clock_gettime_monotonic(tv);
int retval = -1;
mach_timespec_t mts;
switch (type) {
case CLOCK_REALTIME:
retval = clock_get_time(clock_realtime, &mts);
break;
case CLOCK_MONOTONIC:
retval = clock_get_time(clock_monotonic, &mts);
break;
default:
goto out;
}
tv->tv_sec = mts.tv_sec;
tv->tv_nsec = mts.tv_nsec;
out:
return retval;
}
#endif

11
utils.h
View file

@ -58,10 +58,11 @@ extern int __BUILD_BUG_ON_CONDITION_FAILED;
#ifdef __APPLE__
#define CLOCK_REALTIME 0
#define CLOCK_MONOTONIC 1
#include <mach/clock_types.h>
#define CLOCK_REALTIME CALENDAR_CLOCK
#define CLOCK_MONOTONIC SYSTEM_CLOCK
void clock_gettime(int type, struct timespec *tv);
int clock_gettime(int type, struct timespec *tv);
#endif
@ -159,6 +160,10 @@ static inline uint16_t __u_bswap16(uint16_t val)
#define __constructor __attribute__((constructor))
#endif
#ifndef __destructor
#define __destructor __attribute__((destructor))
#endif
#ifndef __hidden
#define __hidden __attribute__((visibility("hidden")))
#endif