github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 21:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #393 from pwpiwi/fix_getclocktime

Browse source 
Fix clock_gettime() for Apple OSX
This commit is contained in:
Iceman 2017-09-26 17:08:50 +02:00 • committed by GitHub
commit c19f26b05d
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/util_posix.c
View file

@ -35,7 +35,7 @@ void msleep(uint32_t n) {
} }
#endif // _WIN32 #endif // _WIN32
#ifdef __MACH__ #ifdef __APPLE__
#define CLOCK_MONOTONIC (1) #define CLOCK_MONOTONIC (1)
#define CLOCK_REALTIME (2) #define CLOCK_REALTIME (2)
@ -63,20 +63,18 @@ void msleep(uint32_t n) {
} else if (clk_id == CLOCK_MONOTONIC) { } else if (clk_id == CLOCK_MONOTONIC) {
static uint64_t clock_start_time = 0; static uint64_t clock_start_time = 0;
static mach_timebase_info_data_t timebase_ifo = {0, 0}; static mach_timebase_info_data_t timebase_info = {0, 0};
uint64_t now = mach_absolute_time(); uint64_t now = mach_absolute_time();
if (clock_start_time == 0) { if (clock_start_time == 0) {
//kern_return_t mach_status = mach_timebase_info(&timebase_ifo); mach_timebase_info(&timebase_info);
// appease "unused variable" warning for release builds
//(void)mach_status;
clock_start_time = now; clock_start_time = now;
} }
now = (uint64_t)((double)(now - clock_start_time) now = (uint64_t)((double)(now - clock_start_time)
* (double)timebase_ifo.numer * (double)timebase_info.numer
/ (double)timebase_ifo.denom); / (double)timebase_info.denom);
t->tv_sec = now / 1000000000; t->tv_sec = now / 1000000000;
t->tv_nsec = now % 1000000000; t->tv_nsec = now % 1000000000;