/*
- * Copyright (C) 2006-2008 Kay Sievers <kay@vrfy.org>
+ * Copyright (C) 2006-2009 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
#include <fcntl.h>
#include <syslog.h>
#include <getopt.h>
+#include <signal.h>
+#include <time.h>
#include <sys/stat.h>
#include <sys/types.h>
#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;
+ }
+}
+
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' },
+ { "exit-if-exists", required_argument, NULL, 'E' },
{ "quiet", no_argument, NULL, 'q' },
{ "help", no_argument, NULL, 'h' },
{}
};
unsigned long long start = 0;
unsigned long long end = 0;
- int timeout = DEFAULT_TIMEOUT;
int quiet = 0;
+ const char *exists = NULL;
+ int timeout = DEFAULT_TIMEOUT;
+ struct sigaction act;
+ sigset_t mask;
struct udev_queue *udev_queue = NULL;
- int loop;
- int rc = 0;
+ int rc = 1;
dbg(udev, "version %s\n", VERSION);
- while (1) {
+ /* 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);
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGALRM);
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
+
+ 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;
case 'q':
quiet = 1;
break;
+ case 'E':
+ exists = optarg;
+ break;
case 'h':
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"
+ " --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"
+ " --exit-if-exists=<file> 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
+ 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;
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;
}
} 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 (loop--) {
- /* 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);
+ }
+ }
+
+ for (;;) {
+ struct stat statbuf;
+ const struct timespec duration = { 0 , 1000 * 1000 * 1000 / LOOP_PER_SECOND };
+
+ 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;
+ }
}
- usleep(1000 * 1000 / LOOP_PER_SECOND);
+
+ if (is_timeout)
+ break;
+
+ nanosleep(&duration, NULL);
}
/* 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))
udev_list_entry_get_name(list_entry),
udev_list_entry_get_value(list_entry));
}
- rc = 1;
}
-exit:
+out:
udev_queue_unref(udev_queue);
return rc;
}
~ianmdlvl / elogind.git / blobdiff