X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=9059adc341a59482834a681cb76e059b3e98209d;hp=8976c9a16bde9e69df1ced477c3b0c0b0bb0bdc7;hb=9f894a33913ab1bdefd269938e86a0ece8880926;hpb=98d3d51715de205b8231984b57ffbf01af0fb470

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 8976c9a16..9059adc34 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 volatile sig_atomic_t is_timeout;
+
+static void 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 = DEFAULT_TIMEOUT;
+	struct sigaction act;
 	struct udev_queue *udev_queue = NULL;
-	int loop;
-	int rc = 0;
+	int rc = 1;
 
 	dbg(udev, "version %s\n", VERSION);
 
+	/* set signal handlers */
+	memset(&act, 0x00, sizeof(act));
+	act.sa_handler = 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");
-			goto exit;
+			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");
+			exit(0);
 		}
 	}
 
+	if (timeout > 0)
+		alarm(timeout);
+	else
+		is_timeout = 1;
+
 	udev_queue = udev_queue_new(udev);
 	if (udev_queue == NULL)
-		goto exit;
-	loop = timeout * LOOP_PER_SECOND;
+		exit(2);
 
 	if (start > 0) {
 		unsigned long long kernel_seq;
@@ -121,33 +153,51 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 		}
 	}
 
-	while (loop--) {
-		/* exit if queue is empty */
-		if (udev_queue_get_queue_is_empty(udev_queue))
-			break;
+	/* 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);
+			sigprocmask(SIG_SETMASK, &oldmask, NULL);
+			udev_ctrl_unref(uctrl);
+		}
+	}
 
-		/* if asked for, wait for a specific sequence of events */
+	while (1) {
 		if (start > 0) {
-			unsigned long long seq;
-			int finished;
-
-			finished = 0;
-			for (seq = start; seq <= end; seq++) {
-				finished  = udev_queue_get_seqnum_is_finished(udev_queue, seq);
-				if (!finished)
-					break;
+			/* if asked for, wait for a specific sequence of events */
+			if (udev_queue_get_seqnum_sequence_is_finished(udev_queue, start, end) == 1) {
+				rc = 0;
+				break;
 			}
-			if (finished)
+		} else {
+			/* exit if queue is empty */
+			if (udev_queue_get_queue_is_empty(udev_queue)) {
+				rc = 0;
 				break;
+			}
 		}
+
+		if (is_timeout)
+			break;
+
 		usleep(1000 * 1000 / LOOP_PER_SECOND);
 	}
 
 	/* 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) {
+		if (!quiet && udev_queue_get_queued_list_entry(udev_queue) != NULL) {
 			info(udev, "timeout waiting for udev queue\n");
 			printf("\nudevadm settle - timeout of %i seconds reached, the event queue contains:\n", timeout);
 			udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
@@ -155,9 +205,8 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 				       udev_list_entry_get_name(list_entry),
 				       udev_list_entry_get_value(list_entry));
 		}
-		rc = 1;
 	}
-exit:
+
 	udev_queue_unref(udev_queue);
 	return rc;
 }