udevd: serialize events if they refer to the same major:minor number

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 3c46617e4701a952a73ca53e6e881b4b6a6d3960..82ebd22dbad1dc1891fcdc34bcbee2a5df8182d8 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -76,17 +76,14 @@ void log_message(int priority, const char *format, ...)
        if (priority > udev_log_priority)
                return;
 
+       va_start(args, format);
        if (verbose) {
                printf("[%d] ", (int) getpid());
-               va_start(args, format);
                vprintf(format, args);
-               va_end(args);
                printf("\n");
-       } else {
-               va_start(args, format);
+       } else
                vsyslog(priority, format, args);
-               va_end(args);
-       }
+       va_end(args);
 }
 
 #endif
@@ -154,22 +151,16 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
        char filename[PATH_SIZE];
        char filename_failed[PATH_SIZE];
        size_t start;
-       struct udevd_uevent_msg *loop_msg;
-       int fd;
 
        /* location of queue file */
-       strlcpy(filename, udev_root, sizeof(filename));
-       strlcat(filename, "/", sizeof(filename));
-       start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename));
-       strlcat(filename, msg->devpath, sizeof(filename));
-       path_encode(&filename[start], sizeof(filename) - start);
+       snprintf(filename, sizeof(filename), "%s/"EVENT_QUEUE_DIR"/%llu", udev_root, msg->seqnum);
 
        /* location of failed file */
        strlcpy(filename_failed, udev_root, sizeof(filename_failed));
        strlcat(filename_failed, "/", sizeof(filename_failed));
        start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
        strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
-       path_encode(&filename_failed[start], sizeof(filename) - start);
+       path_encode(&filename_failed[start], sizeof(filename_failed) - start);
 
        switch (state) {
        case EVENT_QUEUED:
@@ -177,12 +168,9 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
                delete_path(filename_failed);
 
                create_path(filename);
-               fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
-               if (fd > 0)
-                       close(fd);
-               return;
+               symlink(msg->devpath, filename);
+               break;
        case EVENT_FINISHED:
-       case EVENT_FAILED:
                if (msg->devpath_old != NULL) {
                        /* "move" event - rename failed file to current name, do not delete failed */
                        char filename_failed_old[PATH_SIZE];
@@ -201,28 +189,20 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
                        delete_path(filename_failed);
                }
 
-               /* skip 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;
-
-               list_for_each_entry(loop_msg, &exec_list, node)
-                       if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
-                               return;
-
+               unlink(filename);
+               delete_path(filename);
+               break;
+       case EVENT_FAILED:
                /* move failed event to the failed directory */
-               if (state == EVENT_FAILED) {
-                       create_path(filename_failed);
-                       rename(filename, filename_failed);
-               } else {
-                       unlink(filename);
-               }
+               create_path(filename_failed);
+               rename(filename, filename_failed);
 
                /* clean up possibly empty queue directory */
                delete_path(filename);
-
-               return;
+               break;
        }
+
+       return;
 }
 
 static void msg_queue_delete(struct udevd_uevent_msg *msg)
@@ -297,7 +277,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
        }
 
        export_event_state(msg, EVENT_QUEUED);
-       info("seq %llu forked, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
+       info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
 
        /* run one event after the other in debug mode */
        if (debug_trace) {
@@ -499,16 +479,24 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
                        return 3;
                }
 
+               /* check for our major:minor number */
+               if (msg->devt && loop_msg->devt == msg->devt &&
+                   strcmp(msg->subsystem, loop_msg->subsystem) == 0) {
+                       dbg("%llu, device event still pending %llu (%d:%d)", msg->seqnum,
+                           loop_msg->seqnum, major(loop_msg->devt), minor(loop_msg->devt));
+                       return 4;
+               }
+
                /* check physical device event (special case of parent) */
                if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
                        if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
                                dbg("%llu, physical device event still pending %llu (%s)",
                                    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-                               return 4;
+                               return 5;
                        }
        }
 
-       /* check runing-queue for still running events */
+       /* check run queue for still running events */
        list_for_each_entry(loop_msg, &running_list, node) {
                if (limit && childs_count++ > limit) {
                        dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
@@ -527,12 +515,20 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
                        return 3;
                }
 
+               /* check for our major:minor number */
+               if (msg->devt && loop_msg->devt == msg->devt &&
+                   strcmp(msg->subsystem, loop_msg->subsystem) == 0) {
+                       dbg("%llu, device event still running %llu (%d:%d)", msg->seqnum,
+                           loop_msg->seqnum, major(loop_msg->devt), minor(loop_msg->devt));
+                       return 4;
+               }
+
                /* check physical device event (special case of parent) */
                if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
                        if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
                                dbg("%llu, physical device event still running %llu (%s)",
                                    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-                               return 4;
+                               return 5;
                        }
        }
        return 0;