uloop: ensure SIGCHLD is properly received on mac os x

[oweals/libubox.git] / uloop.c

diff --git a/uloop.c b/uloop.c
index f4f5e023160f3d92fb019a845343e871d196dcb2..bf1721951917c0ae5688f3074a98e1de11a96a9c 100644 (file)
--- a/uloop.c
+++ b/uloop.c
@@ -57,6 +57,9 @@ static int cur_fd, cur_nfds;
 
 int uloop_init(void)
 {
+       struct timespec timeout = { 0, 0 };
+       struct kevent ev = {};
+
        if (poll_fd >= 0)
                return 0;
 
@@ -64,6 +67,9 @@ int uloop_init(void)
        if (poll_fd < 0)
                return -1;
 
+       EV_SET(&ev, SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, 0);
+       kevent(poll_fd, &ev, 1, NULL, 0, &timeout);
+
        return 0;
 }
 
@@ -88,23 +94,15 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
 {
        struct timespec timeout = { 0, 0 };
        struct kevent ev[2];
-       unsigned int changed;
        int nev = 0;
        unsigned int fl = 0;
+       uint16_t kflags;
 
-       changed = fd->kqflags ^ flags;
-       if (changed & ULOOP_EDGE_TRIGGER)
-               changed |= flags;
+       kflags = get_flags(flags, ULOOP_READ);
+       EV_SET(&ev[nev++], fd->fd, EVFILT_READ, kflags, 0, 0, fd);
 
-       if (changed & ULOOP_READ) {
-               uint16_t kflags = get_flags(flags, ULOOP_READ);
-               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);
-       }
+       kflags = get_flags(flags, ULOOP_WRITE);
+       EV_SET(&ev[nev++], fd->fd, EVFILT_WRITE, kflags, 0, 0, fd);
 
        if (!flags)
                fl |= EV_DELETE;
@@ -112,7 +110,6 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
        if (nev && (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1))
                return -1;
 
-       fd->kqflags = flags;
        return 0;
 }