X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=24cf9c9a7cf8c5a491c63483fff09f4a91455b70;hp=26e6b23486b23963fa34cfb09ed102520deded59;hb=872344c41094f636fd667b9e619f8f219d814605;hpb=a695feaeff0551745e1a397be2daa61b8cd0cc42

diff --git a/udevd.c b/udevd.c
index 26e6b2348..24cf9c9a7 100644
--- a/udevd.c
+++ b/udevd.c
@@ -1,9 +1,6 @@
 /*
- * udevd.c
+ * udevd.c - hotplug event serializer
  *
- * Userspace devfs
- *
- * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *
@@ -22,11 +19,10 @@
  *
  */
 
+#include <pthread.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include <sys/ipc.h>
 #include <sys/wait.h>
-#include <sys/msg.h>
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>
@@ -35,42 +31,34 @@
 #include <string.h>
 #include <time.h>
 #include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 #include "list.h"
 #include "udev.h"
+#include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"
 
-#define BUFFER_SIZE			1024
 
-static int expect_seqnum = 0;
-static int lock_file = -1;
-static char *lock_filename = ".udevd_lock";
+unsigned char logname[42];
+static pthread_mutex_t  msg_lock;
+static pthread_mutex_t  msg_active_lock;
+static pthread_cond_t msg_active;
+static pthread_mutex_t  exec_lock;
+static pthread_mutex_t  exec_active_lock;
+static pthread_cond_t exec_active;
+static pthread_mutex_t  running_lock;
+static pthread_attr_t thr_attr;
+static int expected_seqnum = 0;
 
 LIST_HEAD(msg_list);
+LIST_HEAD(exec_list);
+LIST_HEAD(running_list);
 
-static void sig_handler(int signum)
-{
-	dbg("caught signal %d", signum);
-	switch (signum) {
-	case SIGALRM:
-		dbg("event timeout reached");
-		break;
-	case SIGINT:
-	case SIGTERM:
-	case SIGKILL:
-		if (lock_file >= 0) {
-			close(lock_file);
-			unlink(lock_filename);
-		}
-		exit(20 + signum);
-		break;
-	default:
-		dbg("unhandled signal");
-	}
-}
 
-static void dump_queue(void)
+static void msg_dump_queue(void)
 {
 	struct hotplug_msg *msg;
 
@@ -78,18 +66,60 @@ static void dump_queue(void)
 		dbg("sequence %d in queue", msg->seqnum);
 }
 
-static void dump_msg(struct hotplug_msg *msg)
+static void msg_dump(struct hotplug_msg *msg)
 {
 	dbg("sequence %d, '%s', '%s', '%s'",
 	    msg->seqnum, msg->action, msg->devpath, msg->subsystem);
 }
 
-static int dispatch_msg(struct hotplug_msg *msg)
+static struct hotplug_msg *msg_create(void)
 {
-	pid_t pid;
+	struct hotplug_msg *new_msg;
+
+	new_msg = malloc(sizeof(struct hotplug_msg));
+	if (new_msg == NULL) {
+		dbg("error malloc");
+		return NULL;
+	}
+	return new_msg;
+}
+
+static void msg_delete(struct hotplug_msg *msg)
+{
+	if (msg != NULL)
+		free(msg);
+}
 
-	dump_msg(msg);
+/* orders the message in the queue by sequence number */
+static void msg_queue_insert(struct hotplug_msg *msg)
+{
+	struct hotplug_msg *loop_msg;
 
+	/* sort message by sequence number into list*/
+	list_for_each_entry(loop_msg, &msg_list, list)
+		if (loop_msg->seqnum > msg->seqnum)
+			break;
+	list_add_tail(&msg->list, &loop_msg->list);
+	dbg("queued message seq %d", msg->seqnum);
+
+	/* store timestamp of queuing */
+	msg->queue_time = time(NULL);
+
+	/* signal queue activity to manager */
+	pthread_mutex_lock(&msg_active_lock);
+	pthread_cond_signal(&msg_active);
+	pthread_mutex_unlock(&msg_active_lock);
+
+	return ;
+}
+
+/* forks event and removes event from run queue when finished */
+static void *run_threads(void * parm)
+{
+	pid_t pid;
+	struct hotplug_msg *msg;
+
+	msg = parm;
 	setenv("ACTION", msg->action, 1);
 	setenv("DEVPATH", msg->devpath, 1);
 
@@ -97,157 +127,224 @@ static int dispatch_msg(struct hotplug_msg *msg)
 	switch (pid) {
 	case 0:
 		/* child */
-		execl(UDEV_EXEC, "udev", msg->subsystem, NULL);
+		execl(UDEV_BIN, "udev", msg->subsystem, NULL);
 		dbg("exec of child failed");
 		exit(1);
 		break;
 	case -1:
 		dbg("fork of child failed");
-		return -1;
+		goto exit;
 	default:
+		/* wait for exit of child */
+		dbg("==> exec seq %d [%d] working at '%s'",
+		    msg->seqnum, pid, msg->devpath);
 		wait(NULL);
+		dbg("<== exec seq %d came back", msg->seqnum);
 	}
-	return 0;
+
+exit:
+	/* remove event from run list */
+	pthread_mutex_lock(&running_lock);
+	list_del_init(&msg->list);
+	pthread_mutex_unlock(&running_lock);
+
+	msg_delete(msg);
+
+	/* signal queue activity to exec manager */
+	pthread_mutex_lock(&exec_active_lock);
+	pthread_cond_signal(&exec_active);
+	pthread_mutex_unlock(&exec_active_lock);
+
+	pthread_exit(0);
 }
 
