#include <sys/un.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
+#include <linux/types.h>
#include <linux/netlink.h>
#include "list.h"
if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
else
- run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+ if (run_program(name_loop->name, udev.subsystem, NULL, 0, NULL,
+ (udev_log_priority >= LOG_INFO)))
+ retval = -1;
}
}
udev_cleanup_device(&udev);
- return 0;
+ return retval;
+}
+
+enum event_state {
+ EVENT_QUEUED,
+ EVENT_FINISHED,
+ EVENT_FAILED,
+};
+
+#define PATH_TO_NAME_CHAR '@'
+#define EVENT_QUEUE_DIR ".udev/queue"
+#define EVENT_FAILED_DIR ".udev/failed"
+static void export_event_state(struct uevent_msg *msg, enum event_state state)
+{
+ char filename[PATH_SIZE];
+ char filename_failed[PATH_SIZE];
+ char target[PATH_SIZE];
+ size_t start, end, i;
+ struct uevent_msg *loop_msg;
+
+ /* add location of queue files */
+ strlcpy(filename, udev_root, sizeof(filename));
+ strlcat(filename, "/", sizeof(filename));
+ start = strlcat(filename, EVENT_QUEUE_DIR, sizeof(filename));
+ end = strlcat(filename, msg->devpath, sizeof(filename));
+ if (end > sizeof(filename))
+ end = sizeof(filename);
+
+ /* replace '/' to transform path into a filename */
+ for (i = start+1; i < end; i++)
+ if (filename[i] == '/')
+ filename[i] = PATH_TO_NAME_CHAR;
+
+ /* add location of failed files */
+ strlcpy(filename_failed, udev_root, sizeof(filename_failed));
+ strlcat(filename_failed, "/", sizeof(filename_failed));
+ start = strlcat(filename_failed, EVENT_FAILED_DIR, sizeof(filename_failed));
+ end = strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
+ if (end > sizeof(filename_failed))
+ end = sizeof(filename_failed);
+
+ /* replace '/' to transform path into a filename */
+ for (i = start+1; i < end; i++)
+ if (filename_failed[i] == '/')
+ filename_failed[i] = PATH_TO_NAME_CHAR;
+
+ switch (state) {
+ case EVENT_QUEUED:
+ unlink(filename_failed);
+
+ strlcpy(target, sysfs_path, sizeof(target));
+ strlcat(target, msg->devpath, sizeof(target));
+ create_path(filename);
+ symlink(target, filename);
+ return;
+ case EVENT_FINISHED:
+ unlink(filename_failed);
+
+ /* don't remove if events for the same path are still pending */
+ list_for_each_entry(loop_msg, &running_list, node)
+ if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+ return;
+ unlink(filename);
+ case EVENT_FAILED:
+ create_path(filename_failed);
+ rename(filename, filename_failed);
+ return;
+ }
}
static void msg_queue_delete(struct uevent_msg *msg)
{
list_del(&msg->node);
+
+ /* mark as failed, if add event returns non-zero */
+ if (msg->exitstatus && strcmp(msg->action, "add") == 0)
+ export_event_state(msg, EVENT_FAILED);
+ else
+ export_event_state(msg, EVENT_FINISHED);
+
free(msg);
}
static void udev_event_run(struct uevent_msg *msg)
{
pid_t pid;
+ int retval;
pid = fork();
switch (pid) {
logging_init("udevd-event");
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
- udev_event_process(msg);
+ retval = udev_event_process(msg);
info("seq %llu finished", msg->seqnum);
logging_close();
+ if (retval)
+ exit(1);
exit(0);
case -1:
err("fork of child failed: %s", strerror(errno));
{
msg->queue_time = time(NULL);
+ export_event_state(msg, EVENT_QUEUED);
+
/* run all events with a timeout set immediately */
if (msg->timeout != 0) {
list_add_tail(&msg->node, &running_list);
struct uevent_msg *loop_msg;
int childs_count = 0;
- if (msg->devpath == NULL)
- return 0;
-
list_for_each_entry(loop_msg, &running_list, node) {
if (limit && childs_count++ > limit) {
dbg("%llu, maximum number (%i) of child reached", msg->seqnum, childs_count);
return 1;
}
- if (loop_msg->devpath == NULL)
- continue;
/* return running parent/child device event */
if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
msg->envp[i++] = "UDEVD_EVENT=1";
msg->envp[i] = NULL;
+ if (!msg->devpath) {
+ info("DEVPATH missing, ignore message");
+ free(msg);
+ return NULL;
+ }
+
return msg;
}
write(signal_pipe[WRITE_END], "", 1);
}
-static void udev_done(int pid)
+static void udev_done(int pid, int exitstatus)
{
/* find msg associated with pid and delete it */
struct uevent_msg *msg;
list_for_each_entry(msg, &running_list, node) {
if (msg->pid == pid) {
- info("seq %llu, pid [%d] exit, %ld seconds old", msg->seqnum, msg->pid, time(NULL) - msg->queue_time);
+ info("seq %llu, pid [%d] exit with %i, %ld seconds old", msg->seqnum, msg->pid,
+ exitstatus, time(NULL) - msg->queue_time);
+ msg->exitstatus = exitstatus;
msg_queue_delete(msg);
/* there may be events waiting with the same devpath */
static void reap_sigchilds(void)
{
pid_t pid;
+ int status;
while (1) {
- pid = waitpid(-1, NULL, WNOHANG);
+ pid = waitpid(-1, &status, WNOHANG);
if (pid <= 0)
break;
- udev_done(pid);
+ if (WIFEXITED(status))
+ status = WEXITSTATUS(status);
+ else
+ status = 0;
+ udev_done(pid, status);
}
}
~ianmdlvl / elogind.git / blobdiff