Attachment 84504 Details for Bug 68303 – [PATCH v2 2/7] Cleanup: polish inotify backend

[patch] [PATCH v2 2/7] Cleanup: polish inotify backend

0002-Cleanup-polish-inotify-backend.patch (text/plain), 1.91 KB, created by Chengwei Yang on 2013-08-23 09:58:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-08-23 09:58:30 UTC

Size: 1.91 KB

patch

obsolete

>From 42c5525f6c85d9233e358fa852c0bead4adb3fb2 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Fri, 23 Aug 2013 16:52:38 +0800
>Subject: [PATCH v2 2/7] Cleanup: polish inotify backend
>
>At previous, it will do get pid and print a verbose string per inotify
>event, and then do send signal to the daemon.
>
>This patch changes the behavior to get pid and print a verbose string
>one time.
>---
> bus/dir-watch-inotify.c |   16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
>diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
>index d684831..862c386 100644
>--- a/bus/dir-watch-inotify.c
>+++ b/bus/dir-watch-inotify.c
>@@ -59,32 +59,30 @@ _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)
>     _dbus_verbose ("Error reading inotify event: '%s'\n", _dbus_strerror(errno));
>   else if (!ret)
>     _dbus_verbose ("Error reading inotify event: buffer too small\n");
>+  else
>+    {
>+      _dbus_verbose ("Sending SIGHUP signal on reception of %ld inotify event(s)\n", (long) ret);
>+      (void) kill (_dbus_getpid(), SIGHUP);
>+    }
> 
>+#ifdef DBUS_ENABLE_VERBOSE_MODE
>   while (i < ret)
>     {
>       struct inotify_event *ev;
>-      pid = _dbus_getpid ();
> 
>       ev = (struct inotify_event *) &buffer[i];
>       i += INOTIFY_EVENT_SIZE + ev->len;
>-#ifdef DBUS_ENABLE_VERBOSE_MODE
>       if (ev->len)
>         _dbus_verbose ("event name: '%s'\n", ev->name);
>       _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");
>-      have_change = TRUE;
>     }
>-  if (have_change)
>-    (void) kill (pid, SIGHUP);
>+#endif
> 
>   return TRUE;
> }
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 68303: 84302 | 84303 | 84304 | 84305 | 84306 | 84307 | 84308 | 84309 | 84310 | 84311 | 84503 | 84504 | 84505 | 84507 | 84508 | 84509 | 84510

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.