projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
examples: add example code for json_script.
[project/libubox.git]
/
uloop.c
diff --git
a/uloop.c
b/uloop.c
index
d293edb
..
9a77ce4
100644
(file)
--- a/
uloop.c
+++ b/
uloop.c
@@
-58,7
+58,6
@@
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;
-bool uloop_handle_sigchld = true;
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];
@@
-385,6
+384,7
@@
int uloop_fd_add(struct uloop_fd *sock, unsigned int flags)
sock->registered = true;
sock->eof = false;
sock->registered = true;
sock->eof = false;
+ sock->error = false;
out:
return ret;
out:
return ret;
@@
-558,31
+558,37
@@
static void uloop_sigchld(int signo)
do_sigchld = true;
}
do_sigchld = true;
}
-static void uloop_
setup_signals(
bool add)
+static void uloop_
install_handler(int signum, void (*handler)(int), struct sigaction* old,
bool add)
{
{
- static struct sigaction old_sigint, old_sigchld;
struct sigaction s;
struct sigaction s;
+ struct sigaction *act;
- memset(&s, 0, sizeof(struct sigaction));
+ act = NULL;
+ sigaction(signum, NULL, &s);
if (add) {
if (add) {
- s.sa_handler = uloop_handle_sigint;
- s.sa_flags = 0;
- } else {
- s = old_sigint;
+ if (s.sa_handler == SIG_DFL) { /* Do not override existing custom signal handlers */
+ memcpy(old, &s, sizeof(struct sigaction));
+ s.sa_handler = handler;
+ s.sa_flags = 0;
+ act = &s;
+ }
+ }
+ else if (s.sa_handler == handler) { /* Do not restore if someone modified our handler */
+ act = old;
}
}
- sigaction(SIGINT, &s, &old_sigint);
-
- if (!uloop_handle_sigchld)
- return;
+ if (act != NULL)
+ sigaction(signum, act, NULL);
+}
- if (add)
- s.sa_handler = uloop_sigchld;
- else
- s = old_sigchld;
+static void uloop_setup_signals(bool add)
+{
+ static struct sigaction old_sigint, old_sigchld, old_sigterm;
- sigaction(SIGCHLD, &s, &old_sigchld);
+ uloop_install_handler(SIGINT, uloop_handle_sigint, &old_sigint, add);
+ uloop_install_handler(SIGTERM, uloop_handle_sigint, &old_sigterm, add);
+ uloop_install_handler(SIGCHLD, uloop_sigchld, &old_sigchld, add);
}
static int uloop_get_next_timeout(struct timeval *tv)
}
static int uloop_get_next_timeout(struct timeval *tv)
@@
-645,6
+651,7
@@
void uloop_run(void)
if (!recursive_calls++)
uloop_setup_signals(true);
if (!recursive_calls++)
uloop_setup_signals(true);
+ uloop_cancelled = false;
while(!uloop_cancelled)
{
uloop_gettime(&tv);
while(!uloop_cancelled)
{
uloop_gettime(&tv);