uloop: export the cancelled flag

This commit is contained in:
Felix Fietkau 2011-02-06 16:13:58 +01:00
parent 3bc18fcadc
commit bf87f247d8
2 changed files with 6 additions and 4 deletions

View file

@ -48,7 +48,7 @@
struct uloop_timeout *first_timeout; struct uloop_timeout *first_timeout;
static int poll_fd; static int poll_fd;
static bool cancel; bool uloop_cancelled = false;
#ifdef USE_KQUEUE #ifdef USE_KQUEUE
@ -327,7 +327,7 @@ int uloop_timeout_cancel(struct uloop_timeout *timeout)
static void uloop_handle_sigint(int signo) static void uloop_handle_sigint(int signo)
{ {
cancel = true; uloop_cancelled = true;
} }
static void uloop_setup_signals(void) static void uloop_setup_signals(void)
@ -370,7 +370,7 @@ static void uloop_process_timeouts(struct timeval *tv)
void uloop_end(void) void uloop_end(void)
{ {
cancel = true; uloop_cancelled = true;
} }
void uloop_run(void) void uloop_run(void)
@ -378,7 +378,7 @@ void uloop_run(void)
struct timeval tv; struct timeval tv;
uloop_setup_signals(); uloop_setup_signals();
while(!cancel) while(!uloop_cancelled)
{ {
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
uloop_process_timeouts(&tv); uloop_process_timeouts(&tv);

View file

@ -62,6 +62,8 @@ struct uloop_timeout
bool pending; bool pending;
}; };
extern bool uloop_cancelled;
int uloop_fd_add(struct uloop_fd *sock, unsigned int flags); int uloop_fd_add(struct uloop_fd *sock, unsigned int flags);
int uloop_fd_delete(struct uloop_fd *sock); int uloop_fd_delete(struct uloop_fd *sock);