[PATCH] limit the initial timeout of the udevd event handling

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index bd36d2c192d1e606a84b03e75c1689931cb8e7b4..c6642f4359b890d1cb63cdf75ddff4739df52fab 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"
 
@@ -47,6 +47,7 @@
 static int udevsendsock;
 
 static int pipefds[2];
+static long startup_time;
 static unsigned long long expected_seqnum = 0;
 static volatile int sigchilds_waiting;
 static volatile int run_msg_q;
@@ -64,7 +65,6 @@ static void reap_sigchilds(void);
 char *udev_bin;
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;
@@ -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();
@@ -132,7 +133,7 @@ static void udev_run(struct hotplug_msg *msg)
                /* child */
                close(udevsendsock);
                logging_close();
-               execle(udev_bin, "udev", msg->subsystem, NULL, msg->envp);
+               execve(udev_bin, argv, msg->envp);
                dbg("exec of child failed");
                _exit(1);
                break;
@@ -150,22 +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;
+       int i;
+
        list_for_each_entry(loop_msg, &running_list, list) {
                if (loop_msg->devpath == NULL || msg->devpath == NULL)
                        continue;
 
-               if (strcmp(loop_msg->devpath, msg->devpath) == 0)
-                       return loop_msg;
+               /* 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;
@@ -180,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);
                }
        }
 }
@@ -202,6 +221,8 @@ static void msg_queue_manager(void)
        struct hotplug_msg *tmp_msg;
        struct sysinfo info;
        long msg_age = 0;
+       static int timeout = EVENT_INIT_TIMEOUT_SEC;
+       static int init = 1;
 
        dbg("msg queue manager, next expected is %llu", expected_seqnum);
 recheck:
@@ -212,11 +233,18 @@ recheck:
                        continue;
                }
 
+               /* see if we are in the initialization phase and wait for the very first events */
+               if (init && (info.uptime - startup_time >= INIT_TIME_SEC)) {
+                       init = 0;
+                       timeout = EVENT_TIMEOUT_SEC;
+                       dbg("initialization phase passed, set timeout to %i seconds", EVENT_TIMEOUT_SEC);
+               }
+
                /* move event with expired timeout to the exec list */
                sysinfo(&info);
                msg_age = info.uptime - loop_msg->queue_time;
                dbg("seq %llu is %li seconds old", loop_msg->seqnum, msg_age);
-               if (msg_age > EVENT_TIMEOUT_SEC-1) {
+               if (msg_age >= timeout) {
                        msg_move_exec(loop_msg);
                        goto recheck;
                } else {
@@ -228,8 +256,8 @@ recheck:
 
        /* set timeout for remaining queued events */
        if (list_empty(&msg_list) == 0) {
-               struct itimerval itv = {{0, 0}, {EVENT_TIMEOUT_SEC - msg_age, 0}};
-               dbg("next event expires in %li seconds", EVENT_TIMEOUT_SEC - msg_age);
+               struct itimerval itv = {{0, 0}, {timeout - msg_age, 0}};
+               dbg("next event expires in %li seconds", timeout - msg_age);
                setitimer(ITIMER_REAL, &itv, NULL);
        }
 }
@@ -313,8 +341,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++] = "UDEVD_EVENT=1";
        msg->envp[i] = NULL;
 
        /* if no seqnum is given, we move straight to exec queue */
@@ -408,6 +439,7 @@ static void user_sighandler(void)
 
 int main(int argc, char *argv[], char *envp[])
 {
+       struct sysinfo info;
        int maxsockplus;
        struct sockaddr_un saddr;
        socklen_t addrlen;
@@ -511,6 +543,10 @@ int main(int argc, char *argv[], char *envp[])
        else
                udev_bin = UDEV_BIN;
 
+       /* handle special startup timeout*/
+       sysinfo(&info);
+       startup_time = info.uptime;
+
        FD_ZERO(&readfds);
        FD_SET(udevsendsock, &readfds);
        FD_SET(pipefds[0], &readfds);