mirror of
https://github.com/cesanta/mongoose.git
synced 2024-11-28 13:49:01 +08:00
Merge pull request #1617 from jameshilliard/osx-clock
util: use correct clock on OSX
This commit is contained in:
commit
4c9fdaf8b0
@ -5488,6 +5488,10 @@ uint64_t mg_millis(void) {
|
||||
return xTaskGetTickCount() * portTICK_PERIOD_MS;
|
||||
#elif MG_ARCH == MG_ARCH_AZURERTOS
|
||||
return tx_time_get() * (1000 /* MS per SEC */ / TX_TIMER_TICKS_PER_SECOND);
|
||||
#elif MG_ARCH == MG_ARCH_UNIX && defined(__APPLE__)
|
||||
// Apple CLOCK_MONOTONIC_RAW is equivalent to CLOCK_BOOTTIME on linux
|
||||
// Apple CLOCK_UPTIME_RAW is equivalent to CLOCK_MONOTONIC_RAW on linux
|
||||
return clock_gettime_nsec_np(CLOCK_UPTIME_RAW) / 1000000;
|
||||
#elif MG_ARCH == MG_ARCH_UNIX
|
||||
struct timespec ts = {0, 0};
|
||||
// See #1615 - prefer monotonic clock
|
||||
|
@ -102,6 +102,10 @@ uint64_t mg_millis(void) {
|
||||
return xTaskGetTickCount() * portTICK_PERIOD_MS;
|
||||
#elif MG_ARCH == MG_ARCH_AZURERTOS
|
||||
return tx_time_get() * (1000 /* MS per SEC */ / TX_TIMER_TICKS_PER_SECOND);
|
||||
#elif MG_ARCH == MG_ARCH_UNIX && defined(__APPLE__)
|
||||
// Apple CLOCK_MONOTONIC_RAW is equivalent to CLOCK_BOOTTIME on linux
|
||||
// Apple CLOCK_UPTIME_RAW is equivalent to CLOCK_MONOTONIC_RAW on linux
|
||||
return clock_gettime_nsec_np(CLOCK_UPTIME_RAW) / 1000000;
|
||||
#elif MG_ARCH == MG_ARCH_UNIX
|
||||
struct timespec ts = {0, 0};
|
||||
// See #1615 - prefer monotonic clock
|
||||
|
Loading…
Reference in New Issue
Block a user