rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge libubox with the version 2016.02.26 from its git.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-02-26 23:13:29 +01:00
parent 6d5f11268b
commit 737ecc15d0
39 changed files with 2971 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
3P/libubox/uloop.c
View File

@@ -53,13 +53,12 @@ static __thread struct uloop_fd_stack *fd_stack = NULL;
#define ULOOP_MAX_EVENTS 10
static __thread struct list_head timeouts = {0};
static __thread struct list_head processes = {0};
static __thread struct list_head timeouts = LIST_HEAD_INIT(timeouts);
static __thread struct list_head processes = LIST_HEAD_INIT(processes);
static __thread int poll_fd = -1;
__thread bool uloop_cancelled = false;
__thread bool uloop_handle_sigchld = true;
static __thread bool do_sigchld = false;
__thread static bool do_sigchld = false;
static __thread struct uloop_fd_event cur_fds[ULOOP_MAX_EVENTS];
static __thread int cur_fd, cur_nfds;
@@ -213,10 +212,7 @@ int uloop_init(void)
{
if (poll_fd >= 0)
return 0;
if ((timeouts.next == 0) && (timeouts.prev == 0)) INIT_LIST_HEAD (&timeouts);
if ((processes.next == 0) && (processes.prev == 0)) INIT_LIST_HEAD (&processes);
poll_fd = epoll_create(32);
if (poll_fd < 0)
return -1;
@@ -457,14 +453,14 @@ int uloop_timeout_set(struct uloop_timeout *timeout, int msecs)
if (timeout->pending)
uloop_timeout_cancel(timeout);
uloop_gettime(&timeout->time);
uloop_gettime(time);
time->tv_sec += msecs / 1000;
time->tv_usec += (msecs % 1000) * 1000;
if (time->tv_usec > 1000000) {
time->tv_sec++;
time->tv_usec %= 1000000;
time->tv_usec -= 1000000;
}
return uloop_timeout_add(timeout);
@@ -562,31 +558,61 @@ static void uloop_sigchld(int signo)
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 *act;
memset(&s, 0, sizeof(struct sigaction));
act = NULL;
sigaction(signum, NULL, &s);
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 (act != NULL)
sigaction(signum, act, NULL);
}
if (!uloop_handle_sigchld)
return;
static void uloop_ignore_signal(int signum, bool ignore)
{
struct sigaction s;
void *new_handler = NULL;
if (add)
s.sa_handler = uloop_sigchld;
else
s = old_sigchld;
sigaction(signum, NULL, &s);
sigaction(SIGCHLD, &s, &old_sigchld);
if (ignore) {
if (s.sa_handler == SIG_DFL) /* Ignore only if there isn't any custom handler */
new_handler = SIG_IGN;
} else {
if (s.sa_handler == SIG_IGN) /* Restore only if noone modified our SIG_IGN */
new_handler = SIG_DFL;
}
if (new_handler) {
s.sa_handler = new_handler;
s.sa_flags = 0;
sigaction(signum, &s, NULL);
}
}
static void uloop_setup_signals(bool add)
{
static struct sigaction old_sigint, old_sigchld, old_sigterm;
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);
uloop_ignore_signal(SIGPIPE, add);
}
static int uloop_get_next_timeout(struct timeval *tv)
@@ -654,11 +680,13 @@ void uloop_run(void)
{
uloop_gettime(&tv);
uloop_process_timeouts(&tv);
if (uloop_cancelled)
break;
if (do_sigchld)
uloop_handle_processes();
if (uloop_cancelled)
break;
uloop_gettime(&tv);
uloop_run_events(uloop_get_next_timeout(&tv));
}