Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:42.1:Staging:B
systemd
1042-libudev-queue-provide-file-descriptor-to-w...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch of Package systemd
Based on 14cb733684d3c3f50d088a3a370ddf8e8894dfa4 Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay@vrfy.org> Date: Fri, 27 Jun 2014 17:42:44 +0200 Subject: [PATCH] libudev: queue provide file descriptor to watch busy event queue --- docs/libudev/libudev-sections.txt | 2 ++ src/libudev/libudev-queue.c | 46 +++++++++++++++++++++++++++++++++++ src/libudev/libudev.h | 2 ++ src/libudev/libudev.sym | 2 ++ src/udev/udevadm-settle.c | 48 ++++++++++++++++--------------------- 5 files changed, 73 insertions(+), 27 deletions(-) diff --git docs/libudev/libudev-sections.txt docs/libudev/libudev-sections.txt index c154645..8a31ded 100644 --- docs/libudev/libudev-sections.txt +++ docs/libudev/libudev-sections.txt @@ -116,6 +116,8 @@ udev_queue_get_seqnum_sequence_is_finished udev_queue_get_queued_list_entry udev_queue_get_kernel_seqnum udev_queue_get_udev_seqnum +udev_queue_get_fd +udev_queue_flush </SECTION> <SECTION> diff --git src/libudev/libudev-queue.c src/libudev/libudev-queue.c index c32a7ef..d4334b4 100644 --- src/libudev/libudev-queue.c +++ src/libudev/libudev-queue.c @@ -26,6 +26,7 @@ #include <string.h> #include <limits.h> #include <sys/stat.h> +#include <sys/inotify.h> #include "libudev.h" #include "libudev-private.h" @@ -45,6 +46,7 @@ struct udev_queue { struct udev *udev; int refcount; + int fd; }; /** @@ -69,6 +71,7 @@ _public_ struct udev_queue *udev_queue_new(struct udev *udev) udev_queue->refcount = 1; udev_queue->udev = udev; + udev_queue->fd = -1; return udev_queue; } @@ -107,6 +110,9 @@ _public_ struct udev_queue *udev_queue_unref(struct udev_queue *udev_queue) if (udev_queue->refcount > 0) return NULL; + if (udev_queue->fd >= 0) + close_nointr_nofail(udev_queue->fd); + free(udev_queue); return NULL; } @@ -222,3 +228,44 @@ _public_ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_qu { return NULL; } + +/** + * udev_queue_get_fd: + * @udev_queue: udev queue context + * + * Returns: a file descriptor to watch for a queue to become empty. + */ +_public_ int udev_queue_get_fd(struct udev_queue *udev_queue) { + int fd; + int r; + + if (udev_queue->fd >= 0) + return udev_queue->fd; + + fd = inotify_init1(IN_CLOEXEC); + if (fd < 0) + return -errno; + + r = inotify_add_watch(fd, "/run/udev/queue" , IN_DELETE); + if (r < 0) { + r = -errno; + close(fd); + return r; + } + + udev_queue->fd = fd; + return fd; +} + +/** + * udev_queue_flush: + * @udev_queue: udev queue context + * + * Returns: the result of clearing the watch for queue changes. + */ +_public_ int udev_queue_flush(struct udev_queue *udev_queue) { + if (udev_queue->fd < 0) + return -EINVAL; + + return flush_fd(udev_queue->fd); +} diff --git src/libudev/libudev.h src/libudev/libudev.h index ceb89bd..4f2f115 100644 --- src/libudev/libudev.h +++ src/libudev/libudev.h @@ -177,6 +177,8 @@ int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue); int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned long long int seqnum) __attribute__ ((deprecated)); int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue, unsigned long long int start, unsigned long long int end) __attribute__ ((deprecated)); +int udev_queue_get_fd(struct udev_queue *udev_queue); +int udev_queue_flush(struct udev_queue *udev_queue); struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev_queue) __attribute__ ((deprecated)); /* diff --git src/libudev/libudev.sym src/libudev/libudev.sym index 1e6f885..95cd1c7 100644 --- src/libudev/libudev.sym +++ src/libudev/libudev.sym @@ -82,6 +82,8 @@ global: udev_queue_get_udev; udev_queue_get_udev_is_active; udev_queue_get_udev_seqnum; + udev_queue_get_fd; + udev_queue_flush; udev_queue_new; udev_queue_ref; udev_queue_unref; diff --git src/udev/udevadm-settle.c src/udev/udevadm-settle.c index 66fd843..79e8b59 100644 --- src/udev/udevadm-settle.c +++ src/udev/udevadm-settle.c @@ -29,7 +29,6 @@ #include <getopt.h> #include <signal.h> #include <time.h> -#include <sys/inotify.h> #include <sys/poll.h> #include <sys/stat.h> #include <sys/types.h> @@ -59,7 +58,9 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) const char *exists = NULL; unsigned int timeout = 120; struct pollfd pfd[1] = { {.fd = -1}, }; - int rc = EXIT_FAILURE, c; + int c; + struct udev_queue *queue; + int rc = EXIT_FAILURE; while ((c = getopt_long(argc, argv, "s:e:t:E:qh", options, NULL)) >= 0) { switch (c) { @@ -79,9 +80,9 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) break; case 'h': help(); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; case '?': - exit(EXIT_FAILURE); + return EXIT_FAILURE; default: assert_not_reached("Unknown argument"); } @@ -89,7 +90,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) if (optind < argc) { fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } /* guarantee that the udev daemon isn't pre-processing */ @@ -101,26 +102,23 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) if (udev_ctrl_send_ping(uctrl, timeout) < 0) { log_debug("no connection to daemon"); udev_ctrl_unref(uctrl); - rc = EXIT_SUCCESS; - goto out; + return EXIT_SUCCESS; } udev_ctrl_unref(uctrl); } } - pfd[0].events = POLLIN; - pfd[0].fd = inotify_init1(IN_CLOEXEC); - if (pfd[0].fd < 0) { - log_error("inotify_init failed: %m"); - goto out; + queue = udev_queue_new(udev); + if (!queue) { + log_error("unable to get udev queue"); + return EXIT_FAILURE; } - if (inotify_add_watch(pfd[0].fd, "/run/udev/queue" , IN_DELETE) < 0) { - /* If it does not exist, we don't have to wait */ - if (errno == ENOENT) - rc = EXIT_SUCCESS; - else - log_debug("watching /run/udev/queue failed"); + pfd[0].events = POLLIN; + pfd[0].fd = udev_queue_get_fd(queue); + if (pfd[0].fd < 0) { + log_debug("queue is empty, nothing to watch"); + rc = EXIT_SUCCESS; goto out; } @@ -131,22 +129,18 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) } /* exit if queue is empty */ - if (access("/run/udev/queue", F_OK) < 0) { + if (udev_queue_get_queue_is_empty(queue)) { rc = EXIT_SUCCESS; break; } - /* wake up when "queue" file is deleted */ - if (poll(pfd, 1, 100) > 0 && pfd[0].revents & POLLIN) { - char buf[sizeof(struct inotify_event) + PATH_MAX]; - - read(pfd[0].fd, buf, sizeof(buf)); - } + /* wake up when queue is empty */ + if (poll(pfd, 1, 100) > 0 && pfd[0].revents & POLLIN) + udev_queue_flush(queue); } out: - if (pfd[0].fd >= 0) - close(pfd[0].fd); + udev_queue_unref(queue); return rc; } -- 1.7.9.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
