X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=5bb3d22a4920f9f64343a64c6c821d9b17ae3f73;hp=c6093a4311d72f5f2692c0a380753cb08cd15f52;hb=18cff5c3b2e3591fa46107288ea2d7026a15ccf3;hpb=d59f11e1407ec6fa26e3a6f20b2d404af6978199 diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c index c6093a431..5bb3d22a4 100644 --- a/udev/udevadm-settle.c +++ b/udev/udevadm-settle.c @@ -1,19 +1,18 @@ /* - * Copyright (C) 2006 Kay Sievers + * Copyright (C) 2006-2008 Kay Sievers * - * 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 the - * Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * 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 + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #include @@ -34,139 +33,71 @@ #define DEFAULT_TIMEOUT 180 #define LOOP_PER_SECOND 20 -static void print_queue(struct udev *udev, const char *dir) -{ - LIST_HEAD(files); - struct name_entry *item; - - if (add_matching_files(udev, &files, dir, NULL) < 0) - return; - - printf("\n\nAfter the udevadm settle timeout, the events queue contains:\n\n"); - - list_for_each_entry(item, &files, node) { - char target[NAME_SIZE]; - size_t len; - const char *filename = strrchr(item->name, '/'); - - if (filename == NULL) - continue; - filename++; - if (*filename == '\0') - continue; - - len = readlink(item->name, target, sizeof(target)); - if (len < 0) - continue; - target[len] = '\0'; - - printf("%s: %s\n", filename, target); - } - - printf("\n\n"); -} - int udevadm_settle(struct udev *udev, int argc, char *argv[]) { - char queuename[PATH_SIZE]; - char filename[PATH_SIZE]; - unsigned long long seq_kernel; - unsigned long long seq_udev; - char seqnum[32]; - int fd; - ssize_t len; - int timeout = DEFAULT_TIMEOUT; - int loop; static const struct option options[] = { - { "timeout", 1, NULL, 't' }, - { "help", 0, NULL, 'h' }, + { "timeout", required_argument, NULL, 't' }, + { "quiet", no_argument, NULL, 'q' }, + { "help", no_argument, NULL, 'h' }, {} }; - int option; - int rc = 1; - int seconds; + int timeout = DEFAULT_TIMEOUT; + int quiet = 0; + struct udev_queue *udev_queue = NULL; + int loop; + int rc = 0; dbg(udev, "version %s\n", VERSION); while (1) { - option = getopt_long(argc, argv, "t:h", options, NULL); + int option; + int seconds; + + option = getopt_long(argc, argv, "t:qh", options, NULL); if (option == -1) break; switch (option) { case 't': seconds = atoi(optarg); - if (seconds > 0) + if (seconds >= 0) timeout = seconds; else fprintf(stderr, "invalid timeout value\n"); dbg(udev, "timeout=%i\n", timeout); break; + case 'q': + quiet = 1; + break; case 'h': - printf("Usage: udevadm settle [--help] [--timeout=]\n\n"); + printf("Usage: udevadm settle [--help] [--timeout=] [--quiet]\n\n"); goto exit; } } - strlcpy(queuename, udev_get_dev_path(udev), sizeof(queuename)); - strlcat(queuename, "/.udev/queue", sizeof(queuename)); - + udev_queue = udev_queue_new(udev); + if (udev_queue == NULL) + goto exit; loop = timeout * LOOP_PER_SECOND; while (loop--) { - /* wait for events in queue to finish */ - while (loop--) { - struct stat statbuf; - - if (stat(queuename, &statbuf) < 0) { - info(udev, "queue is empty\n"); - break; - } - usleep(1000 * 1000 / LOOP_PER_SECOND); - } - if (loop <= 0) { - info(udev, "timeout waiting for queue\n"); - print_queue(udev, queuename); - goto exit; - } - - /* read current udev seqnum */ - strlcpy(filename, udev_get_dev_path(udev), sizeof(filename)); - strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename)); - fd = open(filename, O_RDONLY); - if (fd < 0) - goto exit; - len = read(fd, seqnum, sizeof(seqnum)-1); - close(fd); - if (len <= 0) - goto exit; - seqnum[len] = '\0'; - seq_udev = strtoull(seqnum, NULL, 10); - info(udev, "udev seqnum = %llu\n", seq_udev); - - /* read current kernel seqnum */ - strlcpy(filename, udev_get_sys_path(udev), sizeof(filename)); - strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename)); - fd = open(filename, O_RDONLY); - if (fd < 0) - goto exit; - len = read(fd, seqnum, sizeof(seqnum)-1); - close(fd); - if (len <= 0) - goto exit; - seqnum[len] = '\0'; - seq_kernel = strtoull(seqnum, NULL, 10); - info(udev, "kernel seqnum = %llu\n", seq_kernel); - - /* make sure all kernel events have arrived in the queue */ - if (seq_udev >= seq_kernel) { - info(udev, "queue is empty and no pending events left\n"); - rc = 0; - goto exit; - } + if (udev_queue_get_queue_is_empty(udev_queue)) + break; usleep(1000 * 1000 / LOOP_PER_SECOND); - info(udev, "queue is empty, but events still pending\n"); } - + if (loop <= 0) { + struct udev_list_entry *list_entry; + + if (!quiet) { + info(udev, "timeout waiting for udev queue\n"); + printf("\ndevadm 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)); + } + rc = 1; + } exit: + udev_queue_unref(udev_queue); return rc; }