From 28c15b3ff4a7e1db87a6d644fcdbfa9a379d72e8 Mon Sep 17 00:00:00 2001 From: Sergey Lyubka Date: Fri, 27 May 2022 22:36:34 +0100 Subject: [PATCH] More SNtp debug 11 --- mongoose.c | 11 +++-------- src/sock.c | 4 +++- src/util.c | 7 ------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/mongoose.c b/mongoose.c index 2b5e21af..44270f2f 100644 --- a/mongoose.c +++ b/mongoose.c @@ -4414,7 +4414,9 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) { } } - if (poll(fds, n, ms) < 0) { + int res = poll(fds, n, ms); + MG_DEBUG(("n=%d, ms=%d, errno=%d", n, ms, errno)); + if (res < 0) { MG_ERROR(("poll failed, errno: %d", MG_SOCK_ERRNO)); } else { n = 0; @@ -5624,13 +5626,6 @@ 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__) - uint64_t ticks = mach_absolute_time(); - static mach_timebase_info_data_t timebase; - mach_timebase_info(&timebase); - double ticks_to_nanos = (double) timebase.numer / timebase.denom; - uint64_t uptime_nanos = (uint64_t) (ticks_to_nanos * ticks); - return (uint64_t) (uptime_nanos / 1000000); #elif MG_ARCH == MG_ARCH_UNIX struct timespec ts = {0, 0}; clock_gettime(CLOCK_REALTIME, &ts); diff --git a/src/sock.c b/src/sock.c index 0034e293..326b2968 100644 --- a/src/sock.c +++ b/src/sock.c @@ -496,7 +496,9 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) { } } - if (poll(fds, n, ms) < 0) { + int res = poll(fds, n, ms); + MG_DEBUG(("n=%d, ms=%d, errno=%d", n, ms, errno)); + if (res < 0) { MG_ERROR(("poll failed, errno: %d", MG_SOCK_ERRNO)); } else { n = 0; diff --git a/src/util.c b/src/util.c index beb9c8b1..ae4c7b7a 100644 --- a/src/util.c +++ b/src/util.c @@ -91,13 +91,6 @@ 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__) - uint64_t ticks = mach_absolute_time(); - static mach_timebase_info_data_t timebase; - mach_timebase_info(&timebase); - double ticks_to_nanos = (double) timebase.numer / timebase.denom; - uint64_t uptime_nanos = (uint64_t) (ticks_to_nanos * ticks); - return (uint64_t) (uptime_nanos / 1000000); #elif MG_ARCH == MG_ARCH_UNIX struct timespec ts = {0, 0}; clock_gettime(CLOCK_REALTIME, &ts);