DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow multiple calls to uloop_init() without annoying side effects

Browse source
This commit is contained in:
Felix Fietkau 2011-02-11 01:25:17 +01:00
parent 1ef7c81dfc
commit 7ec33884a3
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
uloop.c
View file

@ -47,13 +47,16 @@
#define ULOOP_MAX_EVENTS 10 #define ULOOP_MAX_EVENTS 10
static struct uloop_timeout *first_timeout; static struct uloop_timeout *first_timeout;
static int poll_fd; static int poll_fd = -1;
bool uloop_cancelled = false; bool uloop_cancelled = false;
#ifdef USE_KQUEUE #ifdef USE_KQUEUE
int uloop_init(void) int uloop_init(void)
{ {
if (poll_fd >= 0)
return 0;
poll_fd = kqueue(); poll_fd = kqueue();
if (poll_fd < 0) if (poll_fd < 0)
return -1; return -1;
@ -160,6 +163,9 @@ static void uloop_run_events(int timeout)
int uloop_init(void) int uloop_init(void)
{ {
if (poll_fd >= 0)
return 0;
poll_fd = epoll_create(32); poll_fd = epoll_create(32);
if (poll_fd < 0) if (poll_fd < 0)
return -1; return -1;
@ -383,5 +389,9 @@ void uloop_run(void)
void uloop_done(void) void uloop_done(void)
{ {
if (poll_fd < 0)
return;
close(poll_fd); close(poll_fd);
poll_fd = -1;
} }