uloop: export the cancelled flag
authorFelix Fietkau <nbd@openwrt.org>
Sun, 6 Feb 2011 15:13:58 +0000 (16:13 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 6 Feb 2011 15:13:58 +0000 (16:13 +0100)
uloop.c
uloop.h

diff --git a/uloop.c b/uloop.c
index a8cb5062da756151aa1e9144bdc8fdc482ef0b83..4be5f45b17c9acf052e07afc4360ac6f595ee526 100644 (file)
--- a/uloop.c
+++ b/uloop.c
@@ -48,7 +48,7 @@
 
 struct uloop_timeout *first_timeout;
 static int poll_fd;
-static bool cancel;
+bool uloop_cancelled = false;
 
 #ifdef USE_KQUEUE
 
@@ -327,7 +327,7 @@ int uloop_timeout_cancel(struct uloop_timeout *timeout)
 
 static void uloop_handle_sigint(int signo)
 {
-       cancel = true;
+       uloop_cancelled = true;
 }
 
 static void uloop_setup_signals(void)
@@ -370,7 +370,7 @@ static void uloop_process_timeouts(struct timeval *tv)
 
 void uloop_end(void)
 {
-       cancel = true;
+       uloop_cancelled = true;
 }
 
 void uloop_run(void)
@@ -378,7 +378,7 @@ void uloop_run(void)
        struct timeval tv;
 
        uloop_setup_signals();
-       while(!cancel)
+       while(!uloop_cancelled)
        {
                gettimeofday(&tv, NULL);
                uloop_process_timeouts(&tv);
diff --git a/uloop.h b/uloop.h
index 10a117f1ecd70ae77a01747781fec7173b574bb1..2b02e18defb996b4e055316361a6fd98961c8e19 100644 (file)
--- a/uloop.h
+++ b/uloop.h
@@ -62,6 +62,8 @@ struct uloop_timeout
        bool pending;
 };
 
+extern bool uloop_cancelled;
+
 int uloop_fd_add(struct uloop_fd *sock, unsigned int flags);
 int uloop_fd_delete(struct uloop_fd *sock);