utils: move ARRAY_SIZE from uloop to utils.h

[project/libubox.git] / uloop.c

diff --git a/uloop.c b/uloop.c
index 4de26d4..88e9c81 100644 (file)
--- a/uloop.c
+++ b/uloop.c
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 
 #include "uloop.h"
+#include "utils.h"
 
 #ifdef USE_KQUEUE
 #include <sys/event.h>
@@ -41,10 +42,6 @@
 #endif
 #include <sys/wait.h>
 
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#endif
 #define ULOOP_MAX_EVENTS 10
 
 static struct list_head timeouts = LIST_HEAD_INIT(timeouts);
@@ -54,6 +51,7 @@ static int poll_fd = -1;
 bool uloop_cancelled = false;
 bool uloop_handle_sigchld = true;
 static bool do_sigchld = false;
+static int cur_fd, cur_nfds;
 
 #ifdef USE_KQUEUE
 
@@ -84,12 +82,15 @@ static uint16_t get_flags(unsigned int flags, unsigned int mask)
        return kflags;
 }
 
+static struct kevent events[ULOOP_MAX_EVENTS];
+
 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;
 
        changed = fd->kqflags ^ flags;
        if (changed & ULOOP_EDGE_TRIGGER)
@@ -105,7 +106,10 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
                EV_SET(&ev[nev++], fd->fd, EVFILT_WRITE, kflags, 0, 0, fd);
        }
 
-       if (nev && (kevent(poll_fd, ev, nev, NULL, 0, &timeout) == -1))
+       if (!flags)
+               fl |= EV_DELETE;
+
+       if (nev && (kevent(poll_fd, ev, nev, NULL, fl, &timeout) == -1))
                return -1;
 
        fd->kqflags = flags;
@@ -114,13 +118,21 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
 
 int uloop_fd_delete(struct uloop_fd *sock)
 {
+       int i;
+
+       for (i = cur_fd + 1; i < cur_nfds; i++) {
+               if (events[i].udata != sock)
+                       continue;
+
+               events[i].udata = NULL;
+       }
+
        sock->registered = false;
        return register_poll(sock, 0);
 }
 
 static void uloop_run_events(int timeout)
 {
-       struct kevent events[ULOOP_MAX_EVENTS];
        struct timespec ts;
        int nfds, n;
 
@@ -135,7 +147,10 @@ static void uloop_run_events(int timeout)
                struct uloop_fd *u = events[n].udata;
                unsigned int ev = 0;
 
-               if(events[n].flags & EV_ERROR) {
+               if (!u)
+                       continue;
+
+               if (events[n].flags & EV_ERROR) {
                        u->error = true;
                        uloop_fd_delete(u);
                }
@@ -145,14 +160,18 @@ static void uloop_run_events(int timeout)
                else if (events[n].filter == EVFILT_WRITE)
                        ev |= ULOOP_WRITE;
 
-               if(events[n].flags & EV_EOF)
+               if (events[n].flags & EV_EOF)
                        u->eof = true;
                else if (!ev)
                        continue;
 
-               if(u->cb)
+               if (u->cb) {
+                       cur_fd = n;
+                       cur_nfds = nfds;
                        u->cb(u, ev);
+               }
        }
+       cur_nfds = 0;
 }
 
 #endif
@@ -201,7 +220,6 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
        return epoll_ctl(poll_fd, op, fd->fd, &ev);
 }
 
-static int cur_fd, cur_nfds;
 static struct epoll_event events[ULOOP_MAX_EVENTS];
 
 int uloop_fd_delete(struct uloop_fd *sock)
@@ -283,10 +301,9 @@ out:
 
 static int tv_diff(struct timeval *t1, struct timeval *t2)
 {
-       if (t1->tv_sec != t2->tv_sec)
-               return (t1->tv_sec - t2->tv_sec) * 1000;
-       else
-               return (t1->tv_usec - t2->tv_usec) / 1000;
+       return
+               (t1->tv_sec - t2->tv_sec) * 1000 +
+               (t1->tv_usec - t2->tv_usec) / 1000;
 }
 
 int uloop_timeout_add(struct uloop_timeout *timeout)
@@ -320,11 +337,11 @@ int uloop_timeout_set(struct uloop_timeout *timeout, int msecs)
        gettimeofday(&timeout->time, NULL);
 
        time->tv_sec += msecs / 1000;
-       time->tv_usec += msecs % 1000;
+       time->tv_usec += (msecs % 1000) * 1000;
 
        if (time->tv_usec > 1000000) {
                time->tv_sec++;
-               time->tv_usec %= 100000;
+               time->tv_usec %= 1000000;
        }
 
        return uloop_timeout_add(timeout);
@@ -443,9 +460,11 @@ static int uloop_get_next_timeout(struct timeval *tv)
 
 static void uloop_process_timeouts(struct timeval *tv)
 {
-       struct uloop_timeout *t, *tmp;
+       struct uloop_timeout *t;
+
+       while (!list_empty(&timeouts)) {
+               t = list_first_entry(&timeouts, struct uloop_timeout, list);
 
-       list_for_each_entry_safe(t, tmp, &timeouts, list) {
                if (tv_diff(&t->time, tv) > 0)
                        break;