[PATCH] udevd: don't delay events with TIMEOUT in the environment

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 7d7fd63332baf664b9ba111e3553115aeca993fc..6e27c8a0d141779edfe2f8e3420c0d4b927a1bdf 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -1,7 +1,7 @@
 /*
  * udevd.c - hotplug event serializer
  *
 /*
  * udevd.c - hotplug event serializer
  *

- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>

  * Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
  *
  *
  * Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
  *
  *


@@ -21,7 +21,6 @@
  */
 
 #include <stddef.h>
  */
 
 #include <stddef.h>

-#include <sys/wait.h>

 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>


@@ -31,6 +30,8 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <fcntl.h>

+#include <sys/select.h>
+#include <sys/wait.h>

 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>


@@ -39,6 +40,7 @@
 #include <sys/stat.h>
 
 #include "list.h"
 #include <sys/stat.h>
 
 #include "list.h"

+#include "udev_libc_wrapper.h"

 #include "udev.h"
 #include "udev_version.h"
 #include "udev_utils.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_utils.h"


@@ -67,7 +69,7 @@ static void user_sighandler(void);
 static void reap_sigchilds(void);
 char *udev_bin;
 
 static void reap_sigchilds(void);
 char *udev_bin;
 

-#ifdef LOG
+#ifdef USE_LOG

 void log_message (int level, const char *format, ...)
 {
        va_list args;
 void log_message (int level, const char *format, ...)
 {
        va_list args;


@@ -87,14 +89,14 @@ static void msg_dump_queue(void)
 #ifdef DEBUG
        struct hotplug_msg *msg;
 
 #ifdef DEBUG
        struct hotplug_msg *msg;
 

-       list_for_each_entry(msg, &msg_list, list)
+       list_for_each_entry(msg, &msg_list, node)

                dbg("sequence %llu in queue", msg->seqnum);
 #endif
 }
 
 static void run_queue_delete(struct hotplug_msg *msg)
 {
                dbg("sequence %llu in queue", msg->seqnum);
 #endif
 }
 
 static void run_queue_delete(struct hotplug_msg *msg)
 {

-       list_del(&msg->list);
+       list_del(&msg->node);

        free(msg);
 }
 
        free(msg);
 }
 


@@ -106,13 +108,21 @@ static void msg_queue_insert(struct hotplug_msg *msg)
 
        if (msg->seqnum == 0) {
                dbg("no SEQNUM, move straight to the exec queue");
 
        if (msg->seqnum == 0) {
                dbg("no SEQNUM, move straight to the exec queue");

-               list_add(&msg->list, &exec_list);
+               list_add(&msg->node, &exec_list);
+               run_exec_q = 1;
+               return;
+       }
+
+       /* don't delay messages with timeout set */
+       if (msg->timeout) {
+               dbg("move seq %llu with timeout %u to exec queue", msg->seqnum, msg->timeout);
+               list_add(&msg->node, &exec_list);

                run_exec_q = 1;
                return;
        }
 
        /* sort message by sequence number into list */
                run_exec_q = 1;
                return;
        }
 
        /* sort message by sequence number into list */

