libudev: monitor - export filter_update()

[elogind.git] / udev / lib / libudev-queue.c

diff --git a/udev/lib/libudev-queue.c b/udev/lib/libudev-queue.c
index 28d877749d7a6bf894206bc1331905d128eacbc0..5cd5ef75c9e05423756eb5c0f18c6d9486ae7bc3 100644 (file)
--- a/udev/lib/libudev-queue.c
+++ b/udev/lib/libudev-queue.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <stdio.h>
@@ -133,6 +125,20 @@ unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue)
        return seqnum;
 }
 
+int udev_queue_get_udev_is_active(struct udev_queue *udev_queue)
+{
+       char filename[UTIL_PATH_SIZE];
+       struct stat statbuf;
+
+       if (udev_queue == NULL)
+               return 0;
+       util_strlcpy(filename, udev_get_dev_path(udev_queue->udev), sizeof(filename));
+       util_strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename));
+       if (stat(filename, &statbuf) == 0)
+               return 1;
+       return 0;
+}
+
 int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
 {
        char queuename[UTIL_PATH_SIZE];
@@ -152,7 +158,10 @@ int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
                dbg(udev_queue->udev, "queue is empty\n");
                return 1;
        }
-       udev_queue_get_udev_seqnum(udev_queue);
+       /* update udev seqnum, and check if udev is still running */
+       if (udev_queue_get_udev_seqnum(udev_queue) == 0)
+               if (!udev_queue_get_udev_is_active(udev_queue))
+                       return 1;
        if (seqnum_kernel <= udev_queue->last_seen_udev_seqnum) {
                dbg(udev_queue->udev, "queue is empty\n");
                return 1;
@@ -169,15 +178,14 @@ int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned lo
 
        if (udev_queue == NULL)
                return -EINVAL;
-       /* if we have not seen this seqnum, check if it is/was already queued */
-       if (seqnum < udev_queue->last_seen_udev_seqnum) {
-               udev_queue_get_udev_seqnum(udev_queue);
-               if (seqnum < udev_queue->last_seen_udev_seqnum)
+       /* did it reach the queue? */
+       if (seqnum > udev_queue->last_seen_udev_seqnum)
+               if (seqnum > udev_queue_get_udev_seqnum(udev_queue))
                        return 0;
-       }
+       /* is it still in the queue? */
        snprintf(filename, sizeof(filename), "%s/.udev/queue/%llu",
                 udev_get_dev_path(udev_queue->udev), seqnum);
-       if (stat(filename, &statbuf) == 0)
+       if (lstat(filename, &statbuf) == 0)
                return 0;
        dbg(udev_queue->udev, "seqnum: %llu finished\n", seqnum);
        return 1;