xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

bugFix: check timeout as well

This commit is contained in:
freemine 2021-01-17 08:13:51 +08:00
parent 60a9725d03
commit 6530365e58
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/os/src/darwin/eok.c
View File

@ -25,6 +25,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
#define ENABLE_LOG
#ifdef ENABLE_LOG #ifdef ENABLE_LOG
#define D(fmt, ...) fprintf(stderr, "%s[%d]%s(): " fmt "\n", basename(__FILE__), __LINE__, __func__, ##__VA_ARGS__) #define D(fmt, ...) fprintf(stderr, "%s[%d]%s(): " fmt "\n", basename(__FILE__), __LINE__, __func__, ##__VA_ARGS__)
#define E(fmt, ...) do { \ #define E(fmt, ...) do { \
@ -582,9 +584,11 @@ int epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
if (cnts==0) { if (cnts==0) {
// if no user-cared-events is up // if no user-cared-events is up
// we check to see if time is up // we check to see if time is up
A(TIME_UTC==timespec_get(&now, TIME_UTC), "internal logic error"); if (timeout!=-1) {
to = do_timespec_diff(&now, &abstime); A(TIME_UTC==timespec_get(&now, TIME_UTC), "internal logic error");
if (to.tv_sec==0 && to.tv_nsec==0) break; to = do_timespec_diff(&now, &abstime);
if (to.tv_sec==0 && to.tv_nsec==0) break;
}
// time is not up yet, continue loop // time is not up yet, continue loop
} }
} while (cnts==0); } while (cnts==0);