id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added CLOCK_REALTIME support to our custom clock_gettime() function for OS X. #87

Browse source 
The monotonic part was written by Gavin Beatty
https://github.com/gavinbeatty/python-monotonic-time/blob/master/darwin.c
This commit is contained in:
Radegast 2014-05-19 22:53:46 +01:00
parent ca5c463bbd
commit 5304284e90
2 changed files with 40 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
neo/sys/posix/posix_main.cpp
View file

@ -198,26 +198,47 @@ Sys_Milliseconds
#ifdef __APPLE__
// OS X doesn't have clock_gettime()
// always gets monotonic time
int clock_gettime(int /*clk_id*/, struct timespec *tp)
int clock_gettime(clk_id_t clock, struct timespec *tp)
{
clock_serv_t clock_ref;
mach_timespec_t tm;
host_name_port_t self = mach_host_self();
memset(&tm, 0, sizeof(tm));
if (KERN_SUCCESS != host_get_clock_service(self, SYSTEM_CLOCK, &clock_ref))
switch(clock)
{
return -1;
case CLOCK_MONOTONIC_RAW:
case CLOCK_MONOTONIC:
{
clock_serv_t clock_ref;
mach_timespec_t tm;
host_name_port_t self = mach_host_self();
memset(&tm, 0, sizeof(tm));
if (KERN_SUCCESS != host_get_clock_service(self, SYSTEM_CLOCK, &clock_ref))
{
mach_port_deallocate(mach_task_self(), self);
return -1;
}
if (KERN_SUCCESS != clock_get_time(clock_ref, &tm))
{
mach_port_deallocate(mach_task_self(), self);
return -1;
}
mach_port_deallocate(mach_task_self(), self);
mach_port_deallocate(mach_task_self(), clock_ref);
tp->tv_sec = tm.tv_sec;
tp->tv_nsec = tm.tv_nsec;
break;
}
case CLOCK_REALTIME:
default:
{
struct timeval now;
if (KERN_SUCCESS != gettimeofday(&now, NULL))
{
return -1;
}
tp->tv_sec = now.tv_sec;
tp->tv_nsec = now.tv_usec * 1000;
break;
}
}
if (KERN_SUCCESS != clock_get_time(clock_ref, &tm))
{
mach_port_deallocate(mach_task_self(), self);
return -1;
}
mach_port_deallocate(mach_task_self(), self);
mach_port_deallocate(mach_task_self(), clock_ref);
tp->tv_sec = tm.tv_sec;
tp->tv_nsec = tm.tv_nsec;
return 0;
}
#endif // __APPLE__

5
neo/sys/posix/posix_public.h
View file

@ -60,9 +60,8 @@ void Sys_DoStartProcess( const char* exeName, bool dofork = true ); // if not f
char* Posix_ConsoleInput();
#ifdef __APPLE__
#define CLOCK_MONOTONIC 0
#define CLOCK_REALTIME 0
int clock_gettime(int /*clk_id*/, struct timespec *tp);
enum clk_id_t { CLOCK_REALTIME, CLOCK_MONOTONIC, CLOCK_MONOTONIC_RAW };
int clock_gettime(clk_id_t clock, struct timespec *tp);
#endif
#endif