blobmsg: fix blobmsg_parse_array, drop name field requirement

[project/libubox.git] / uloop.c

diff --git a/uloop.c b/uloop.c
index 2d7b2c9..2de4feb 100644 (file)
--- a/uloop.c
+++ b/uloop.c
@@ -96,20 +96,30 @@ static int register_kevent(struct uloop_fd *fd, unsigned int flags)
        struct kevent ev[2];
        int nev = 0;
        unsigned int fl = 0;
+       unsigned int changed;
        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);
+       changed = flags ^ fd->flags;
+       if (changed & ULOOP_EDGE_TRIGGER)
+               changed |= flags;
 
-       kflags = get_flags(flags, ULOOP_WRITE);
-       EV_SET(&ev[nev++], fd->fd, EVFILT_WRITE, kflags, 0, 0, fd);
+       if (changed & ULOOP_READ) {
+               kflags = get_flags(flags, ULOOP_READ);
+               EV_SET(&ev[nev++], fd->fd, EVFILT_READ, kflags, 0, 0, fd);
+       }
+
+       if (changed & ULOOP_WRITE) {
+               kflags = get_flags(flags, ULOOP_WRITE);
+               EV_SET(&ev[nev++], fd->fd, EVFILT_WRITE, kflags, 0, 0, fd);
+       }
 
        if (!flags)
                fl |= EV_DELETE;
 
+       fd->flags = flags;
        if (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1)
                return -1;
 
@@ -123,7 +133,6 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
        else
                flags &= ~ULOOP_EDGE_DEFER;
 
-       fd->flags = flags;
        return register_kevent(fd, flags);
 }
 
@@ -342,6 +351,15 @@ int uloop_timeout_add(struct uloop_timeout *timeout)
        return 0;
 }
 
+static void uloop_gettime(struct timeval *tv)
+{
+       struct timespec ts;
+
+       clock_gettime(CLOCK_MONOTONIC, &ts);
+       tv->tv_sec = ts.tv_sec;
+       tv->tv_usec = ts.tv_nsec / 1000;
+}
+
 int uloop_timeout_set(struct uloop_timeout *timeout, int msecs)
 {
        struct timeval *time = &timeout->time;
@@ -349,7 +367,7 @@ int uloop_timeout_set(struct uloop_timeout *timeout, int msecs)
        if (timeout->pending)
                uloop_timeout_cancel(timeout);
 
-       gettimeofday(&timeout->time, NULL);
+       uloop_gettime(&timeout->time);
 
        time->tv_sec += msecs / 1000;
        time->tv_usec += (msecs % 1000) * 1000;
@@ -512,7 +530,7 @@ void uloop_run(void)
        uloop_setup_signals();
        while(!uloop_cancelled)
        {
-               gettimeofday(&tv, NULL);
+               uloop_gettime(&tv);
                uloop_process_timeouts(&tv);
                if (uloop_cancelled)
                        break;