mirrors
/
kore
mirror of https://git.kore.io/kore.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Improve waiting on workers to exit take 2. 

Keep track of what workers are running and account for those when things
exit. Somewhat reverts the entire last commit, that was the wrong approach.
This commit is contained in:
Joris Vink 2020-01-17 21:48:55 +01:00
parent d8ff8e2c18
commit 01cc981632
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/kore/kore.h
View File

@ -447,6 +447,7 @@ struct kore_alog_header {
struct kore_worker {
u_int16_t id;
u_int16_t cpu;
int running;
#if defined(__linux__)
int tracing;
#endif

24
src/worker.c
View File

@ -177,6 +177,7 @@ kore_worker_spawn(u_int16_t idx, u_int16_t id, u_int16_t cpu)
kw->cpu = cpu;
kw->has_lock = 0;
kw->active_hdlr = NULL;
kw->running = 1;
if (socketpair(AF_UNIX, SOCK_STREAM, 0, kw->pipe) == -1)
fatal("socketpair(): %s", errno_s);
@ -221,25 +222,24 @@ kore_worker_shutdown(void)
for (;;) {
for (idx = 0; idx < worker_count; idx++) {
kw = WORKER(idx);
if (kw->running == 0)
continue;
if (kw->pid != 0) {
pid = waitpid(kw->pid, &status, 0);
if (pid == -1) {
if (errno == ECHILD)
kw->pid = 0;
if (pid == -1)
continue;
}
#if defined(__linux__)
kore_seccomp_trace(kw->pid, status);
#endif
if (WIFEXITED(status)) {
kw->pid = 0;
kw->pid = 0;
kw->running = 0;
if (!kore_quiet) {
kore_log(LOG_NOTICE,
"worker %d exited", kw->id);
}
if (!kore_quiet) {
kore_log(LOG_NOTICE,
"worker %d exited", kw->id);
}
}
}
@ -247,8 +247,10 @@ kore_worker_shutdown(void)
done = 0;
for (idx = 0; idx < worker_count; idx++) {
kw = WORKER(idx);
if (kw->pid == 0)
if (kw->running == 0) {
done++;
continue;
}
}
if (done == worker_count)