#include <errno.h>
#include <dirent.h>
#include <fcntl.h>
-#include <syslog.h>
#include <getopt.h>
#include <signal.h>
#include <time.h>
-#include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "udev.h"
+#include "udev-util.h"
#include "util.h"
-static int adm_settle(struct udev *udev, int argc, char *argv[])
-{
+static void help(void) {
+ printf("%s settle OPTIONS\n\n"
+ "Wait for pending udev events.\n\n"
+ " -h --help Show this help\n"
+ " --version Show package version\n"
+ " -t --timeout=SECONDS Maximum time to wait for events\n"
+ " -E --exit-if-exists=FILE Stop waiting if file exists\n"
+ , program_invocation_short_name);
+}
+
+static int adm_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' },
+ { "timeout", required_argument, NULL, 't' },
{ "exit-if-exists", required_argument, NULL, 'E' },
- { "quiet", no_argument, NULL, 'q' },
- { "help", no_argument, NULL, 'h' },
+ { "help", no_argument, NULL, 'h' },
+ { "seq-start", required_argument, NULL, 's' }, /* removed */
+ { "seq-end", required_argument, NULL, 'e' }, /* removed */
+ { "quiet", no_argument, NULL, 'q' }, /* removed */
{}
};
- usec_t start_usec = now(CLOCK_MONOTONIC);
- usec_t start = 0;
- usec_t end = 0;
- int quiet = 0;
const char *exists = NULL;
unsigned int timeout = 120;
struct pollfd pfd[1] = { {.fd = -1}, };
- struct udev_queue *udev_queue = NULL;
+ int c;
+ struct udev_queue *queue;
int rc = EXIT_FAILURE;
- for (;;) {
- int option;
-
- option = getopt_long(argc, argv, "s:e:t:E:qh", options, NULL);
- if (option == -1) {
- if (optind < argc) {
- fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]);
- exit(EXIT_FAILURE);
- }
- break;
- }
+ while ((c = getopt_long(argc, argv, "t:E:hs:e:q", options, NULL)) >= 0) {
+ switch (c) {
- switch (option) {
- case 's':
- start = strtoull(optarg, NULL, 0);
- break;
- case 'e':
- end = strtoull(optarg, NULL, 0);
- break;
case 't': {
int r;
exit(EXIT_FAILURE);
};
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"
- " --exit-if-exists=<file> stop waiting if file exists\n"
- " --quiet do not print list after timeout\n"
- " --help\n\n");
- exit(EXIT_SUCCESS);
- default:
- exit(EXIT_FAILURE);
- }
- }
-
- udev_queue = udev_queue_new(udev);
- if (udev_queue == NULL)
- exit(2);
- if (start > 0) {
- unsigned long long kernel_seq;
+ case 'h':
+ help();
+ return EXIT_SUCCESS;
- kernel_seq = udev_queue_get_kernel_seqnum(udev_queue);
+ case 's':
+ case 'e':
+ case 'q':
+ log_info("Option -%c no longer supported.", c);
+ return EXIT_FAILURE;
- /* unless specified, the last event is the current kernel seqnum */
- if (end == 0)
- end = udev_queue_get_kernel_seqnum(udev_queue);
+ case '?':
+ return EXIT_FAILURE;
- if (start > end) {
- log_error("seq-start larger than seq-end, ignoring\n");
- start = 0;
- end = 0;
+ default:
+ assert_not_reached("Unknown argument");
}
+ }
- if (start > kernel_seq || end > kernel_seq) {
- log_error("seq-start or seq-end larger than current kernel value, ignoring\n");
- start = 0;
- end = 0;
- }
- log_debug("start=%llu end=%llu current=%llu\n", (unsigned long long)start, (unsigned long long)end, kernel_seq);
- } else {
- if (end > 0) {
- log_error("seq-end needs seq-start parameter, ignoring\n");
- end = 0;
- }
+ if (optind < argc) {
+ fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]);
+ return EXIT_FAILURE;
}
/* guarantee that the udev daemon isn't pre-processing */
uctrl = udev_ctrl_new(udev);
if (uctrl != NULL) {
if (udev_ctrl_send_ping(uctrl, timeout) < 0) {
- log_debug("no connection to daemon\n");
+ log_debug("no connection to daemon");
udev_ctrl_unref(uctrl);
- rc = EXIT_SUCCESS;
- goto out;
+ return EXIT_SUCCESS;
}
udev_ctrl_unref(uctrl);
}
}
+ queue = udev_queue_new(udev);
+ if (!queue) {
+ log_error("unable to get udev queue");
+ return EXIT_FAILURE;
+ }
+
pfd[0].events = POLLIN;
- pfd[0].fd = inotify_init1(IN_CLOEXEC);
+ pfd[0].fd = udev_queue_get_fd(queue);
if (pfd[0].fd < 0) {
- log_error("inotify_init failed: %m\n");
- } else {
- if (inotify_add_watch(pfd[0].fd, "/run/udev" , IN_MOVED_TO) < 0) {
- log_error("watching /run/udev failed\n");
- close(pfd[0].fd);
- pfd[0].fd = -1;
- }
+ log_debug("queue is empty, nothing to watch");
+ rc = EXIT_SUCCESS;
+ goto out;
}
for (;;) {
- struct stat statbuf;
-
- if (exists != NULL && stat(exists, &statbuf) == 0) {
+ if (exists && access(exists, F_OK) >= 0) {
rc = EXIT_SUCCESS;
break;
}
- if (start > 0) {
- /* if asked for, wait for a specific sequence of events */
- if (udev_queue_get_seqnum_sequence_is_finished(udev_queue, start, end) == 1) {
- rc = EXIT_SUCCESS;
- break;
- }
- } else {
- /* exit if queue is empty */
- if (udev_queue_get_queue_is_empty(udev_queue)) {
- rc = EXIT_SUCCESS;
- break;
- }
- }
-
- if (pfd[0].fd >= 0) {
- int delay;
-
- if (exists != NULL || start > 0)
- delay = 100;
- else
- delay = 1000;
- /* wake up after delay, or immediately after the queue is rebuilt */
- if (poll(pfd, 1, delay) > 0 && pfd[0].revents & POLLIN) {
- char buf[sizeof(struct inotify_event) + PATH_MAX];
-
- read(pfd[0].fd, buf, sizeof(buf));
- }
- } else {
- sleep(1);
+ /* exit if queue is empty */
+ if (udev_queue_get_queue_is_empty(queue)) {
+ rc = EXIT_SUCCESS;
+ break;
}
- if (timeout > 0) {
- usec_t age_usec;
-
- age_usec = now(CLOCK_MONOTONIC) - start_usec;
- if (age_usec / (1000 * 1000) >= timeout) {
- struct udev_list_entry *list_entry;
-
- if (!quiet && udev_queue_get_queued_list_entry(udev_queue) != NULL) {
- log_debug("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))
- printf(" %s (%s)\n",
- udev_list_entry_get_name(list_entry),
- udev_list_entry_get_value(list_entry));
- }
-
- break;
- }
- }
+ /* wake up when queue is empty */
+ if (poll(pfd, 1, MSEC_PER_SEC) > 0 && pfd[0].revents & POLLIN)
+ udev_queue_flush(queue);
}
+
out:
- if (pfd[0].fd >= 0)
- close(pfd[0].fd);
- udev_queue_unref(udev_queue);
+ udev_queue_unref(queue);
return rc;
}
const struct udevadm_cmd udevadm_settle = {
.name = "settle",
.cmd = adm_settle,
- .help = "wait for the event queue to finish",
+ .help = "Wait for pending udev events",
};