libudev: queue - _unref() should return the object

[elogind.git] / libudev / libudev-queue-private.c

diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index 9ae680c386a9c7bc0f74458bb64988f55b828732..a799be062a961aa8829d97133456b5910dacc4ad 100644 (file)
--- a/libudev/libudev-queue-private.c
+++ b/libudev/libudev-queue-private.c
@@ -19,19 +19,22 @@
  *
  * When a new event is queued, its details are appended to the log.
  * When the event finishes, a second record is appended to the log
  *
  * When a new event is queued, its details are appended to the log.
  * When the event finishes, a second record is appended to the log

- * with the same sequence number but a null devpath.
+ * with the same sequence number but a devpath len of 0.

  *
  * Example:
  *
  * Example:

- *     {1, "/devices/virtual/mem/null" },
- *     {2, "/devices/virtual/mem/zero" },
- *     {1, "" },
- * Event 2 is still queued, but event 1 has been finished
+ *     { 0x0000000000000001 }
+ *     { 0x0000000000000001, 0x0019, "/devices/virtual/mem/null" },
+ *     { 0x0000000000000002, 0x001b, "/devices/virtual/mem/random" },
+ *     { 0x0000000000000001, 0x0000 },
+ *     { 0x0000000000000003, 0x0019, "/devices/virtual/mem/zero" },

  *
  *

- * The queue does not grow indefinitely.  It is periodically re-created
- * to remove finished events.  Atomic rename() makes this transparent to readers.
+ * Events 2 and 3 are still queued, but event 1 has finished.
+ *
+ * The queue does not grow indefinitely. It is periodically re-created
+ * to remove finished events. Atomic rename() makes this transparent to readers.

  *
  * The queue file starts with a single sequence number which specifies the
  *
  * The queue file starts with a single sequence number which specifies the

- * minimum sequence number in the log that follows.  Any events prior to this
+ * minimum sequence number in the log that follows. Any events prior to this

  * sequence number have already finished.
  */
 
  * sequence number have already finished.
  */
 


@@ -42,9 +45,9 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <limits.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <limits.h>

+#include <errno.h>

 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>

-#include <assert.h>

 
 #include "libudev.h"
 #include "libudev-private.h"
 
 #include "libudev.h"
 #include "libudev-private.h"


@@ -87,23 +90,24 @@ struct udev_queue_export *udev_queue_export_new(struct udev *udev)
        return udev_queue_export;
 }
 
        return udev_queue_export;
 }
 

-void udev_queue_export_unref(struct udev_queue_export *udev_queue_export)
+struct udev_queue_export *udev_queue_export_unref(struct udev_queue_export *udev_queue_export)

 {
        if (udev_queue_export == NULL)
 {
        if (udev_queue_export == NULL)

-               return;
+               return NULL;

        if (udev_queue_export->queue_file != NULL)
                fclose(udev_queue_export->queue_file);
        free(udev_queue_export);
        if (udev_queue_export->queue_file != NULL)
                fclose(udev_queue_export->queue_file);
        free(udev_queue_export);

+       return NULL;

 }
 
 void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)
 {
        char filename[UTIL_PATH_SIZE];
 
 }
 
 void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)
 {
        char filename[UTIL_PATH_SIZE];
 

-       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue_export->udev), "/.udev/queue.tmp", NULL);
+       util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL);

        unlink(filename);
 
        unlink(filename);
 

-       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue_export->udev), "/.udev/queue.bin", NULL);
+       util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL);

        unlink(filename);
 }
 
        unlink(filename);
 }
 


@@ -155,7 +159,7 @@ static struct queue_devpaths *build_index(struct udev_queue_export *udev_queue_e
                return NULL;
        }
        devpaths = calloc(1, sizeof(struct queue_devpaths) + (range + 1) * sizeof(long));
                return NULL;
        }
        devpaths = calloc(1, sizeof(struct queue_devpaths) + (range + 1) * sizeof(long));

