X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=38cb4f496845bf5fc9c18c7e97531cc53ee6d680;hp=54f905bf6ff1c2165b4421c5a87f7e4631aec0e4;hb=02bf3e13e00157c23f77a89a35cb3e51543d336e;hpb=c2c24d4d3c8f83c5f4507bb13ba6c989f9d6ea45 diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c index 54f905bf6..38cb4f496 100644 --- a/udev/udevadm-settle.c +++ b/udev/udevadm-settle.c @@ -1,5 +1,7 @@ /* - * Copyright (C) 2006-2008 Kay Sievers + * Copyright (C) 2006-2009 Kay Sievers + * Copyright (C) 2009 Canonical Ltd. + * Copyright (C) 2009 Scott James Remnant * * 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 @@ -26,17 +28,17 @@ #include #include #include +#include +#include +#include #include #include #include "udev.h" -#define DEFAULT_TIMEOUT 180 -#define LOOP_PER_SECOND 20 +static volatile sig_atomic_t is_timeout; -static int volatile is_timeout; - -static void asmlinkage sig_handler(int signum) +static void sig_handler(int signum) { switch (signum) { case SIGALRM: @@ -50,6 +52,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[]) { "seq-start", required_argument, NULL, 's' }, { "seq-end", required_argument, NULL, 'e' }, { "timeout", required_argument, NULL, 't' }, + { "exit-if-exists", required_argument, NULL, 'E' }, { "quiet", no_argument, NULL, 'q' }, { "help", no_argument, NULL, 'h' }, {} @@ -57,25 +60,31 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[]) unsigned long long start = 0; unsigned long long end = 0; int quiet = 0; - int timeout = 0; + const char *exists = NULL; + int timeout = 180; + struct pollfd pfd[1]; struct sigaction act; + sigset_t mask; struct udev_queue *udev_queue = NULL; - int rc = 0; + int rc = 1; dbg(udev, "version %s\n", VERSION); /* set signal handlers */ memset(&act, 0x00, sizeof(act)); - act.sa_handler = (void (*)(int)) sig_handler; + act.sa_handler = sig_handler; sigemptyset (&act.sa_mask); act.sa_flags = 0; sigaction(SIGALRM, &act, NULL); + sigemptyset(&mask); + sigaddset(&mask, SIGALRM); + sigprocmask(SIG_UNBLOCK, &mask, NULL); - while (1) { + for (;;) { int option; int seconds; - option = getopt_long(argc, argv, "s:e:t:qh", options, NULL); + option = getopt_long(argc, argv, "s:e:t:E:qh", options, NULL); if (option == -1) break; @@ -97,25 +106,29 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[]) case 'q': quiet = 1; break; + case 'E': + exists = optarg; + break; case 'h': printf("Usage: udevadm settle OPTIONS\n" - " --timeout= maximum time to wait for events\n" - " --seq-start= first seqnum to wait for\n" - " --seq-end= last seqnum to wait for\n" - " --quiet do not print list after timeout\n" + " --timeout= maximum time to wait for events\n" + " --seq-start= first seqnum to wait for\n" + " --seq-end= last seqnum to wait for\n" + " --exit-if-exists= stop waiting if file exists\n" + " --quiet do not print list after timeout\n" " --help\n\n"); - goto exit; + exit(0); } } if (timeout > 0) alarm(timeout); else - alarm(DEFAULT_TIMEOUT); + is_timeout = 1; udev_queue = udev_queue_new(udev); if (udev_queue == NULL) - goto exit; + exit(2); if (start > 0) { unsigned long long kernel_seq; @@ -128,14 +141,12 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[]) 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; } @@ -143,38 +154,81 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[]) } 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; } } - while (!is_timeout) { - /* exit if queue is empty */ - if (udev_queue_get_queue_is_empty(udev_queue)) + /* 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) { + if (udev_ctrl_send_ping(uctrl, timeout) < 0) { + info(udev, "no connection to daemon\n"); + udev_ctrl_unref(uctrl); + rc = 0; + goto out; + } + udev_ctrl_unref(uctrl); + } + } + + pfd[0].events = POLLIN; + pfd[0].fd = inotify_init1(IN_CLOEXEC); + if (pfd[0].fd < 0) { + err(udev, "inotify_init failed: %m\n"); + } else { + if (inotify_add_watch(pfd[0].fd, udev_get_run_path(udev), IN_CLOSE_WRITE) < 0) { + err(udev, "watching '%s' failed\n", udev_get_run_path(udev)); + close(pfd[0].fd); + pfd[0].fd = -1; + } + } + + for (;;) { + struct stat statbuf; + const struct timespec duration = { 1 , 0 }; + + if (exists != NULL && stat(exists, &statbuf) == 0) { + rc = 0; 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 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; + + if (pfd[0].fd >= 0) { + /* wake up once every second, or whenever the queue file gets gets closed */ + if (poll(pfd, 1, 1000) > 0 && pfd[0].revents & POLLIN) { + char buf[sizeof(struct inotify_event) + PATH_MAX]; + + read(pfd[0].fd, buf, sizeof(buf)); + } + } else { + nanosleep(&duration, NULL); } - usleep(1000 * 1000 / LOOP_PER_SECOND); } /* if we reached the timeout, print the list of remaining events */ 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)) @@ -182,9 +236,10 @@ 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: +out: + if (pfd[0].fd >= 0) + close(pfd[0].fd); udev_queue_unref(udev_queue); return rc; }