Use the udevdb to speed up watch clearing.

Also return a udev_device when looking up by handle as well, so
everything works the same way.

diff --git a/udev/udev-watch.c b/udev/udev-watch.c
index dd6d2f8b29477d8a87598021db39e16c34ef1350..2d672e211cf4eaf3e1f7f476d74352d24857981b 100644 (file)
--- a/udev/udev-watch.c
+++ b/udev/udev-watch.c
@@ -160,67 +160,32 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev)
        udev_device_update_db(dev);
 }
 
-void udev_watch_clear(struct udev *udev, struct udev_device *dev)
+void udev_watch_end(struct udev *udev, struct udev_device *dev)
 {
-       static char filename[UTIL_PATH_SIZE];
-       DIR *dir;
-       struct dirent *ent;
+       int wd;
+       const char *filename;
 
        if (inotify_fd < 0 || major(udev_device_get_devnum(dev)) == 0)
                return;
 
-       util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
-       util_strlcat(filename, "/.udev/watch", sizeof(filename));
-
-       dir = opendir(filename);
-       if (dir == NULL)
-               return;
-
-       while ((ent = readdir(dir)) != NULL) {
-               char path[UTIL_PATH_SIZE];
-               char buf[UTIL_PATH_SIZE];
-               ssize_t len;
-
-               if (ent->d_name[0] < '0' || ent->d_name[0] > '9')
-                       continue;
-
-               util_strlcpy(path, filename, sizeof(path));
-               util_strlcat(path, "/", sizeof(path));
-               util_strlcat(path, ent->d_name, sizeof(path));
-
-               len = readlink(path, buf, sizeof(buf));
-               if (len <= 0)
-                       continue;
-
-               buf[len] = '\0';
-               if (strcmp(buf, udev_device_get_syspath(dev)))
-                       continue;
-
-               /* this is the watch we're looking for */
-               info(udev, "clearing existing watch on '%s'\n", udev_device_get_devnode(dev));
-               udev_watch_end(udev, atoi(ent->d_name));
-       }
-
-       closedir(dir);
-}
-
-void udev_watch_end(struct udev *udev, int wd)
-{
-       const char *filename;
-
-       if (inotify_fd < 0 || wd < 0)
+       wd = udev_device_get_watch_handle(dev);
+       if (wd < 0)
                return;
 
+       info(udev, "removing watch on '%s'\n", udev_device_get_devnode(dev));
        inotify_rm_watch(inotify_fd, wd);
 
        filename = udev_watch_filename(udev, wd);
        unlink(filename);
+
+       udev_device_set_watch_handle(dev, -1);
+       udev_device_update_db(dev);
 }
 
-const char *udev_watch_lookup(struct udev *udev, int wd)
+struct udev_device *udev_watch_lookup(struct udev *udev, int wd)
 {
        const char *filename;
-       static char buf[UTIL_PATH_SIZE];
+       char buf[UTIL_PATH_SIZE];
        ssize_t len;
 
        if (inotify_fd < 0 || wd < 0)
@@ -231,7 +196,7 @@ const char *udev_watch_lookup(struct udev *udev, int wd)
        if (len > 0) {
                buf[len] = '\0';
 
-               return buf;
+               return udev_device_new_from_syspath(udev, buf);
        }
 
        return NULL;

diff --git a/udev/udev.h b/udev/udev.h
index 57e2d73c2e656aea65f0180a66dad0449be6b786..d5fa4f3edc9f96863fce1316ba840d5595782561 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -105,9 +105,8 @@ extern int inotify_fd;
 extern void udev_watch_init(struct udev *udev);
 extern void udev_watch_restore(struct udev *udev);
 extern void udev_watch_begin(struct udev *udev, struct udev_device *dev);
-extern void udev_watch_clear(struct udev *udev, struct udev_device *dev);
-extern void udev_watch_end(struct udev *udev, int wd);
-extern const char *udev_watch_lookup(struct udev *udev, int wd);
+extern void udev_watch_end(struct udev *udev, struct udev_device *dev);
+extern struct udev_device *udev_watch_lookup(struct udev *udev, int wd);
 
 /* udev-node.c */
 extern int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid);

diff --git a/udev/udevd.c b/udev/udevd.c
index 27e64dae3acbb9a8a6d6f3388ac2842686b4e01e..5fb6d5f7345e2fc38425fb4b6b70e0a2cadbb1e5 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -216,7 +216,7 @@ static void event_fork(struct udev_event *event)
                alarm(UDEV_EVENT_TIMEOUT);
 
                /* clear any existing udev watch on the node */
-               udev_watch_clear(event->udev, event->dev);
+               udev_watch_end(event->udev, event->dev);
 
                /* apply rules, create node, symlinks */
                err = udev_event_execute_rules(event, rules);
@@ -540,19 +540,18 @@ static int handle_inotify(struct udev *udev)
        read(inotify_fd, buf, nbytes);
 
        for (pos = 0, ev = (struct inotify_event *)(buf + pos); pos < nbytes; pos += sizeof(struct inotify_event) + ev->len) {
-               const char *syspath;
+               struct udev_device *dev;
 
                dbg(udev, "inotify event: %x for %d (%s)\n", ev->mask, ev->wd, ev->len ? ev->name : "*");
-
-               syspath = udev_watch_lookup(udev, ev->wd);
-               if (syspath != NULL) {
-                       dbg(udev, "inotify event: %x for %s\n", ev->mask, syspath);
+               dev = udev_watch_lookup(udev, ev->wd);
+               if (dev != NULL) {
+                       dbg(udev, "inotify event: %x for %s\n", ev->mask, udev_device_get_devnode(dev));
                        if (ev->mask & IN_CLOSE_WRITE) {
                                char filename[UTIL_PATH_SIZE];
                                int fd;
 
-                               info(udev, "device %s closed, synthesising 'change'\n", syspath);
-                               util_strlcpy(filename, syspath, sizeof(filename));
+                               info(udev, "device %s closed, synthesising 'change'\n", udev_device_get_devnode(dev));
+                               util_strlcpy(filename, udev_device_get_syspath(dev), sizeof(filename));
                                util_strlcat(filename, "/uevent", sizeof(filename));
                                fd = open(filename, O_WRONLY);
                                if (fd < 0 || write(fd, "change", 6) < 0)
@@ -560,7 +559,9 @@ static int handle_inotify(struct udev *udev)
                                close(fd);
                        }
                        if (ev->mask & IN_IGNORED)
-                               udev_watch_end(udev, ev->wd);
+                               udev_watch_end(udev, dev);
+
+                       udev_device_unref(dev);
                } else {
                        reload_config = 1;
                }