mirror/libowfat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move cleanup after check that all events are handled

Browse Source
This commit is contained in:
leitner 2021-03-12 10:43:46 +00:00
parent 15f004df55
commit c4b0dd6b81
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
io/io_waituntil2.c
View File

@ -120,18 +120,7 @@ int64 io_waituntil2(int64 milliseconds) {
struct pollfd* p; struct pollfd* p;
#endif #endif
long i,j,r; long i,j,r;
if (first_deferred!=-1) {
while (first_deferred!=-1) {
io_entry* e=iarray_get(&io_fds,first_deferred);
if (e && e->closed) {
e->closed=0;
close(first_deferred);
first_deferred=e->next_defer;
e->next_defer=-1;
} else
first_deferred=-1; // can't happen
}
}
/* if no interest in events has been registered, then return /* if no interest in events has been registered, then return
* immediately */ * immediately */
if (!io_wanted_fds) return 0; if (!io_wanted_fds) return 0;
@ -139,6 +128,22 @@ int64 io_waituntil2(int64 milliseconds) {
/* only actually wait if all previous events have been dequeued */ /* only actually wait if all previous events have been dequeued */
if (first_readable!=-1 || first_writeable!=-1) return 0; if (first_readable!=-1 || first_writeable!=-1) return 0;
/* There is a race if we get events on a socket, and someone calls
* io_close on the fd before they are handled. Those events are in a
* queue. So we try to detect if there are still queued events in
* io_close and then not actually close the descriptor but set
* e->closed so we can clean up the descriptor here. */
while (first_deferred!=-1) {
io_entry* e=iarray_get(&io_fds,first_deferred);
if (e && e->closed) {
e->closed=0;
close(first_deferred);
first_deferred=e->next_defer;
e->next_defer=-1;
} else
first_deferred=-1; // can't happen
}
#ifdef HAVE_EPOLL #ifdef HAVE_EPOLL
if (io_waitmode==EPOLL) { if (io_waitmode==EPOLL) {
int n; int n;