chiark / gitweb /
vol_id: fix language in manpage
[elogind.git] / udev / udevadm-settle.c
index 867bbed137c21ce4cdb3d9d83565e407f5d807f4..1c3c28176b98fcea62f9e3a723ae9fb02f3e37e0 100644 (file)
@@ -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>
 
 #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[] = {
+               { "seq-start", required_argument, NULL, 's' },
+               { "seq-end", required_argument, NULL, 'e' },
                { "timeout", required_argument, NULL, 't' },
                { "quiet", no_argument, NULL, 'q' },
                { "help", no_argument, NULL, 'h' },
                {}
        };
-       int timeout = DEFAULT_TIMEOUT;
+       unsigned long long start = 0;
+       unsigned long long end = 0;
        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;
 
-               option = getopt_long(argc, argv, "t:qh", options, NULL);
+               option = getopt_long(argc, argv, "s:e:t:qh", options, NULL);
                if (option == -1)
                        break;
 
                switch (option) {
+               case 's':
+                       start = strtoull(optarg, NULL, 0);
+                       break;
+               case 'e':
+                       end = strtoull(optarg, NULL, 0);
+                       break;
                case 't':
                        seconds = atoi(optarg);
                        if (seconds >= 0)
@@ -70,23 +103,98 @@ 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;
-       while (loop--) {
+
+       if (start > 0) {
+               unsigned long long kernel_seq;
+
+               kernel_seq = udev_queue_get_kernel_seqnum(udev_queue);
+
+               /* unless specified, the last event is the current kernel seqnum */
+               if (end == 0)
+                       end = udev_queue_get_kernel_seqnum(udev_queue);
+
+               if (start > end) {
+                       err(udev, "seq-start larger than seq-end, ignoring\n");
+                       fprintf(stderr, "seq-start larger than seq-end, ignoring\n");
+                       start = 0;
+                       end = 0;
+               }
+
+               if (start > kernel_seq || end > kernel_seq) {
+                       err(udev, "seq-start or seq-end larger than current kernel value, ignoring\n");
+                       fprintf(stderr, "seq-start or seq-end larger than current kernel value, ignoring\n");
+                       start = 0;
+                       end = 0;
+               }
+               info(udev, "start=%llu end=%llu current=%llu\n", start, end, kernel_seq);
+       } else {
+               if (end > 0) {
+                       err(udev, "seq-end needs seq-start parameter, ignoring\n");
+                       fprintf(stderr, "seq-end needs seq-start parameter, ignoring\n");
+                       end = 0;
+               }
+       }
+
+       /* 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;
+
+               /* if asked for, wait for a specific sequence of events */
+               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 (finished)
+                               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) {