-       if (index == NULL)
+       if (devpaths == NULL)

                return NULL;
        devpaths->devpaths_size = range + 1;
 
                return NULL;
        devpaths->devpaths_size = range + 1;
 


@@ -218,7 +222,7 @@ static int rebuild_queue_file(struct udev_queue_export *udev_queue_export)
        }
 
        /* create new queue file */
        }
 
        /* create new queue file */

-       util_strscpyl(filename_tmp, sizeof(filename_tmp), udev_get_dev_path(udev_queue_export->udev), "/.udev/queue.tmp", NULL);
+       util_strscpyl(filename_tmp, sizeof(filename_tmp), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL);

        new_queue_file = fopen(filename_tmp, "w+");
        if (new_queue_file == NULL)
                goto error;
        new_queue_file = fopen(filename_tmp, "w+");
        if (new_queue_file == NULL)
                goto error;


@@ -252,7 +256,7 @@ static int rebuild_queue_file(struct udev_queue_export *udev_queue_export)
                goto error;
 
        /* rename the new file on top of the old one */
                goto error;
 
        /* rename the new file on top of the old one */

-       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue_export->udev), "/.udev/queue.bin", NULL);
+       util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL);

        if (rename(filename_tmp, filename) != 0)
                goto error;
 
        if (rename(filename_tmp, filename) != 0)
                goto error;
 


@@ -349,7 +353,7 @@ static int update_queue(struct udev_queue_export *udev_queue_export,
                        return -1;
        }
 
                        return -1;
        }
 

-       /* when the queue files grow too large, they must be garbage collected and rebuilt */
+       /* 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 */
        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 */


@@ -393,27 +397,20 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
 {
        struct udev *udev = udev_device_get_udev(udev_device);
        char filename[UTIL_PATH_SIZE];
 {
        struct udev *udev = udev_device_get_udev(udev_device);
        char filename[UTIL_PATH_SIZE];

-       char *s;
-       size_t l;

 
        if (state != DEVICE_FAILED && udev_queue_export->failed_count == 0)
                return;
 
        /* location of failed file */
 
        if (state != DEVICE_FAILED && udev_queue_export->failed_count == 0)
                return;
 
        /* location of failed file */

-       s = filename;
-       l = util_strpcpyl(&s, sizeof(filename), udev_get_dev_path(udev_queue_export->udev), "/.udev/failed/", NULL);
-       util_path_encode(udev_device_get_devpath(udev_device), s, l);
+       util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/failed/",
+                     udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);

 
        switch (state) {
        case DEVICE_FAILED:
                /* record event in the failed directory */
 
        switch (state) {
        case DEVICE_FAILED:
                /* record event in the failed directory */

-               if (udev_queue_export->failed_count == 0)
-                       util_create_path(udev, filename);

                udev_queue_export->failed_count++;
                udev_queue_export->failed_count++;

-
-               udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
+               util_create_path(udev, filename);

                symlink(udev_device_get_devpath(udev_device), filename);
                symlink(udev_device_get_devpath(udev_device), filename);

-               udev_selinux_resetfscreatecon(udev);

                break;
 
        case DEVICE_QUEUED:
                break;
 
        case DEVICE_QUEUED:


@@ -425,18 +422,6 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
                break;
 
        case DEVICE_FINISHED:
                break;
 
        case DEVICE_FINISHED:

-               if (udev_device_get_devpath_old(udev_device) != NULL) {
-                       /* "move" event - rename failed file to current name, do not delete failed */
-                       char filename_old[UTIL_PATH_SIZE];
-
-                       s = filename_old;
-                       l = util_strpcpyl(&s, sizeof(filename_old), udev_get_dev_path(udev_queue_export->udev), "/.udev/failed/", NULL);
-                       util_path_encode(udev_device_get_devpath_old(udev_device), s, l);
-
-                       if (rename(filename_old, filename) == 0)
-                               info(udev, "renamed devpath, moved failed state of '%s' to %s'\n",
-                                    udev_device_get_devpath_old(udev_device), udev_device_get_devpath(udev_device));
-               }

                break;
        }
 
                break;
        }