/*
* 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>
*
*
*/
#include <stddef.h>
-#include <sys/wait.h>
#include <signal.h>
#include <unistd.h>
#include <errno.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/stat.h>
#include "list.h"
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_version.h"
#include "udev_utils.h"
static void reap_sigchilds(void);
char *udev_bin;
-#ifdef LOG
+#ifdef USE_LOG
void log_message (int level, const char *format, ...)
{
va_list args;
#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)
{
- list_del(&msg->list);
+ list_del(&msg->node);
free(msg);
}
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 */
- 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;
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 */
{
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;
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 (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);
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);
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",
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);
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;
/* 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);