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

correctly initialize records before reusing them in io_fd

Browse Source 
do something about unexpected epoll events
This commit is contained in:
leitner 2003-10-12 16:50:55 +00:00
parent 29ae01d54f
commit eaa4dea67b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
io/io_fd.c
View File

@ -2,6 +2,7 @@
#define extern #define extern
#include "io_internal.h" #include "io_internal.h"
#undef extern #undef extern
#include "byte.h"
#ifdef HAVE_SIGIO #ifdef HAVE_SIGIO
#include <sys/poll.h> #include <sys/poll.h>
#include <signal.h> #include <signal.h>
@ -23,9 +24,10 @@
int io_fd(int64 d) { int io_fd(int64 d) {
long r; long r;
io_entry* e; io_entry* e;
if ((r=fcntl(d,F_GETFL,0) & O_NDELAY) == -1) if ((r=fcntl(d,F_GETFL,0)) == -1)
return 0; /* file descriptor not open */ return 0; /* file descriptor not open */
if (!(e=array_allocate(&io_fds,sizeof(io_entry),d))) return 0; if (!(e=array_allocate(&io_fds,sizeof(io_entry),d))) return 0;
byte_zero(e,sizeof(io_entry));
e->inuse=1; e->inuse=1;
if (r&O_NDELAY) e->nonblock=1; if (r&O_NDELAY) e->nonblock=1;
e->next_read=e->next_write=-1; e->next_read=e->next_write=-1;

2
io/io_waituntil2.c
View File

@ -37,6 +37,8 @@ int64 io_waituntil2(int64 milliseconds) {
e->next_write=first_writeable; e->next_write=first_writeable;
first_writeable=y[i].data.fd; first_writeable=y[i].data.fd;
} }
} else {
epoll_ctl(io_master,EPOLL_CTL_DEL,y[i].data.fd,y+i);
} }
} }
return n; return n;