uloop: fix multiple calls to uloop_run()

[project/libubox.git] / uloop.c

diff --git a/uloop.c b/uloop.c
index 54ebe8d..c3d206a 100644 (file)
--- a/uloop.c
+++ b/uloop.c
@@ -174,7 +174,8 @@ static int uloop_fetch_events(int timeout)
 
                if (events[n].flags & EV_ERROR) {
                        u->error = true;
-                       uloop_fd_delete(u);
+                       if (!(u->flags & ULOOP_ERROR_CB))
+                               uloop_fd_delete(u);
                }
 
                if(events[n].filter == EVFILT_READ)
@@ -268,7 +269,8 @@ static int uloop_fetch_events(int timeout)
 
                if (events[n].events & (EPOLLERR|EPOLLHUP)) {
                        u->error = true;
-                       uloop_fd_delete(u);
+                       if (!(u->flags & ULOOP_ERROR_CB))
+                               uloop_fd_delete(u);
                }
 
                if(!(events[n].events & (EPOLLRDHUP|EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP))) {
@@ -383,6 +385,7 @@ int uloop_fd_add(struct uloop_fd *sock, unsigned int flags)
 
        sock->registered = true;
        sock->eof = false;
+       sock->error = false;
 
 out:
        return ret;
@@ -392,15 +395,16 @@ int uloop_fd_delete(struct uloop_fd *fd)
 {
        int i;
 
-       if (!fd->registered)
-               return 0;
-
        for (i = 0; i < cur_nfds; i++) {
                if (cur_fds[cur_fd + i].fd != fd)
                        continue;
 
                cur_fds[cur_fd + i].fd = NULL;
        }
+
+       if (!fd->registered)
+               return 0;
+
        fd->registered = false;
        uloop_fd_stack_event(fd, -1);
        return __uloop_fd_delete(fd);
@@ -555,19 +559,31 @@ static void uloop_sigchld(int signo)
        do_sigchld = true;
 }
 
-static void uloop_setup_signals(void)
+static void uloop_setup_signals(bool add)
 {
+       static struct sigaction old_sigint, old_sigchld;
        struct sigaction s;
 
        memset(&s, 0, sizeof(struct sigaction));
-       s.sa_handler = uloop_handle_sigint;
-       s.sa_flags = 0;
-       sigaction(SIGINT, &s, NULL);
 
-       if (uloop_handle_sigchld) {
-               s.sa_handler = uloop_sigchld;
-               sigaction(SIGCHLD, &s, NULL);
+       if (add) {
+               s.sa_handler = uloop_handle_sigint;
+               s.sa_flags = 0;
+       } else {
+               s = old_sigint;
        }
+
+       sigaction(SIGINT, &s, &old_sigint);
+
+       if (!uloop_handle_sigchld)
+               return;
+
+       if (add)
+               s.sa_handler = uloop_sigchld;
+       else
+               s = old_sigchld;
+
+       sigaction(SIGCHLD, &s, &old_sigchld);
 }
 
 static int uloop_get_next_timeout(struct timeval *tv)
@@ -620,9 +636,17 @@ static void uloop_clear_processes(void)
 
 void uloop_run(void)
 {
+       static int recursive_calls = 0;
        struct timeval tv;
 
-       uloop_setup_signals();
+       /*
+        * Handlers are only updated for the first call to uloop_run() (and restored
+        * when this call is done).
+        */
+       if (!recursive_calls++)
+               uloop_setup_signals(true);
+
+       uloop_cancelled = false;
        while(!uloop_cancelled)
        {
                uloop_gettime(&tv);
@@ -632,8 +656,12 @@ void uloop_run(void)
 
                if (do_sigchld)
                        uloop_handle_processes();
+               uloop_gettime(&tv);
                uloop_run_events(uloop_get_next_timeout(&tv));
        }
+
+       if (!--recursive_calls)
+               uloop_setup_signals(false);
 }
 
 void uloop_done(void)