[PATCH] 049 release

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 43f3f0324b79cdf309c1be3939042a0dbce4c78d..2e6f5793d3747ea57447e966bf8e91c18e70644d 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -38,8 +38,8 @@
 
 #include "list.h"
 #include "udev.h"
-#include "udev_lib.h"
 #include "udev_version.h"
+#include "udev_utils.h"
 #include "udevd.h"
 #include "logging.h"
 
@@ -124,6 +124,7 @@ static void msg_queue_insert(struct hotplug_msg *msg)
 /* forks event and removes event from run queue when finished */
 static void udev_run(struct hotplug_msg *msg)
 {
+       char *const argv[] = { "udev", msg->subsystem, NULL };
        pid_t pid;
 
        pid = fork();
@@ -131,7 +132,8 @@ static void udev_run(struct hotplug_msg *msg)
        case 0:
                /* child */
                close(udevsendsock);
-               execle(udev_bin, "udev", msg->subsystem, NULL, msg->envp);
+               logging_close();
+               execve(udev_bin, argv, msg->envp);
                dbg("exec of child failed");
                _exit(1);
                break;
@@ -149,17 +151,40 @@ static void udev_run(struct hotplug_msg *msg)
        }
 }
 
-/* returns already running task with devpath */
+/* returns still running task for the same event sequence */
 static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg)
 {
        struct hotplug_msg *loop_msg;
-       list_for_each_entry(loop_msg, &running_list, list)
-               if (strncmp(loop_msg->devpath, msg->devpath, sizeof(loop_msg->devpath)) == 0)
-                       return loop_msg;
+       int i;
+
+       list_for_each_entry(loop_msg, &running_list, list) {
+               if (loop_msg->devpath == NULL || msg->devpath == NULL)
+                       continue;
+
+               /* is a parent or child device event still running */
+               for (i = 0; i < DEVPATH_SIZE; i++) {
+                       if (loop_msg->devpath[i] == '\0' || msg->devpath[i] == '\0')
+                               return loop_msg;
+
+                       if (loop_msg->devpath[i] != msg->devpath[i])
+                               break;
+               }
+
+               /* is the physical device event still running on an add sequence */
+               if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
+                       for (i = 0; i < DEVPATH_SIZE; i++) {
+                               if (loop_msg->devpath[i] == '\0' || msg->physdevpath[i] == '\0')
+                                       return loop_msg;
+
+                               if (loop_msg->devpath[i] != msg->physdevpath[i])
+                                       break;
+                       }
+       }
+
        return NULL;
 }
 
-/* exec queue management routine executes the events and delays events for the same devpath */
+/* exec queue management routine executes the events and serializes events in the same sequence */
 static void exec_queue_manager(void)
 {
        struct hotplug_msg *loop_msg;
@@ -174,8 +199,8 @@ static void exec_queue_manager(void)
                        udev_run(loop_msg);
                        dbg("moved seq %llu to running list", loop_msg->seqnum);
                } else {
-                       dbg("delay seq %llu, cause seq %llu already working on '%s'",
-                               loop_msg->seqnum, msg->seqnum, msg->devpath);
+                       dbg("delay seq %llu (%s), cause seq %llu (%s) is still running",
+                           loop_msg->seqnum, loop_msg->devpath, msg->seqnum, msg->devpath);
                }
        }
 }
@@ -285,7 +310,7 @@ static void handle_udevsend_msg(int sock)
        /* copy environment buffer and reconstruct envp */
        memcpy(msg->envbuf, usend_msg.envbuf, envbuf_size);
        bufpos = 0;
-       for (i = 0; (bufpos < envbuf_size) && (i < HOTPLUG_NUM_ENVP-1); i++) {
+       for (i = 0; (bufpos < envbuf_size) && (i < HOTPLUG_NUM_ENVP-2); i++) {
                int keylen;
                char *key;
 
@@ -307,7 +332,11 @@ static void handle_udevsend_msg(int sock)
 
                if (strncmp(key, "SEQNUM=", 7) == 0)
                        msg->seqnum = strtoull(&key[7], NULL, 10);
+
+               if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
+                       msg->physdevpath = &key[12];
        }
+       msg->envp[i++] = "MANAGED_EVENT=1";
        msg->envp[i] = NULL;
 
        /* if no seqnum is given, we move straight to exec queue */
@@ -414,7 +443,7 @@ int main(int argc, char *argv[], char *envp[])
 
        if (getuid() != 0) {
                dbg("need to be root, exit");
-               _exit(1);
+               goto exit;
        }
 
        /* make sure we don't lock any path */
@@ -425,7 +454,7 @@ int main(int argc, char *argv[], char *envp[])
        fd = open( "/dev/null", O_RDWR );
        if ( fd < 0 ) {
                dbg("error opening /dev/null %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
        dup2(fd, 0);
        dup2(fd, 1);
@@ -440,29 +469,29 @@ int main(int argc, char *argv[], char *envp[])
        retval = pipe(pipefds);
        if (retval < 0) {
                dbg("error getting pipes: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
 
        retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
        if (retval < 0) {
                dbg("error fcntl on read pipe: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
        retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
        if (retval < 0) {
                dbg("error fcntl on read pipe: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
 
        retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
        if (retval < 0) {
                dbg("error fcntl on write pipe: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
        retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
        if (retval < 0) {
                dbg("error fcntl on write pipe: %s", strerror(errno));
-               exit(1);
+               goto exit;
        }
 
        /* set signal handlers */
@@ -483,13 +512,14 @@ int main(int argc, char *argv[], char *envp[])
        udevsendsock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udevsendsock == -1) {
                dbg("error getting socket, exit");
-               exit(1);
+               goto exit;
        }
 
        /* the bind takes care of ensuring only one copy running */
        retval = bind(udevsendsock, (struct sockaddr *) &saddr, addrlen);
        if (retval < 0) {
                dbg("bind failed, exit");
+               close(udevsendsock);
                goto exit;
        }
 
@@ -544,8 +574,8 @@ int main(int argc, char *argv[], char *envp[])
                        exec_queue_manager();
                }
        }
+
 exit:
-       close(udevsendsock);
        logging_close();
        return 1;
 }