-       list_for_each_entry_reverse(loop_msg, &msg_list, list) {
+       list_for_each_entry_reverse(loop_msg, &msg_list, node) {

                if (loop_msg->seqnum < msg->seqnum)
                        break;
 
                if (loop_msg->seqnum < msg->seqnum)
                        break;
 


@@ -126,7 +136,7 @@ static void msg_queue_insert(struct hotplug_msg *msg)
        sysinfo(&info);
        msg->queue_time = info.uptime;
 
        sysinfo(&info);
        msg->queue_time = info.uptime;
 

-       list_add(&msg->list, &loop_msg->list);
+       list_add(&msg->node, &loop_msg->node);

        dbg("queued message seq %llu", msg->seqnum);
 
        /* run msg queue manager */
        dbg("queued message seq %llu", msg->seqnum);
 
        /* run msg queue manager */


@@ -262,7 +272,7 @@ static int compare_devpath(const char *running, const char *waiting)
 {
        int i;
 
 {
        int i;
 

-       for (i = 0; i < DEVPATH_SIZE; i++) {
+       for (i = 0; i < PATH_SIZE; i++) {

                /* identical device event found */
                if (running[i] == '\0' && waiting[i] == '\0')
                        return 1;
                /* identical device event found */
                if (running[i] == '\0' && waiting[i] == '\0')
                        return 1;


@@ -291,7 +301,11 @@ static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg)
        if (msg->devpath == NULL)
                return NULL;
 
        if (msg->devpath == NULL)
                return NULL;
 

-       list_for_each_entry(loop_msg, &running_list, list) {
+       /* skip any events with a timeout set */
+       if (msg->timeout)
+               return NULL;
+
+       list_for_each_entry(loop_msg, &running_list, node) {

                if (loop_msg->devpath == NULL)
                        continue;
 
                if (loop_msg->devpath == NULL)
                        continue;
 


@@ -321,7 +335,7 @@ static void exec_queue_manager(void)
        if (running < 0)
                running = THROTTLE_MAX_RUNNING_CHILDS;
 
        if (running < 0)
                running = THROTTLE_MAX_RUNNING_CHILDS;
 

-       list_for_each_entry_safe(loop_msg, tmp_msg, &exec_list, list) {
+       list_for_each_entry_safe(loop_msg, tmp_msg, &exec_list, node) {

                /* check running processes in our session and possibly throttle */
                if (running >= THROTTLE_MAX_RUNNING_CHILDS) {
                        running = running_processes_in_session(sid, THROTTLE_MAX_RUNNING_CHILDS+10);
                /* check running processes in our session and possibly throttle */
                if (running >= THROTTLE_MAX_RUNNING_CHILDS) {
                        running = running_processes_in_session(sid, THROTTLE_MAX_RUNNING_CHILDS+10);


@@ -335,7 +349,7 @@ static void exec_queue_manager(void)
                msg = running_with_devpath(loop_msg);
                if (!msg) {
                        /* move event to run list */
                msg = running_with_devpath(loop_msg);
                if (!msg) {
                        /* move event to run list */

-                       list_move_tail(&loop_msg->list, &running_list);
+                       list_move_tail(&loop_msg->node, &running_list);

                        udev_run(loop_msg);
                        running++;
                        dbg("moved seq %llu to running list", loop_msg->seqnum);
                        udev_run(loop_msg);
                        running++;
                        dbg("moved seq %llu to running list", loop_msg->seqnum);


@@ -348,7 +362,7 @@ static void exec_queue_manager(void)
 
 static void msg_move_exec(struct hotplug_msg *msg)
 {
 
 static void msg_move_exec(struct hotplug_msg *msg)
 {

-       list_move_tail(&msg->list, &exec_list);
+       list_move_tail(&msg->node, &exec_list);

        run_exec_q = 1;
        expected_seqnum = msg->seqnum+1;
        dbg("moved seq %llu to exec, next expected is %llu",
        run_exec_q = 1;
        expected_seqnum = msg->seqnum+1;
        dbg("moved seq %llu to exec, next expected is %llu",


@@ -367,7 +381,7 @@ static void msg_queue_manager(void)
 
        dbg("msg queue manager, next expected is %llu", expected_seqnum);
 recheck:
 
        dbg("msg queue manager, next expected is %llu", expected_seqnum);
 recheck:

-       list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, list) {
+       list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, node) {

                /* move event with expected sequence to the exec list */
                if (loop_msg->seqnum == expected_seqnum) {
                        msg_move_exec(loop_msg);
                /* move event with expected sequence to the exec list */
                if (loop_msg->seqnum == expected_seqnum) {
                        msg_move_exec(loop_msg);


@@ -488,6 +502,9 @@ static struct hotplug_msg *get_udevsend_msg(void)
 
                if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
                        msg->physdevpath = &key[12];
 
                if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
                        msg->physdevpath = &key[12];

+
+               if (strncmp(key, "TIMEOUT=", 8) == 0)
+                       msg->timeout = strtoull(&key[8], NULL, 10);

        }
        msg->envp[i++] = "UDEVD_EVENT=1";
        msg->envp[i] = NULL;
        }
        msg->envp[i++] = "UDEVD_EVENT=1";
        msg->envp[i] = NULL;


@@ -532,7 +549,7 @@ static void udev_done(int pid)
        /* find msg associated with pid and delete it */
        struct hotplug_msg *msg;
 
        /* find msg associated with pid and delete it */
        struct hotplug_msg *msg;
 

-       list_for_each_entry(msg, &running_list, list) {
+       list_for_each_entry(msg, &running_list, node) {

                if (msg->pid == pid) {
                        dbg("<== exec seq %llu came back", msg->seqnum);
                        run_queue_delete(msg);
                if (msg->pid == pid) {
                        dbg("<== exec seq %llu came back", msg->seqnum);
                        run_queue_delete(msg);