mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-21 19:51:50 +00:00
More SNtp debug 3
This commit is contained in:
1 parent
e5d3d02307
commit
360dedd9b2
3 files changed
+6
-22
No files matched your search
+3
-11
@@ -4421,8 +4421,8 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
|
|||||||
if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
|
if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
|
||||||
// Socket not valid, ignore
|
// Socket not valid, ignore
|
||||||
} else {
|
} else {
|
||||||
c->is_readable = (unsigned) (fds[i].revents & POLLIN ? true : false);
|
c->is_readable = (unsigned) (fds[i].revents & POLLIN ? 1 : 0);
|
||||||
c->is_writable = (unsigned) (fds[i].revents & POLLOUT ? true : false);
|
c->is_writable = (unsigned) (fds[i].revents & POLLOUT ? 1 : 0);
|
||||||
fds[i].revents = 0;
|
fds[i].revents = 0;
|
||||||
if (mg_tls_pending(c) > 0) c->is_readable = 1;
|
if (mg_tls_pending(c) > 0) c->is_readable = 1;
|
||||||
}
|
}
|
||||||
@@ -5630,16 +5630,8 @@ uint64_t mg_millis(void) {
|
|||||||
uint64_t uptime_nanos = (uint64_t) (ticks_to_nanos * ticks);
|
uint64_t uptime_nanos = (uint64_t) (ticks_to_nanos * ticks);
|
||||||
return (uint64_t) (uptime_nanos / 1000000);
|
return (uint64_t) (uptime_nanos / 1000000);
|
||||||
#elif MG_ARCH == MG_ARCH_UNIX
|
#elif MG_ARCH == MG_ARCH_UNIX
|
||||||
struct timespec ts;
|
struct timespec ts = {0, 0};
|
||||||
#ifdef _POSIX_MONOTONIC_CLOCK
|
|
||||||
#ifdef CLOCK_MONOTONIC_RAW
|
|
||||||
clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
|
|
||||||
#else
|
|
||||||
clock_gettime(CLOCK_MONOTONIC, &ts);
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
clock_gettime(CLOCK_REALTIME, &ts);
|
clock_gettime(CLOCK_REALTIME, &ts);
|
||||||
#endif
|
|
||||||
return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000);
|
return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000);
|
||||||
#else
|
#else
|
||||||
return (uint64_t) (time(NULL) * 1000);
|
return (uint64_t) (time(NULL) * 1000);
|
||||||
|
|||||||
+2
-2
@@ -502,8 +502,8 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
|
|||||||
if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
|
if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
|
||||||
// Socket not valid, ignore
|
// Socket not valid, ignore
|
||||||
} else {
|
} else {
|
||||||
c->is_readable = (unsigned) (fds[i].revents & POLLIN ? true : false);
|
c->is_readable = (unsigned) (fds[i].revents & POLLIN ? 1 : 0);
|
||||||
c->is_writable = (unsigned) (fds[i].revents & POLLOUT ? true : false);
|
c->is_writable = (unsigned) (fds[i].revents & POLLOUT ? 1 : 0);
|
||||||
fds[i].revents = 0;
|
fds[i].revents = 0;
|
||||||
if (mg_tls_pending(c) > 0) c->is_readable = 1;
|
if (mg_tls_pending(c) > 0) c->is_readable = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-9
@@ -99,16 +99,8 @@ uint64_t mg_millis(void) {
|
|||||||
uint64_t uptime_nanos = (uint64_t) (ticks_to_nanos * ticks);
|
uint64_t uptime_nanos = (uint64_t) (ticks_to_nanos * ticks);
|
||||||
return (uint64_t) (uptime_nanos / 1000000);
|
return (uint64_t) (uptime_nanos / 1000000);
|
||||||
#elif MG_ARCH == MG_ARCH_UNIX
|
#elif MG_ARCH == MG_ARCH_UNIX
|
||||||
struct timespec ts;
|
struct timespec ts = {0, 0};
|
||||||
#ifdef _POSIX_MONOTONIC_CLOCK
|
|
||||||
#ifdef CLOCK_MONOTONIC_RAW
|
|
||||||
clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
|
|
||||||
#else
|
|
||||||
clock_gettime(CLOCK_MONOTONIC, &ts);
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
clock_gettime(CLOCK_REALTIME, &ts);
|
clock_gettime(CLOCK_REALTIME, &ts);
|
||||||
#endif
|
|
||||||
return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000);
|
return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000);
|
||||||
#else
|
#else
|
||||||
return (uint64_t) (time(NULL) * 1000);
|
return (uint64_t) (time(NULL) * 1000);
|
||||||
|
|||||||
Reference in new issue
Block a user