From 5eb87dc769c7f15c1ccffdb4f67e71232d1001b6 Mon Sep 17 00:00:00 2001 From: Yecheng Fu Date: Thu, 20 Dec 2012 16:25:20 +0800 Subject: [PATCH] =?UTF-8?q?=5FPOSIX=5FTIMERS=20&=20=5FPOSIX=5FTHREAD=5FCPU?= =?UTF-8?q?TIME=20=E5=9C=A8=20unistd.h=20=E5=A4=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E4=BD=86=E5=B9=B6=E6=9C=AA=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E3=80=82=E4=B9=8B=E5=89=8D=E5=86=99=E6=B3=95=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=AA=E6=98=AF=E5=B7=A7=E5=90=88=E3=80=82=20=E7=8E=B0?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20clock=5Fgettime=EF=BC=8C=E5=BD=93=E4=B8=BA=20Max=20OSX=20?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=97=B6=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lualib-src/lua-skynet.c | 4 ++-- lualib-src/trace_service.c | 12 ++++++------ skynet-src/skynet_timer.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lualib-src/lua-skynet.c b/lualib-src/lua-skynet.c index 6d979a0f..64d5ea96 100644 --- a/lualib-src/lua-skynet.c +++ b/lualib-src/lua-skynet.c @@ -32,9 +32,9 @@ struct stat { static void _stat_begin(struct stat *S, struct timespec *ti) { S->count++; -#if defined(_POSIX_TIMERS) && defined(_POSIX_THREAD_CPUTIME) +#if !defined(__APPLE__) clock_gettime(CLOCK_THREAD_CPUTIME_ID, ti); -#elif defined(__APPLE__) +#else struct task_thread_times_info aTaskInfo; mach_msg_type_number_t aTaskInfoCount = TASK_THREAD_TIMES_INFO_COUNT; assert(KERN_SUCCESS == task_info(mach_task_self(), TASK_THREAD_TIMES_INFO, (task_info_t )&aTaskInfo, &aTaskInfoCount)); diff --git a/lualib-src/trace_service.c b/lualib-src/trace_service.c index a4d43a21..453f2202 100644 --- a/lualib-src/trace_service.c +++ b/lualib-src/trace_service.c @@ -16,9 +16,9 @@ void diff_time(struct timespec *ti, uint32_t *sec, uint32_t *nsec) { struct timespec end; -#if defined(_POSIX_TIMERS) && defined(_POSIX_THREAD_CPUTIME) +#if !defined(__APPLE__) clock_gettime(CLOCK_THREAD_CPUTIME_ID, &end); -#elif defined(__APPLE__) +#else struct task_thread_times_info aTaskInfo; mach_msg_type_number_t aTaskInfoCount = TASK_THREAD_TIMES_INFO_COUNT; assert(KERN_SUCCESS == task_info(mach_task_self(), TASK_THREAD_TIMES_INFO, (task_info_t )&aTaskInfo, &aTaskInfoCount)); @@ -89,9 +89,9 @@ trace_new(struct trace_pool *p) { t->next = NULL; t->ti_sec = 0; t->ti_nsec = 0; -#if defined(_POSIX_TIMERS) && defined(_POSIX_THREAD_CPUTIME) +#if !defined(__APPLE__) clock_gettime(CLOCK_THREAD_CPUTIME_ID, &t->ti); -#elif defined(__APPLE__) +#else struct task_thread_times_info aTaskInfo; mach_msg_type_number_t aTaskInfoCount = TASK_THREAD_TIMES_INFO_COUNT; assert(KERN_SUCCESS == task_info(mach_task_self(), TASK_THREAD_TIMES_INFO, (task_info_t )&aTaskInfo, &aTaskInfoCount)); @@ -151,9 +151,9 @@ trace_switch(struct trace_pool *p, int session) { if (t->next) { t->next->prev = prev; } -#if defined(_POSIX_TIMERS) && defined(_POSIX_THREAD_CPUTIME) +#if !defined(__APPLE__) clock_gettime(CLOCK_THREAD_CPUTIME_ID, &t->ti); -#elif defined(__APPLE__) +#else struct task_thread_times_info aTaskInfo; mach_msg_type_number_t aTaskInfoCount = TASK_THREAD_TIMES_INFO_COUNT; assert(KERN_SUCCESS == task_info(mach_task_self(), TASK_THREAD_TIMES_INFO, (task_info_t )&aTaskInfo, &aTaskInfoCount)); diff --git a/skynet-src/skynet_timer.c b/skynet-src/skynet_timer.c index a8bfe8b9..0a593cdd 100644 --- a/skynet-src/skynet_timer.c +++ b/skynet-src/skynet_timer.c @@ -9,7 +9,7 @@ #include #include -#if !defined(_POSIX_TIMERS) +#if defined(__APPLE__) #include #endif @@ -203,7 +203,7 @@ skynet_timeout(uint32_t handle, int time, int session) { static uint32_t _gettime(void) { uint32_t t; -#if defined(_POSIX_TIMERS) +#if !defined(__APPLE__) struct timespec ti; clock_gettime(CLOCK_MONOTONIC, &ti); t = (uint32_t)(ti.tv_sec & 0xffffff) * 100; @@ -245,7 +245,7 @@ skynet_timer_init(void) { TI = timer_create_timer(); TI->current = _gettime(); -#if defined(_POSIX_TIMERS) +#if !defined(__APPLE__) struct timespec ti; clock_gettime(CLOCK_REALTIME, &ti); uint32_t sec = (uint32_t)ti.tv_sec;