projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kvlist: add static initializer macros
[project/libubox.git]
/
uloop.c
diff --git
a/uloop.c
b/uloop.c
index 2612fbdbc8ee4e9a6bce75bca8bb52f74199e6a1..1c5bcee73a12c07c664ea5eb1d41fd427afa049f 100644
(file)
--- a/
uloop.c
+++ b/
uloop.c
@@
-58,6
+58,7
@@
static struct list_head processes = LIST_HEAD_INIT(processes);
static int poll_fd = -1;
bool uloop_cancelled = false;
static int poll_fd = -1;
bool uloop_cancelled = false;
+static int uloop_status = 0;
static bool do_sigchld = false;
static struct uloop_fd_event cur_fds[ULOOP_MAX_EVENTS];
static bool do_sigchld = false;
static struct uloop_fd_event cur_fds[ULOOP_MAX_EVENTS];
@@
-105,6
+106,7
@@
static int waker_init(void)
waker_init_fd(fds[0]);
waker_init_fd(fds[1]);
waker_init_fd(fds[0]);
waker_init_fd(fds[1]);
+ waker_pipe = fds[1];
waker_fd.fd = fds[0];
waker_fd.cb = waker_consume;
waker_fd.fd = fds[0];
waker_fd.cb = waker_consume;
@@
-385,11
+387,18
@@
static void uloop_handle_processes(void)
static void uloop_signal_wake(void)
{
static void uloop_signal_wake(void)
{
- write(waker_pipe, "w", 1);
+ do {
+ if (write(waker_pipe, "w", 1) < 0) {
+ if (errno == EINTR)
+ continue;
+ }
+ break;
+ } while (1);
}
static void uloop_handle_sigint(int signo)
{
}
static void uloop_handle_sigint(int signo)
{
+ uloop_status = signo;
uloop_cancelled = true;
uloop_signal_wake();
}
uloop_cancelled = true;
uloop_signal_wake();
}
@@
-505,7
+514,7
@@
static void uloop_clear_processes(void)
uloop_process_delete(p);
}
uloop_process_delete(p);
}
-
void
uloop_run(void)
+
int
uloop_run(void)
{
static int recursive_calls = 0;
struct timeval tv;
{
static int recursive_calls = 0;
struct timeval tv;
@@
-517,8
+526,9
@@
void uloop_run(void)
if (!recursive_calls++)
uloop_setup_signals(true);
if (!recursive_calls++)
uloop_setup_signals(true);
+ uloop_status = 0;
uloop_cancelled = false;
uloop_cancelled = false;
- while(!uloop_cancelled)
+ while
(!uloop_cancelled)
{
uloop_gettime(&tv);
uloop_process_timeouts(&tv);
{
uloop_gettime(&tv);
uloop_process_timeouts(&tv);
@@
-535,6
+545,8
@@
void uloop_run(void)
if (!--recursive_calls)
uloop_setup_signals(false);
if (!--recursive_calls)
uloop_setup_signals(false);
+
+ return uloop_status;
}
void uloop_done(void)
}
void uloop_done(void)