noselasd/libucore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace goto with do while

Browse Source
This commit is contained in:
Nils O. Selåsdal
2013-11-09 10:45:47 +01:00
parent 9f563c0c7e
commit a4c6b65d5f
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/iomux_epoll.c
+6 -4
View File
@@ -157,10 +157,12 @@ static int iomux_epoll_run(struct IOMux *mux_, struct timeval *timeout)
timeout_ms = timeval_to_ms(timeout);
else
timeout_ms = -1;
again:
rc = epoll_wait(mux->epoll_fd, mux->pending_events, EPOLL_WAIT_EVENTS, timeout_ms);
if (rc == -1 && errno == EINTR)
goto again;
do {
rc = epoll_wait(mux->epoll_fd, mux->pending_events, EPOLL_WAIT_EVENTS, timeout_ms);
while (rc == -1 && errno == EINTR)
assert(rc >= 0);
if(rc < 0)
src/iomux_select.c
+7 -6
View File
@@ -144,12 +144,13 @@ static int iomux_select_run(struct IOMux *mux_, struct timeval *timeout)
if (mux->max_fd == -1 && timeout == NULL)
return 0;
again:
read_set = mux->master_read_set;
write_set = mux->master_write_set;
rc = select(mux->max_fd + 1, &read_set, &write_set, NULL, timeout); //we can use timeout directly
if (rc == -1 && errno == EINTR)
goto again;
do {
read_set = mux->master_read_set;
write_set = mux->master_write_set;
rc = select(mux->max_fd + 1, &read_set, &write_set, NULL, timeout); //we can use timeout directly
while (rc == -1 && errno == EINTR)
assert(rc >= 0);
if (rc < 0)