udevadm: settle - watch queue file

diff --git a/TODO b/TODO
index 65f7058ae5e187c3b843eaa8aa03b175a65b0f72..773fe7f3803c2eac4e9e78a2ed43871f128436c8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-  - use inotify() in settle
-
   - do not write age/configured in initramfs
 
   - remove deprecated trigger --type=failed logic

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index b7852ff60ad146b1cc2c4b1922ed78f5c447271c..38cb4f496845bf5fc9c18c7e97531cc53ee6d680 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -29,14 +29,13 @@
 #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>
 
 #include "udev.h"
 
-#define DEFAULT_TIMEOUT                        180
-#define LOOP_PER_SECOND                        20
-
 static volatile sig_atomic_t is_timeout;
 
 static void sig_handler(int signum)
@@ -62,7 +61,8 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
        unsigned long long end = 0;
        int quiet = 0;
        const char *exists = NULL;
-       int timeout = DEFAULT_TIMEOUT;
+       int timeout = 180;
+       struct pollfd pfd[1];
        struct sigaction act;
        sigset_t mask;
        struct udev_queue *udev_queue = NULL;
@@ -174,9 +174,21 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                }
        }
 
+       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 = { 0 , 1000 * 1000 * 1000 / LOOP_PER_SECOND };
+               const struct timespec duration = { 1 , 0 };
 
                if (exists != NULL && stat(exists, &statbuf) == 0) {
                        rc = 0;
@@ -200,7 +212,16 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                if (is_timeout)
                        break;
 
-               nanosleep(&duration, NULL);
+               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);
+               }
        }
 
        /* if we reached the timeout, print the list of remaining events */
@@ -217,6 +238,8 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                }
        }
 out:
+       if (pfd[0].fd >= 0)
+               close(pfd[0].fd);
        udev_queue_unref(udev_queue);
        return rc;
 }