udevd: implement a more efficient queue file format

[elogind.git] / udev / udevadm-settle.c

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 3b26f10d5035f815148118e1db36d93637d49d34..f1052aa14896f11d698736c7b0fd2b2f06dce2bf 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -167,29 +167,22 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                        sigprocmask(SIG_BLOCK, &mask, &oldmask);
                        if (udev_ctrl_send_settle(uctrl) > 0)
                                sigsuspend(&oldmask);
+                       sigprocmask(SIG_SETMASK, &oldmask, NULL);
                        udev_ctrl_unref(uctrl);
                }
        }
 
        while (!is_timeout) {
-               /* exit if queue is empty */
-               if (udev_queue_get_queue_is_empty(udev_queue))
-                       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 (finished)
+                       /* if asked for, wait for a specific sequence of events */
+                       if (udev_queue_get_seqnum_sequence_is_finished(udev_queue, start, end) == 1)
+                               break;
+               } else {
+                       /* exit if queue is empty */
+                       if (udev_queue_get_queue_is_empty(udev_queue))
                                break;
                }
+
                usleep(1000 * 1000 / LOOP_PER_SECOND);
        }