lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from Cofyc/macosx

Browse Source 
最小化兼容处理
This commit is contained in:
云风
2012-12-20 01:54:30 -08:00
parent b5f0d4c130 5eb87dc769
commit 6bea883dbf
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lualib-src/lua-skynet.c
View File

@@ -32,9 +32,9 @@ struct stat {
static void static void
_stat_begin(struct stat *S, struct timespec *ti) { _stat_begin(struct stat *S, struct timespec *ti) {
S->count++; S->count++;
#if defined(_POSIX_TIMERS) && defined(_POSIX_THREAD_CPUTIME) #if !defined(__APPLE__)
clock_gettime(CLOCK_THREAD_CPUTIME_ID, ti); clock_gettime(CLOCK_THREAD_CPUTIME_ID, ti);
#elif defined(__APPLE__) #else
struct task_thread_times_info aTaskInfo; struct task_thread_times_info aTaskInfo;
mach_msg_type_number_t aTaskInfoCount = TASK_THREAD_TIMES_INFO_COUNT; 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)); assert(KERN_SUCCESS == task_info(mach_task_self(), TASK_THREAD_TIMES_INFO, (task_info_t )&aTaskInfo, &aTaskInfoCount));

12
lualib-src/trace_service.c
View File

@@ -16,9 +16,9 @@
void void
diff_time(struct timespec *ti, uint32_t *sec, uint32_t *nsec) { diff_time(struct timespec *ti, uint32_t *sec, uint32_t *nsec) {
struct timespec end; struct timespec end;
#if defined(_POSIX_TIMERS) && defined(_POSIX_THREAD_CPUTIME) #if !defined(__APPLE__)
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &end); clock_gettime(CLOCK_THREAD_CPUTIME_ID, &end);
#elif defined(__APPLE__) #else
struct task_thread_times_info aTaskInfo; struct task_thread_times_info aTaskInfo;
mach_msg_type_number_t aTaskInfoCount = TASK_THREAD_TIMES_INFO_COUNT; 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)); 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->next = NULL;
t->ti_sec = 0; t->ti_sec = 0;
t->ti_nsec = 0; t->ti_nsec = 0;
#if defined(_POSIX_TIMERS) && defined(_POSIX_THREAD_CPUTIME) #if !defined(__APPLE__)
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &t->ti); clock_gettime(CLOCK_THREAD_CPUTIME_ID, &t->ti);
#elif defined(__APPLE__) #else
struct task_thread_times_info aTaskInfo; struct task_thread_times_info aTaskInfo;
mach_msg_type_number_t aTaskInfoCount = TASK_THREAD_TIMES_INFO_COUNT; 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)); 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) { if (t->next) {
t->next->prev = prev; t->next->prev = prev;
} }
#if defined(_POSIX_TIMERS) && defined(_POSIX_THREAD_CPUTIME) #if !defined(__APPLE__)
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &t->ti); clock_gettime(CLOCK_THREAD_CPUTIME_ID, &t->ti);
#elif defined(__APPLE__) #else
struct task_thread_times_info aTaskInfo; struct task_thread_times_info aTaskInfo;
mach_msg_type_number_t aTaskInfoCount = TASK_THREAD_TIMES_INFO_COUNT; 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)); assert(KERN_SUCCESS == task_info(mach_task_self(), TASK_THREAD_TIMES_INFO, (task_info_t )&aTaskInfo, &aTaskInfoCount));

6
skynet-src/skynet_timer.c
View File

@@ -9,7 +9,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#if !defined(_POSIX_TIMERS) #if defined(__APPLE__)
#include <sys/time.h> #include <sys/time.h>
#endif #endif
@@ -203,7 +203,7 @@ skynet_timeout(uint32_t handle, int time, int session) {
static uint32_t static uint32_t
_gettime(void) { _gettime(void) {
uint32_t t; uint32_t t;
#if defined(_POSIX_TIMERS) #if !defined(__APPLE__)
struct timespec ti; struct timespec ti;
clock_gettime(CLOCK_MONOTONIC, &ti); clock_gettime(CLOCK_MONOTONIC, &ti);
t = (uint32_t)(ti.tv_sec & 0xffffff) * 100; t = (uint32_t)(ti.tv_sec & 0xffffff) * 100;
@@ -245,7 +245,7 @@ skynet_timer_init(void) {
TI = timer_create_timer(); TI = timer_create_timer();
TI->current = _gettime(); TI->current = _gettime();
#if defined(_POSIX_TIMERS) #if !defined(__APPLE__)
struct timespec ti; struct timespec ti;
clock_gettime(CLOCK_REALTIME, &ti); clock_gettime(CLOCK_REALTIME, &ti);
uint32_t sec = (uint32_t)ti.tv_sec; uint32_t sec = (uint32_t)ti.tv_sec;