X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=1c3c28176b98fcea62f9e3a723ae9fb02f3e37e0;hb=3157c02d2bb2753b7d5bebd54dba7262bafcc88c;hp=8976c9a16bde9e69df1ced477c3b0c0b0bb0bdc7;hpb=98d3d51715de205b8231984b57ffbf01af0fb470;p=elogind.git

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 8976c9a16..1c3c28176 100644
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -1,5 +1,7 @@
 /*
  * Copyright (C) 2006-2008 Kay Sievers <kay@vrfy.org>
+ * Copyright (C) 2009 Canonical Ltd.
+ * Copyright (C) 2009 Scott James Remnant <scott@netsplit.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +27,7 @@
 #include <fcntl.h>
 #include <syslog.h>
 #include <getopt.h>
+#include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -33,6 +36,18 @@
 #define DEFAULT_TIMEOUT			180
 #define LOOP_PER_SECOND			20
 
+static int volatile is_timeout;
+
+static void asmlinkage sig_handler(int signum)
+{
+	switch (signum) {
+		case SIGALRM:
+			is_timeout = 1;
+		case SIGUSR1:
+			;
+	}
+}
+
 int udevadm_settle(struct udev *udev, int argc, char *argv[])
 {
 	static const struct option options[] = {
@@ -45,14 +60,22 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 	};
 	unsigned long long start = 0;
 	unsigned long long end = 0;
-	int timeout = DEFAULT_TIMEOUT;
 	int quiet = 0;
+	int timeout = 0;
+	struct sigaction act;
 	struct udev_queue *udev_queue = NULL;
-	int loop;
 	int rc = 0;
 
 	dbg(udev, "version %s\n", VERSION);
 
+	/* set signal handlers */
+	memset(&act, 0x00, sizeof(act));
+	act.sa_handler = (void (*)(int)) sig_handler;
+	sigemptyset (&act.sa_mask);
+	act.sa_flags = 0;
+	sigaction(SIGALRM, &act, NULL);
+	sigaction(SIGUSR1, &act, NULL);
+
 	while (1) {
 		int option;
 		int seconds;
@@ -80,15 +103,24 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 			quiet = 1;
 			break;
 		case 'h':
-			printf("Usage: udevadm settle [--help] [--timeout=<seconds>] [--quiet]\n\n");
+			printf("Usage: udevadm settle OPTIONS\n"
+			       "  --timeout=<seconds>   maximum time to wait for events\n"
+			       "  --seq-start=<seqnum>  first seqnum to wait for\n"
+			       "  --seq-end=<seqnum>    last seqnum to wait for\n"
+			       "  --quiet               do not print list after timeout\n"
+			       "  --help\n\n");
 			goto exit;
 		}
 	}
 
+	if (timeout > 0)
+		alarm(timeout);
+	else
+		alarm(DEFAULT_TIMEOUT);
+
 	udev_queue = udev_queue_new(udev);
 	if (udev_queue == NULL)
 		goto exit;
-	loop = timeout * LOOP_PER_SECOND;
 
 	if (start > 0) {
 		unsigned long long kernel_seq;
@@ -121,7 +153,25 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 		}
 	}
 
-	while (loop--) {
+	/* guarantee that the udev daemon isn't pre-processing */
+	if (getuid() == 0) {
+		struct udev_ctrl *uctrl;
+
+		uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
+		if (uctrl != NULL) {
+			sigset_t mask, oldmask;
+
+			sigemptyset(&mask);
+			sigaddset(&mask, SIGUSR1);
+			sigaddset(&mask, SIGALRM);
+			sigprocmask(SIG_BLOCK, &mask, &oldmask);
+			if (udev_ctrl_send_settle(uctrl) > 0)
+				sigsuspend(&oldmask);
+			udev_ctrl_unref(uctrl);
+		}
+	}
+
+	while (!is_timeout) {
 		/* exit if queue is empty */
 		if (udev_queue_get_queue_is_empty(udev_queue))
 			break;
@@ -144,7 +194,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 	}
 
 	/* if we reached the timeout, print the list of remaining events */
-	if (loop <= 0) {
+	if (is_timeout) {
 		struct udev_list_entry *list_entry;
 
 		if (!quiet) {