Attachment 90143 Details for Bug 69332 – [PATCH v2] Fix memory leak for kqueue: shutdown kqueue correctly

[patch] [PATCH v2] Fix memory leak for kqueue: shutdown kqueue correctly

0001-Fix-memory-leak-for-kqueue-shutdown-kqueue-correctly.patch (text/plain), 3.15 KB, created by Chengwei Yang on 2013-12-03 07:19:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-12-03 07:19:23 UTC

Size: 3.15 KB

patch

obsolete

>From b384f6e6809e0328dcd0fd3575fe44e4bd08363d Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Tue, 3 Dec 2013 15:17:02 +0800
>Subject: [PATCH v2] Fix memory leak for kqueue: shutdown kqueue correctly
>
>There are two blocks leaks when do bus-test dispatch-sha1, this patch
>fix one about the watch leaks.
>
>Also, it fixes other memory leaks, though they're not reported in test
>case because they were not malloced from dbus_malloc or dbus_malloc0.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69332
>---
> bus/dir-watch-kqueue.c |   90 +++++++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 77 insertions(+), 13 deletions(-)
>
>diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
>index 065fabb..c1ebad7 100644
>--- a/bus/dir-watch-kqueue.c
>+++ b/bus/dir-watch-kqueue.c
>@@ -87,11 +87,52 @@ _handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
>   return TRUE;
> }
> 
>+static void _shutdown_kqueue (void *data)
>+{
>+  int i;
>+
>+  if (kq < 0)
>+    return;
>+
>+  for (i = 0; i < MAX_DIRS_TO_WATCH; i++)
>+    {
>+      if (fds[i] >= 0)
>+        {
>+          close (fds[i]);
>+          fds[i] = -1;
>+        }
>+      if (dirs[i] != NULL)
>+        {
>+          /* dbus_free() is necessary to pass memleak check */
>+          dbus_free (dirs[i]);
>+          dirs[i] = NULL;
>+        }
>+    }
>+
>+  if (loop)
>+    {
>+      _dbus_loop_remove_watch (loop, watch);
>+      _dbus_loop_unref (loop);
>+      loop = NULL;
>+    }
>+
>+  if (watch)
>+    {
>+      _dbus_watch_invalidate (watch);
>+      _dbus_watch_unref (watch);
>+      watch = NULL;
>+    }
>+
>+  if (kq >= 0)
>+    {
>+      close (kq);
>+      kq = -1;
>+    }
>+}
>+
> static int
> _init_kqueue (BusContext *context)
> {
>-  int ret = 0;
>-
>   if (kq < 0)
>     {
> 
>@@ -103,6 +144,7 @@ _init_kqueue (BusContext *context)
>         }
> 
>       loop = bus_context_get_loop (context);
>+      _dbus_loop_ref (loop);
> 
>       watch = _dbus_watch_new (kq, DBUS_WATCH_READABLE, TRUE,
>                                _handle_kqueue_watch, NULL, NULL);
>@@ -110,27 +152,49 @@ _init_kqueue (BusContext *context)
>       if (watch == NULL)
>         {
>           _dbus_warn ("Unable to create kqueue watch\n");
>-          close (kq);
>-          kq = -1;
>-          goto out;
>+          goto out1;
>         }
> 
>       if (!_dbus_loop_add_watch (loop, watch))
>         {
>           _dbus_warn ("Unable to add reload watch to main loop");
>-          _dbus_watch_invalidate (watch);
>-          _dbus_watch_unref (watch);
>-          watch = NULL;
>-          close (kq);
>-          kq = -1;
>-          goto out;
>+          goto out2;
>+        }
>+
>+      if (!_dbus_register_shutdown_func (_shutdown_kqueue, NULL))
>+        {
>+          _dbus_warn ("Unable to register shutdown function");
>+          goto out3;
>         }
>     }
> 
>-  ret = 1;
>+  return 1;
>+
>+out3:
>+  _dbus_loop_remove_watch (loop, watch);
>+
>+out2:
>+  if (watch)
>+    {
>+      _dbus_watch_invalidate (watch);
>+      _dbus_watch_unref (watch);
>+      watch = NULL;
>+    }
>+
>+out1:
>+  if (kq >= 0)
>+    {
>+      close (kq);
>+      kq = -1;
>+    }
>+  if (loop)
>+    {
>+      _dbus_loop_unref (loop);
>+      loop = NULL;
>+    }
> 
> out:
>-  return ret;
>+  return 0;
> }
> 
> void
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 69332: 90139 | 90140 | 90141 | 90143 | 90153

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.