libudev: queue - always rebuild queue file when nothing is queued anymore

diff --git a/Makefile.am b/Makefile.am
index 651a15455c03b71fe8822298b173aea343814c17..0a340aa39180c795561d224ef0e3f9c8dedada63 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ dist_libexec_SCRIPTS =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=11
-LIBUDEV_REVISION=3
+LIBUDEV_REVISION=4
 LIBUDEV_AGE=11
 
 SUBDIRS += libudev/docs

diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index a799be062a961aa8829d97133456b5910dacc4ad..0dcf9b00204cb2c1877f0107edadff51a5c6e1ec 100644 (file)
--- a/libudev/libudev-queue-private.c
+++ b/libudev/libudev-queue-private.c
@@ -164,7 +164,7 @@ static struct queue_devpaths *build_index(struct udev_queue_export *udev_queue_e
        devpaths->devpaths_size = range + 1;
 
        /* read all records and populate the table */
-       while(1) {
+       for (;;) {
                if (udev_queue_read_seqnum(udev_queue_export->queue_file, &seqnum) < 0)
                        break;
                n = seqnum - udev_queue_export->seqnum_max;
@@ -303,8 +303,10 @@ static int write_queue_record(struct udev_queue_export *udev_queue_export,
        len = (devpath_len < USHRT_MAX) ? devpath_len : USHRT_MAX;
        if (fwrite(&len, sizeof(unsigned short), 1, udev_queue_export->queue_file) != 1)
                goto write_error;
-       if (fwrite(devpath, 1, len, udev_queue_export->queue_file) != len)
-               goto write_error;
+       if (len > 0) {
+               if (fwrite(devpath, 1, len, udev_queue_export->queue_file) != len)
+                       goto write_error;
+       }
 
        /* *must* flush output; caller may fork */
        if (fflush(udev_queue_export->queue_file) != 0)
@@ -342,6 +344,7 @@ static int update_queue(struct udev_queue_export *udev_queue_export,
        int bytes;
        int err;
 
+       /* FINISHED records have a zero length devpath */
        if (state == DEVICE_QUEUED) {
                devpath = udev_device_get_devpath(udev_device);
                devpath_len = strlen(devpath);
@@ -353,12 +356,9 @@ static int update_queue(struct udev_queue_export *udev_queue_export,
                        return -1;
        }
 
-       /* when the queue file grows too large, garbage-collect and rebuild it */
-       bytes = ftell(udev_queue_export->queue_file) + queue_record_size(devpath_len);
-
        /* if we're removing the last event from the queue, that's the best time to rebuild it */
-       if (state != DEVICE_QUEUED && udev_queue_export->queued_count == 1 && bytes > 2048) {
-               /* because we don't need to read the old queue file */
+       if (state != DEVICE_QUEUED && udev_queue_export->queued_count == 1) {
+               /* we don't need to read the old queue file */
                fclose(udev_queue_export->queue_file);
                udev_queue_export->queue_file = NULL;
                rebuild_queue_file(udev_queue_export);
@@ -366,6 +366,7 @@ static int update_queue(struct udev_queue_export *udev_queue_export,
        }
 
        /* try to rebuild the queue files before they grow larger than one page. */
+       bytes = ftell(udev_queue_export->queue_file) + queue_record_size(devpath_len);
        if ((udev_queue_export->waste_bytes > bytes / 2) && bytes > 4096)
                rebuild_queue_file(udev_queue_export);
 

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 9492abd401e0dbb8f9efd193ac383d045139ac29..b717ae60de1a663fe745dd84e229c8ac2f769c25 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -153,7 +153,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
        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) {
+               if (inotify_add_watch(pfd[0].fd, udev_get_run_path(udev), IN_MOVED_TO) < 0) {
                        err(udev, "watching '%s' failed\n", udev_get_run_path(udev));
                        close(pfd[0].fd);
                        pfd[0].fd = -1;