mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-08-06 13:37:34 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Address #2125: treat negative poll time as infinite wait

Browse Source
This commit is contained in:
cpq 2023-04-10 15:04:37 +01:00
parent 2fd2dff126
commit d9f05532cd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mongoose.c
View File

@ -4668,7 +4668,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
} }
} }
#else #else
struct timeval tv = {ms / 1000, (ms % 1000) * 1000}, tv_zero = {0, 0}; struct timeval tv = {ms / 1000, (ms % 1000) * 1000}, tv_zero = {0, 0}, *tvp;
struct mg_connection *c; struct mg_connection *c;
fd_set rset, wset, eset; fd_set rset, wset, eset;
MG_SOCKET_TYPE maxfd = 0; MG_SOCKET_TYPE maxfd = 0;
@ -4677,17 +4677,18 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
FD_ZERO(&rset); FD_ZERO(&rset);
FD_ZERO(&wset); FD_ZERO(&wset);
FD_ZERO(&eset); FD_ZERO(&eset);
tvp = ms < 0 ? NULL : &tv;
for (c = mgr->conns; c != NULL; c = c->next) { for (c = mgr->conns; c != NULL; c = c->next) {
c->is_readable = c->is_writable = 0; c->is_readable = c->is_writable = 0;
if (skip_iotest(c)) continue; if (skip_iotest(c)) continue;
FD_SET(FD(c), &eset); FD_SET(FD(c), &eset);
if (can_read(c)) FD_SET(FD(c), &rset); if (can_read(c)) FD_SET(FD(c), &rset);
if (can_write(c)) FD_SET(FD(c), &wset); if (can_write(c)) FD_SET(FD(c), &wset);
if (mg_tls_pending(c) > 0) tv = tv_zero; if (mg_tls_pending(c) > 0) tvp = &tv_zero;
if (FD(c) > maxfd) maxfd = FD(c); if (FD(c) > maxfd) maxfd = FD(c);
} }
if ((rc = select((int) maxfd + 1, &rset, &wset, &eset, &tv)) < 0) { if ((rc = select((int) maxfd + 1, &rset, &wset, &eset, tvp)) < 0) {
#if MG_ARCH == MG_ARCH_WIN32 #if MG_ARCH == MG_ARCH_WIN32
if (maxfd == 0) Sleep(ms); // On Windows, select fails if no sockets if (maxfd == 0) Sleep(ms); // On Windows, select fails if no sockets
#else #else

7
src/sock.c
View File

@ -571,7 +571,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
} }
} }
#else #else
struct timeval tv = {ms / 1000, (ms % 1000) * 1000}, tv_zero = {0, 0}; struct timeval tv = {ms / 1000, (ms % 1000) * 1000}, tv_zero = {0, 0}, *tvp;
struct mg_connection *c; struct mg_connection *c;
fd_set rset, wset, eset; fd_set rset, wset, eset;
MG_SOCKET_TYPE maxfd = 0; MG_SOCKET_TYPE maxfd = 0;
@ -580,17 +580,18 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
FD_ZERO(&rset); FD_ZERO(&rset);
FD_ZERO(&wset); FD_ZERO(&wset);
FD_ZERO(&eset); FD_ZERO(&eset);
tvp = ms < 0 ? NULL : &tv;
for (c = mgr->conns; c != NULL; c = c->next) { for (c = mgr->conns; c != NULL; c = c->next) {
c->is_readable = c->is_writable = 0; c->is_readable = c->is_writable = 0;
if (skip_iotest(c)) continue; if (skip_iotest(c)) continue;
FD_SET(FD(c), &eset); FD_SET(FD(c), &eset);
if (can_read(c)) FD_SET(FD(c), &rset); if (can_read(c)) FD_SET(FD(c), &rset);
if (can_write(c)) FD_SET(FD(c), &wset); if (can_write(c)) FD_SET(FD(c), &wset);
if (mg_tls_pending(c) > 0) tv = tv_zero; if (mg_tls_pending(c) > 0) tvp = &tv_zero;
if (FD(c) > maxfd) maxfd = FD(c); if (FD(c) > maxfd) maxfd = FD(c);
} }
if ((rc = select((int) maxfd + 1, &rset, &wset, &eset, &tv)) < 0) { if ((rc = select((int) maxfd + 1, &rset, &wset, &eset, tvp)) < 0) {
#if MG_ARCH == MG_ARCH_WIN32 #if MG_ARCH == MG_ARCH_WIN32
if (maxfd == 0) Sleep(ms); // On Windows, select fails if no sockets if (maxfd == 0) Sleep(ms); // On Windows, select fails if no sockets
#else #else