DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uloop: do less state/change tracking for kevent() on mac os x, it is unreliable

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2013-01-04 01:15:45 +01:00
parent 8686989fff
commit 6a8df07590
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
uloop.c
View file

@ -88,23 +88,15 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
{ {
struct timespec timeout = { 0, 0 }; struct timespec timeout = { 0, 0 };
struct kevent ev[2]; struct kevent ev[2];
unsigned int changed;
int nev = 0; int nev = 0;
unsigned int fl = 0; unsigned int fl = 0;
uint16_t kflags;
changed = fd->kqflags ^ flags; kflags = get_flags(flags, ULOOP_READ);
if (changed & ULOOP_EDGE_TRIGGER) EV_SET(&ev[nev++], fd->fd, EVFILT_READ, kflags, 0, 0, fd);
changed |= flags;
if (changed & ULOOP_READ) { kflags = get_flags(flags, ULOOP_WRITE);
uint16_t kflags = get_flags(flags, ULOOP_READ); EV_SET(&ev[nev++], fd->fd, EVFILT_WRITE, kflags, 0, 0, fd);
EV_SET(&ev[nev++], fd->fd, EVFILT_READ, kflags, 0, 0, fd);
}
if (changed & ULOOP_WRITE) {
uint16_t kflags = get_flags(flags, ULOOP_WRITE);
EV_SET(&ev[nev++], fd->fd, EVFILT_WRITE, kflags, 0, 0, fd);
}
if (!flags) if (!flags)
fl |= EV_DELETE; fl |= EV_DELETE;
@ -112,7 +104,6 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
if (nev && (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1)) if (nev && (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1))
return -1; return -1;
fd->kqflags = flags;
return 0; return 0;
} }

3
uloop.h
View file

@ -54,9 +54,6 @@ struct uloop_fd
bool eof; bool eof;
bool error; bool error;
bool registered; bool registered;
#ifdef USE_KQUEUE
uint8_t kqflags;
#endif
}; };
struct uloop_timeout struct uloop_timeout