[PATCH] pass SEQNUM trough udevd

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 301625fd927a58e7868cf1da31551a3d993f7e4a..50720c2450ec6a2f87195971348f0e47bd783057 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -34,9 +34,7 @@
 #include <sys/un.h>
 #include <fcntl.h>
 #include "klibc_fixups.h"
-#ifndef __KLIBC__
 #include <sys/sysinfo.h>
-#endif
 
 #include "list.h"
 #include "udev.h"
@@ -46,7 +44,7 @@
 #include "logging.h"
 
 static int pipefds[2];
-static int expected_seqnum = 0;
+static long expected_seqnum = 0;
 volatile static int children_waiting;
 volatile static int run_msg_q;
 volatile static int sig_flag;
@@ -60,6 +58,7 @@ static void exec_queue_manager(void);
 static void msg_queue_manager(void);
 static void user_sighandler(void);
 static void reap_kids(void);
+char *udev_bin;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -73,22 +72,20 @@ void log_message (int level, const char *format, ...)
 }
 #endif
 
+#define msg_dump(msg) \
+       dbg("msg_dump: sequence %d, '%s', '%s', '%s'", \
+       msg->seqnum, msg->action, msg->devpath, msg->subsystem);
+
 static void msg_dump_queue(void)
 {
 #ifdef DEBUG
        struct hotplug_msg *msg;
 
        list_for_each_entry(msg, &msg_list, list)
-               dbg("sequence %d in queue", msg->seqnum);
+               dbg("sequence %li in queue", msg->seqnum);
 #endif
 }
 
-static void msg_dump(struct hotplug_msg *msg)
-{
-       dbg("sequence %d, '%s', '%s', '%s'",
-           msg->seqnum, msg->action, msg->devpath, msg->subsystem);
-}
-
 static struct hotplug_msg *msg_create(void)
 {
        struct hotplug_msg *new_msg;
@@ -123,7 +120,7 @@ static void msg_queue_insert(struct hotplug_msg *msg)
        msg->queue_time = info.uptime;
 
        list_add(&msg->list, &loop_msg->list);
-       dbg("queued message seq %d", msg->seqnum);
+       dbg("queued message seq %li", msg->seqnum);
 
        /* run msg queue manager */
        run_msg_q = 1;
@@ -137,16 +134,21 @@ static void udev_run(struct hotplug_msg *msg)
        pid_t pid;
        char action[ACTION_SIZE];
        char devpath[DEVPATH_SIZE];
-       char *env[] = { action, devpath, NULL };
+       char seqnum[SEQNUM_SIZE];
+       char *env[] = { action, devpath, seqnum, NULL };
 
-       snprintf(action, sizeof(action), "ACTION=%s", msg->action);
-       snprintf(devpath, sizeof(devpath), "DEVPATH=%s", msg->devpath);
+       strcpy(action, "ACTION=");
+       strfieldcat(action, msg->action);
+       strcpy(devpath, "DEVPATH=");
+       strfieldcat(devpath, msg->devpath);
+       strcpy(seqnum, "SEQNUM=");
+       strlongcat(seqnum, msg->seqnum);
 
        pid = fork();
        switch (pid) {
        case 0:
                /* child */
-               execle(UDEV_BIN, "udev", msg->subsystem, NULL, env);
+               execle(udev_bin, "udev", msg->subsystem, NULL, env);
                dbg("exec of child failed");
                exit(1);
                break;
@@ -159,7 +161,7 @@ static void udev_run(struct hotplug_msg *msg)
                break;
        default:
                /* get SIGCHLD in main loop */
-               dbg("==> exec seq %d [%d] working at '%s'", msg->seqnum, pid, msg->devpath);
+               dbg("==> exec seq %li [%d] working at '%s'", msg->seqnum, pid, msg->devpath);
                msg->pid = pid;
        }
 }
@@ -187,9 +189,9 @@ static void exec_queue_manager()
                        /* move event to run list */
                        list_move_tail(&loop_msg->list, &running_list);
                        udev_run(loop_msg);
-                       dbg("moved seq %d to running list", loop_msg->seqnum);
+                       dbg("moved seq %li to running list", loop_msg->seqnum);
                } else {
-                       dbg("delay seq %d, cause seq %d already working on '%s'",
+                       dbg("delay seq %li, cause seq %li already working on '%s'",
                                loop_msg->seqnum, msg->seqnum, msg->devpath);
                }
        }
@@ -200,7 +202,7 @@ static void msg_move_exec(struct hotplug_msg *msg)
        list_move_tail(&msg->list, &exec_list);
        run_exec_q = 1;
        expected_seqnum = msg->seqnum+1;
-       dbg("moved seq %d to exec, next expected is %d",
+       dbg("moved seq %li to exec, next expected is %li",
                msg->seqnum, expected_seqnum);
 }
 
@@ -212,7 +214,7 @@ static void msg_queue_manager()
        struct sysinfo info;
        long msg_age = 0;
 
-       dbg("msg queue manager, next expected is %d", expected_seqnum);
+       dbg("msg queue manager, next expected is %li", expected_seqnum);
 recheck:
        list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, list) {
                /* move event with expected sequence to the exec list */
@@ -224,7 +226,7 @@ recheck:
                /* move event with expired timeout to the exec list */
                sysinfo(&info);
                msg_age = info.uptime - loop_msg->queue_time;
-               dbg("seq %d is %li seconds old", loop_msg->seqnum, msg_age);
+               dbg("seq %li is %li seconds old", loop_msg->seqnum, msg_age);
                if (msg_age > EVENT_TIMEOUT_SEC-1) {
                        msg_move_exec(loop_msg);
                        goto recheck;
@@ -307,9 +309,10 @@ skip:
        return;
 }
 
-static void sig_handler(int signum)
+asmlinkage static void sig_handler(int signum)
 {
        int rc;
+
        switch (signum) {
                case SIGINT:
                case SIGTERM:
@@ -326,7 +329,7 @@ static void sig_handler(int signum)
                        goto do_write;
                        break;
                default:
-                       dbg("unhandled signal");
+                       dbg("unhandled signal %d", signum);
                        return;
        }
        
@@ -350,9 +353,9 @@ static void udev_done(int pid)
 
        list_for_each_entry(msg, &running_list, list) {
                if (msg->pid == pid) {
-                       dbg("<== exec seq %d came back", msg->seqnum);
+                       dbg("<== exec seq %li came back", msg->seqnum);
                        run_queue_delete(msg);
-                       
+
                        /* we want to run the exec queue manager since there may
                         * be events waiting with the devpath of the one that
                         * just finished
@@ -458,6 +461,13 @@ int main(int argc, char *argv[])
        /* enable receiving of the sender credentials */
        setsockopt(ssock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
 
+       /* possible override of udev binary, used for testing */
+       udev_bin = getenv("UDEV_BIN");
+       if (udev_bin != NULL)
+               dbg("udev binary is set to '%s'", udev_bin);
+       else
+               udev_bin = UDEV_BIN;
+
        FD_ZERO(&readfds);
        FD_SET(ssock, &readfds);
        FD_SET(pipefds[0], &readfds);