Sometimes after re-arming a fd, an initial event for reads is not generated,
even though there is data pending. Work around this by making the trigger
level-triggered first, then switching to edge trigger after processing the first
event.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
static struct kevent events[ULOOP_MAX_EVENTS];
static struct kevent events[ULOOP_MAX_EVENTS];
-static int register_poll(struct uloop_fd *fd, unsigned int flags)
+static int register_kevent(struct uloop_fd *fd, unsigned int flags)
{
struct timespec timeout = { 0, 0 };
struct kevent ev[2];
{
struct timespec timeout = { 0, 0 };
struct kevent ev[2];
unsigned int fl = 0;
uint16_t kflags;
unsigned int fl = 0;
uint16_t kflags;
+ if (flags & ULOOP_EDGE_DEFER)
+ flags &= ~ULOOP_EDGE_TRIGGER;
+
kflags = get_flags(flags, ULOOP_READ);
EV_SET(&ev[nev++], fd->fd, EVFILT_READ, kflags, 0, 0, fd);
kflags = get_flags(flags, ULOOP_READ);
EV_SET(&ev[nev++], fd->fd, EVFILT_READ, kflags, 0, 0, fd);
if (!flags)
fl |= EV_DELETE;
if (!flags)
fl |= EV_DELETE;
- if (nev && (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1))
+ if (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1)
+static int register_poll(struct uloop_fd *fd, unsigned int flags)
+{
+ if (flags & ULOOP_EDGE_TRIGGER)
+ flags |= ULOOP_EDGE_DEFER;
+ else
+ flags &= ~ULOOP_EDGE_DEFER;
+
+ fd->flags = flags;
+ return register_kevent(fd, flags);
+}
+
int uloop_fd_delete(struct uloop_fd *sock)
{
int i;
int uloop_fd_delete(struct uloop_fd *sock)
{
int i;
cur_fd = n;
cur_nfds = nfds;
u->cb(u, ev);
cur_fd = n;
cur_nfds = nfds;
u->cb(u, ev);
+ if (u->flags & ULOOP_EDGE_DEFER) {
+ u->flags &= ~ULOOP_EDGE_DEFER;
+ register_kevent(u, u->flags);
+ }
#define ULOOP_WRITE (1 << 1)
#define ULOOP_EDGE_TRIGGER (1 << 2)
#define ULOOP_BLOCKING (1 << 3)
#define ULOOP_WRITE (1 << 1)
#define ULOOP_EDGE_TRIGGER (1 << 2)
#define ULOOP_BLOCKING (1 << 3)
+#ifdef USE_KQUEUE
+#define ULOOP_EDGE_DEFER (1 << 4)
+#endif
bool eof;
bool error;
bool registered;
bool eof;
bool error;
bool registered;
+#ifdef USE_KQUEUE
+ bool flags;
+#endif