-static void set_timeout(int seconds)
+/* returns already running task with devpath */
+static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg)
 {
-	alarm(seconds);
-	dbg("set timeout in %d seconds", seconds);
+	struct hotplug_msg *loop_msg;
+	struct hotplug_msg *tmp_msg;
+
+	list_for_each_entry_safe(loop_msg, tmp_msg, &running_list, list)
+		if (strncmp(loop_msg->devpath, msg->devpath, sizeof(loop_msg->devpath)) == 0)
+			return loop_msg;
+	return NULL;
 }
 
-static void check_queue(void)
+/* queue management executes the events and delays events for the same devpath */
+static void *exec_queue_manager(void * parm)
 {
-	struct hotplug_msg *msg;
+	struct hotplug_msg *loop_msg;
 	struct hotplug_msg *tmp_msg;
-	time_t msg_age;
-
-recheck:
-	/* dispatch events until one is missing */
-	list_for_each_entry_safe(msg, tmp_msg, &msg_list, list) {
-		if (msg->seqnum != expect_seqnum)
-			break;
-		dispatch_msg(msg);
-		expect_seqnum++;
-		list_del_init(&msg->list);
-		free(msg);
-	}
+	struct hotplug_msg *msg;
+	pthread_t run_tid;
 
-	/* recalculate timeout */
-	if (list_empty(&msg_list) == 0) {
-		msg_age = time(NULL) - msg->queue_time;
-		if (msg_age > EVENT_TIMEOUT_SECONDS-1) {
-			info("event %d, age %li seconds, skip event %d-%d",
-			     msg->seqnum, msg_age, expect_seqnum, msg->seqnum-1);
-			expect_seqnum = msg->seqnum;
-			goto recheck;
+	while (1) {
+		pthread_mutex_lock(&exec_lock);
+		list_for_each_entry_safe(loop_msg, tmp_msg, &exec_list, list) {
+			msg = running_with_devpath(loop_msg);
+			if (msg == NULL) {
+				/* move event to run list */
+				pthread_mutex_lock(&running_lock);
+				list_move_tail(&loop_msg->list, &running_list);
+				pthread_mutex_unlock(&running_lock);
+
+				pthread_create(&run_tid, &thr_attr, run_threads, (void *) loop_msg);
+
+				dbg("moved seq %d to running list", loop_msg->seqnum);
+			} else {
+				dbg("delay seq %d, cause seq %d already working on '%s'",
+				    loop_msg->seqnum, msg->seqnum, msg->devpath);
+			}
 		}
-		set_timeout(EVENT_TIMEOUT_SECONDS - msg_age);
-		return;
+		pthread_mutex_unlock(&exec_lock);
+
+		/* wait for activation, new events or childs coming back */
+		pthread_mutex_lock(&exec_active_lock);
+		pthread_cond_wait(&exec_active, &exec_active_lock);
+		pthread_mutex_unlock(&exec_active_lock);
 	}
+}
 
-	/* queue is empty */
-	set_timeout(UDEVD_TIMEOUT_SECONDS);
+static void exec_queue_activate(void)
+{
+	pthread_mutex_lock(&exec_active_lock);
+	pthread_cond_signal(&exec_active);
+	pthread_mutex_unlock(&exec_active_lock);
 }
 
-static int queue_msg(struct hotplug_msg *msg)
+/* move message from incoming to exec queue */
+static void msg_move_exec(struct list_head *head)
 {
-	struct hotplug_msg *new_msg;
+	list_move_tail(head, &exec_list);
+	exec_queue_activate();
+}
+
+/* queue management thread handles the timeouts and dispatches the events */
+static void *msg_queue_manager(void * parm)
+{
+	struct hotplug_msg *loop_msg;
 	struct hotplug_msg *tmp_msg;
+	time_t msg_age = 0;
+	struct timespec tv;
 
-	new_msg = malloc(sizeof(*new_msg));
-	if (new_msg == NULL) {
-		dbg("error malloc");
-		return -ENOMEM;
-	}
-	memcpy(new_msg, msg, sizeof(*new_msg));
+	while (1) {
+		dbg("msg queue manager, next expected is %d", expected_seqnum);
+		pthread_mutex_lock(&msg_lock);
+		pthread_mutex_lock(&exec_lock);
+recheck:
+		list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, list) {
+			/* move event with expected sequence to the exec list */
+			if (loop_msg->seqnum == expected_seqnum) {
+				msg_move_exec(&loop_msg->list);
+				expected_seqnum++;
+				dbg("moved seq %d to exec, next expected is %d",
+				    loop_msg->seqnum, expected_seqnum);
+				continue;
+			}
 
-	/* store timestamp of queuing */
-	new_msg->queue_time = time(NULL);
+			/* move event with expired timeout to the exec list */
+			msg_age = time(NULL) - loop_msg->queue_time;
+			if (msg_age > EVENT_TIMEOUT_SEC-1) {
+				msg_move_exec(&loop_msg->list);
+				expected_seqnum = loop_msg->seqnum+1;
+				dbg("moved seq %d to exec, reset next expected to %d",
+				    loop_msg->seqnum, expected_seqnum);
+				goto recheck;
+			} else {
+				break;
+			}
+		}
 
-	/* sort message by sequence number into list*/
-	list_for_each_entry(tmp_msg, &msg_list, list)
-		if (tmp_msg->seqnum > new_msg->seqnum)
-			break;
-	list_add_tail(&new_msg->list, &tmp_msg->list);
+		msg_dump_queue();
+		pthread_mutex_unlock(&exec_lock);
+		pthread_mutex_unlock(&msg_lock);
 
-	return 0;
+		/* wait until queue gets active or next message timeout expires */
+		pthread_mutex_lock(&msg_active_lock);
+
+		if (list_empty(&msg_list) == 0) {
+			tv.tv_sec = time(NULL) + EVENT_TIMEOUT_SEC - msg_age;
+			tv.tv_nsec = 0;
+			dbg("next event expires in %li seconds",
+			    EVENT_TIMEOUT_SEC - msg_age);
+			pthread_cond_timedwait(&msg_active, &msg_active_lock, &tv);
+		} else {
+			pthread_cond_wait(&msg_active, &msg_active_lock);
+		}
+		pthread_mutex_unlock(&msg_active_lock);
+	}
 }
 
-static void work(void)
+/* every connect creates a thread which gets the msg, queues it and exits */
+static void *client_threads(void * parm)
 {
+	int sock;
 	struct hotplug_msg *msg;
-	int msgid;
-	key_t key;
-	char buf[BUFFER_SIZE];
-	int ret;
-
-	key = ftok(UDEVD_EXEC, IPC_KEY_ID);
-	msg = (struct hotplug_msg *) buf;
-	msgid = msgget(key, IPC_CREAT);
-	if (msgid == -1) {
-		dbg("open message queue error");
-		exit(1);
+	int retval;
+
+	sock = (int) parm;
+
+	msg = msg_create();
+	if (msg == NULL) {
+		dbg("unable to store message");
+		goto exit;
 	}
-	while (1) {
-		ret = msgrcv(msgid, (struct msgbuf *) buf, BUFFER_SIZE-4, HOTPLUGMSGTYPE, 0);
-		if (ret != -1) {
-			/* init the expected sequence with value from first call */
-			if (expect_seqnum == 0) {
-				expect_seqnum = msg->seqnum;
-				dbg("init next expected sequence number to %d", expect_seqnum);
-			}
-			dbg("current sequence %d, expected sequence %d", msg->seqnum, expect_seqnum);
-			if (msg->seqnum == expect_seqnum) {
-				/* execute expected event */
-				dispatch_msg(msg);
-				expect_seqnum++;
-				check_queue();
-				dump_queue();
-				continue;
-			}
-			if (msg->seqnum > expect_seqnum) {
-				/* something missing, queue event*/
-				queue_msg(msg);
-				check_queue();
-				dump_queue();
-				continue;
-			}
-			dbg("too late for event with sequence %d, even skipped ", msg->seqnum);
-		} else {
-			if (errno == EINTR) {
-				/* timeout */
-				if (list_empty(&msg_list)) {
-					info("we have nothing to do, so daemon exits...");
-					if (lock_file >= 0) {
-						close(lock_file);
-						unlink(lock_filename);
-					}
-					exit(0);
-				}
-				check_queue();
-				dump_queue();
-				continue;
-			}
-			dbg("ipc message receive error '%s'", strerror(errno));
-		}
+
+	retval = recv(sock, msg, sizeof(struct hotplug_msg), 0);
+	if (retval <  0) {
+		dbg("unable to receive message");
+		goto exit;
+	}
+
+	if (strncmp(msg->magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
+		dbg("message magic '%s' doesn't match, ignore it", msg->magic);
+		msg_delete(msg);
+		goto exit;
+	}
+
+	/* if no seqnum is given, we move straight to exec queue */
+	if (msg->seqnum == 0) {
+		pthread_mutex_lock(&exec_lock);
+		list_add(&msg->list, &exec_list);
+		exec_queue_activate();
+		pthread_mutex_unlock(&exec_lock);
+	} else {
+		pthread_mutex_lock(&msg_lock);
+		msg_queue_insert(msg);
+		pthread_mutex_unlock(&msg_lock);
 	}
+
+exit:
+	close(sock);
+	pthread_exit(0);
 }
 
-static int one_and_only(void)
+static void sig_handler(int signum)
 {
-	char string[100];
+	switch (signum) {
+		case SIGINT:
+		case SIGTERM:
+			unlink(UDEVD_LOCK);
+			exit(20 + signum);
+			break;
+		default:
+			dbg("unhandled signal");
+	}
+}
 
-	lock_file = open(lock_filename, O_RDWR | O_CREAT, 0x640);
+static int one_and_only(void)
+{
+	char string[50];
+	int lock_file;
 
-	/* see if we can open */
+	lock_file = open(UDEVD_LOCK, O_RDWR | O_CREAT, 0x640);
 	if (lock_file < 0)
 		return -1;
-	
+
 	/* see if we can lock */
 	if (lockf(lock_file, F_TLOCK, 0) < 0) {
+		dbg("file is already locked, exit");
 		close(lock_file);
-		unlink(lock_filename);
 		return -1;
 	}
 
@@ -259,19 +356,74 @@ static int one_and_only(void)
 
 int main(int argc, char *argv[])
 {
+	int ssock;
+	int csock;
+	struct sockaddr_un saddr;
+	struct sockaddr_un caddr;
+	socklen_t clen;
+	pthread_t cli_tid;
+	pthread_t mgr_msg_tid;
+	pthread_t mgr_exec_tid;
+	int retval;
+
+	init_logging("udevd");
+
 	/* only let one version of the daemon run at any one time */
 	if (one_and_only() != 0)
 		exit(0);
 
-	/* set up signal handler */
 	signal(SIGINT, sig_handler);
 	signal(SIGTERM, sig_handler);
-	signal(SIGKILL, sig_handler);
-	signal(SIGALRM, sig_handler);
 
-	/* we exit if we have nothing to do, next event will start us again */
-	set_timeout(UDEVD_TIMEOUT_SECONDS);
+	memset(&saddr, 0x00, sizeof(saddr));
+	saddr.sun_family = AF_LOCAL;
+	/* use abstract namespace for socket path */
+	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
+
+	ssock = socket(AF_LOCAL, SOCK_STREAM, 0);
+	if (ssock == -1) {
+		dbg("error getting socket");
+		exit(1);
+	}
+
+	retval = bind(ssock, &saddr, sizeof(saddr));
+	if (retval < 0) {
+		dbg("bind failed\n");
+		goto exit;
+	}
+
+	retval = listen(ssock, SOMAXCONN);
+	if (retval < 0) {
+		dbg("listen failed\n");
+		goto exit;
+	}
+
+	pthread_mutex_init(&msg_lock, NULL);
+	pthread_mutex_init(&msg_active_lock, NULL);
+	pthread_mutex_init(&exec_lock, NULL);
+	pthread_mutex_init(&exec_active_lock, NULL);
+	pthread_mutex_init(&running_lock, NULL);
+
+	/* set default attributes for created threads */
+	pthread_attr_init(&thr_attr);
+	pthread_attr_setdetachstate(&thr_attr, PTHREAD_CREATE_DETACHED);
+	pthread_attr_setstacksize(&thr_attr, 16 * 1024);
+
+	/* init queue management */
+	pthread_create(&mgr_msg_tid, &thr_attr, msg_queue_manager, NULL);
+	pthread_create(&mgr_exec_tid, &thr_attr, exec_queue_manager, NULL);
 
-	work();
-	exit(0);
+	clen = sizeof(caddr);
+	/* main loop */
+	while (1) {
+		csock = accept(ssock, &caddr, &clen);
+		if (csock < 0) {
+			dbg("client accept failed\n");
+			continue;
+		}
+		pthread_create(&cli_tid, &thr_attr, client_threads, (void *) csock);
+	}
+exit:
+	close(ssock);
+	exit(1);
 }