From 7721b074e66bebdcdaca720a97f0168c67e1e06d Mon Sep 17 00:00:00 2001 From: Sergey Lyubka Date: Sun, 15 May 2022 19:31:29 +0100 Subject: [PATCH] Log ms in test_sntp() --- mongoose.c | 15 ++++++++------- src/sock.c | 15 ++++++++------- test/unit_test.c | 1 + 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/mongoose.c b/mongoose.c index 7efd6bb4..4a6d823e 100644 --- a/mongoose.c +++ b/mongoose.c @@ -3325,9 +3325,9 @@ static void mg_set_non_blocking_mode(SOCKET fd) { int status = 0; int res = SockStatus(fd, FDSTATUS_SEND, &status); if (res == 0 && status > 0) { - val = status / 2; - int val_size = sizeof(val); - res = SockSet(fd, SOL_SOCKET, SO_SNDLOWAT, &val, val_size); + val = status / 2; + int val_size = sizeof(val); + res = SockSet(fd, SOL_SOCKET, SO_SNDLOWAT, &val, val_size); } #else fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK); // Non-blocking mode @@ -3446,7 +3446,8 @@ static void close_conn(struct mg_connection *c) { } static void setsockopts(struct mg_connection *c) { -#if MG_ARCH == MG_ARCH_FREERTOS_TCP || MG_ARCH == MG_ARCH_AZURERTOS || MG_ARCH == MG_ARCH_TIRTOS +#if MG_ARCH == MG_ARCH_FREERTOS_TCP || MG_ARCH == MG_ARCH_AZURERTOS || \ + MG_ARCH == MG_ARCH_TIRTOS (void) c; #else int on = 1; @@ -3482,13 +3483,12 @@ void mg_connect_resolved(struct mg_connection *c) { if ((rc = connect(FD(c), &usa.sa, slen)) == 0) { mg_call(c, MG_EV_CONNECT, NULL); } else if (mg_sock_would_block()) { + MG_DEBUG(("%lu %p connect in progress...", c->id, c->fd)); c->is_connecting = 1; } else { mg_error(c, "connect: %d", MG_SOCK_ERRNO); } } - (void)rc; - MG_DEBUG(("%lu %p", c->id, c->fd)); } static SOCKET raccept(SOCKET sock, union usa *usa, socklen_t len) { @@ -3513,7 +3513,8 @@ static void accept_conn(struct mg_mgr *mgr, struct mg_connection *lsn) { if (MG_SOCK_ERRNO != EAGAIN) #endif MG_ERROR(("%lu accept failed, errno %d", lsn->id, MG_SOCK_ERRNO)); -#if (MG_ARCH != MG_ARCH_WIN32) && (MG_ARCH != MG_ARCH_FREERTOS_TCP) && (MG_ARCH != MG_ARCH_TIRTOS) +#if (MG_ARCH != MG_ARCH_WIN32) && (MG_ARCH != MG_ARCH_FREERTOS_TCP) && \ + (MG_ARCH != MG_ARCH_TIRTOS) } else if ((long) fd >= FD_SETSIZE) { MG_ERROR(("%ld > %ld", (long) fd, (long) FD_SETSIZE)); closesocket(fd); diff --git a/src/sock.c b/src/sock.c index 7460ed57..67006528 100644 --- a/src/sock.c +++ b/src/sock.c @@ -191,9 +191,9 @@ static void mg_set_non_blocking_mode(SOCKET fd) { int status = 0; int res = SockStatus(fd, FDSTATUS_SEND, &status); if (res == 0 && status > 0) { - val = status / 2; - int val_size = sizeof(val); - res = SockSet(fd, SOL_SOCKET, SO_SNDLOWAT, &val, val_size); + val = status / 2; + int val_size = sizeof(val); + res = SockSet(fd, SOL_SOCKET, SO_SNDLOWAT, &val, val_size); } #else fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK); // Non-blocking mode @@ -312,7 +312,8 @@ static void close_conn(struct mg_connection *c) { } static void setsockopts(struct mg_connection *c) { -#if MG_ARCH == MG_ARCH_FREERTOS_TCP || MG_ARCH == MG_ARCH_AZURERTOS || MG_ARCH == MG_ARCH_TIRTOS +#if MG_ARCH == MG_ARCH_FREERTOS_TCP || MG_ARCH == MG_ARCH_AZURERTOS || \ + MG_ARCH == MG_ARCH_TIRTOS (void) c; #else int on = 1; @@ -348,13 +349,12 @@ void mg_connect_resolved(struct mg_connection *c) { if ((rc = connect(FD(c), &usa.sa, slen)) == 0) { mg_call(c, MG_EV_CONNECT, NULL); } else if (mg_sock_would_block()) { + MG_DEBUG(("%lu %p connect in progress...", c->id, c->fd)); c->is_connecting = 1; } else { mg_error(c, "connect: %d", MG_SOCK_ERRNO); } } - (void)rc; - MG_DEBUG(("%lu %p", c->id, c->fd)); } static SOCKET raccept(SOCKET sock, union usa *usa, socklen_t len) { @@ -379,7 +379,8 @@ static void accept_conn(struct mg_mgr *mgr, struct mg_connection *lsn) { if (MG_SOCK_ERRNO != EAGAIN) #endif MG_ERROR(("%lu accept failed, errno %d", lsn->id, MG_SOCK_ERRNO)); -#if (MG_ARCH != MG_ARCH_WIN32) && (MG_ARCH != MG_ARCH_FREERTOS_TCP) && (MG_ARCH != MG_ARCH_TIRTOS) +#if (MG_ARCH != MG_ARCH_WIN32) && (MG_ARCH != MG_ARCH_FREERTOS_TCP) && \ + (MG_ARCH != MG_ARCH_TIRTOS) } else if ((long) fd >= FD_SETSIZE) { MG_ERROR(("%ld > %ld", (long) fd, (long) FD_SETSIZE)); closesocket(fd); diff --git a/test/unit_test.c b/test/unit_test.c index 2f137e2b..aab8df8e 100644 --- a/test/unit_test.c +++ b/test/unit_test.c @@ -300,6 +300,7 @@ static void test_sntp(void) { ASSERT(c != NULL); ASSERT(c->is_udp == 1); for (i = 0; i < 500 && ms == 0; i++) mg_mgr_poll(&mgr, 10); + MG_DEBUG(("ms: %lld", ms)); ASSERT(ms > 0); mg_mgr_free(&mgr);