Attachment 17034 Details for Bug 16294 – fix inotify

[patch] fix inotify

dbus-inotify-make-go.patch (text/plain), 1.55 KB, created by Colin Walters on 2008-06-10 11:54:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2008-06-10 11:54:21 UTC

Size: 1.55 KB

patch

obsolete

>diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
>index e15faad..44ec9cf 100644
>--- a/bus/dir-watch-inotify.c
>+++ b/bus/dir-watch-inotify.c
>@@ -55,12 +55,13 @@ _inotify_watch_callback (DBusWatch *watch, unsigned int condition, void *data)
> }
> 
> static dbus_bool_t
>-_handle_inotify_watch (DBusWatch *watch, unsigned int flags, void *data)
>+_handle_inotify_watch (DBusWatch *passed_watch, unsigned int flags, void *data)
> {
>   char buffer[INOTIFY_BUF_LEN];
>   ssize_t ret = 0;
>   int i = 0;
>   pid_t pid;
>+  dbus_bool_t have_change = FALSE;
> 
>   ret = read (inotify_fd, buffer, INOTIFY_BUF_LEN);
>   if (ret < 0)
>@@ -81,16 +82,11 @@ _handle_inotify_watch (DBusWatch *watch, unsigned int flags, void *data)
>       _dbus_verbose ("inotify event: wd=%d mask=%u cookie=%u len=%u\n", ev->wd, ev->mask, ev->cookie, ev->len);
> #endif
>       _dbus_verbose ("Sending SIGHUP signal on reception of a inotify event\n");
>-      (void) kill (pid, SIGHUP);
>+      have_change = TRUE;
>     }
>+  if (have_change)
>+    (void) kill (pid, SIGHUP);
> 
>-  if (watch != NULL)
>-    {
>-      _dbus_loop_remove_watch (loop, watch, _inotify_watch_callback, NULL);
>-      _dbus_watch_unref (watch);
>-      watch = NULL;
>-    }
>- 
>   return TRUE;
> }
> 
>@@ -153,6 +149,13 @@ bus_drop_all_directory_watches (void)
> {
>   int ret;
> 
>+  if (watch != NULL)
>+    {
>+      _dbus_loop_remove_watch (loop, watch, _inotify_watch_callback, NULL);
>+      _dbus_watch_unref (watch);
>+      watch = NULL;
>+    }
>+
>   _dbus_verbose ("Dropping all watches on config directories\n");
>   ret = close (inotify_fd);
>   if (ret)

Actions: View | Splinter Review

Attachments on bug 16294: 17034

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.