shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00
Code

udevd: handle SIGCHLD before the worker event message

Browse Source 
We may need to handle SIGCHLD before the queued worker message. The last
reference, from the SIGCHLD or the worker message will clean up the worker
context. In case we receive an unexpected SIGCHLD with an error, we let
the event fail and clean up the worker context.
This commit is contained in:
Kay Sievers 2009-07-13 03:09:05 +02:00
parent adda4c682a
commit bc113de9a4
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
udev/udevd.c
View File

@ -128,6 +128,8 @@ enum worker_state {
struct worker {
struct udev_list_node node;
struct udev *udev;
int refcount;
pid_t pid;
struct udev_monitor *monitor;
enum worker_state state;
@ -176,9 +178,22 @@ static void event_sig_handler(int signum)
}
}
static struct worker *worker_ref(struct worker *worker)
{
worker->refcount++;
return worker;
}
static void worker_unref(struct worker *worker)
{
worker->refcount--;
if (worker->refcount > 0)
return;
udev_list_node_remove(&worker->node);
udev_monitor_unref(worker->monitor);
childs--;
info(worker->udev, "worker [%u] cleaned up\n", worker->pid);
free(worker);
}
@ -201,6 +216,9 @@ static void worker_new(struct event *event)
worker = calloc(1, sizeof(struct worker));
if (worker == NULL)
return;
/* worker + event reference */
worker->refcount = 2;
worker->udev = event->udev;
pid = fork();
switch (pid) {
@ -339,18 +357,17 @@ static void event_run(struct event *event)
if (worker->state != WORKER_IDLE)
continue;
count = udev_monitor_send_device(monitor, worker->monitor, event->dev);
if (count < 0) {
err(event->udev, "worker [%u] did not accept message %zi (%m), kill it\n", worker->pid, count);
kill(worker->pid, SIGKILL);
worker->state = WORKER_KILLED;
continue;
}
worker_ref(worker);
worker->event = event;
worker->state = WORKER_RUNNING;
event->state = EVENT_RUNNING;
count = udev_monitor_send_device(monitor, worker->monitor, event->dev);
if (count < 0) {
event->state = EVENT_QUEUED;
worker->event = NULL;
err(event->udev, "worker [%u] did not accept message %zi (%m), kill it\n", worker->pid, count);
worker->state = WORKER_KILLED;
kill(worker->pid, SIGKILL);
continue;
}
return;
}
@ -544,6 +561,7 @@ static void worker_returned(void)
worker->event = NULL;
if (worker->state != WORKER_KILLED)
worker->state = WORKER_IDLE;
worker_unref(worker);
break;
}
}
@ -702,17 +720,18 @@ static void handle_signal(struct udev *udev, int signo)
if (worker->pid != pid)
continue;
/* fail event, if worker died unexpectedly */
if (worker->event != NULL) {
worker->event->exitcode = status;
err(udev, "worker [%u] unexpectedly returned with status 0x%04x\n", pid, status);
event_queue_delete(worker->event);
}
udev_list_node_remove(&worker->node);
worker_unref(worker);
childs--;
info(udev, "worker [%u] exit\n", pid);
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
err(udev, "worker [%u] unexpectedly returned with status 0x%04x\n", pid, status);
if (worker->event != NULL) {
err(udev, "worker [%u] failed while handling '%s'\n", pid, worker->event->devpath);
worker->event->exitcode = -32;
event_queue_delete(worker->event);
/* drop reference from running event */
worker_unref(worker);
}
}
worker_unref(worker);
break;
}
}