Attachment 43817 Details for Bug 34393 – Add _dbus_counter_notify and call it after every adjustment

[patch] Add _dbus_counter_notify and call it after every adjustment

0004-Add-_dbus_counter_notify-and-call-it-after-every-adj.patch (text/plain), 5.18 KB, created by Simon McVittie on 2011-02-25 10:23:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-02-25 10:23:16 UTC

Size: 5.18 KB

patch

obsolete

>From bc543b14a5f354abc5736d48def3e6112d539a6d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 23 Feb 2011 12:45:53 +0000
>Subject: [PATCH 04/10] Add _dbus_counter_notify and call it after every adjustment
>
>When fd-passing is implemented, adjustments happen in pairs; in that case
>we coalesce the two calls into one.
>---
> dbus/dbus-message.c   |    4 ++++
> dbus/dbus-resources.c |   35 +++++++++++++++++++++++++++++------
> dbus/dbus-resources.h |    1 +
> 3 files changed, 34 insertions(+), 6 deletions(-)
>
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index 442ec2a..6d0ebb8 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -253,6 +253,8 @@ _dbus_message_add_counter_link (DBusMessage  *message,
> #ifdef HAVE_UNIX_FD_PASSING
>   _dbus_counter_adjust_unix_fd (link->data, message->unix_fd_counter_delta);
> #endif
>+
>+  _dbus_counter_notify (link->data);
> }
> 
> /**
>@@ -312,6 +314,7 @@ _dbus_message_remove_counter (DBusMessage  *message,
>   _dbus_counter_adjust_unix_fd (counter, - message->unix_fd_counter_delta);
> #endif
> 
>+  _dbus_counter_notify (counter);
>   _dbus_counter_unref (counter);
> }
> 
>@@ -573,6 +576,7 @@ free_counter (void *element,
>   _dbus_counter_adjust_unix_fd (counter, - message->unix_fd_counter_delta);
> #endif
> 
>+  _dbus_counter_notify (counter);
>   _dbus_counter_unref (counter);
> }
> 
>diff --git a/dbus/dbus-resources.c b/dbus/dbus-resources.c
>index 5f7001c..7f4f69a 100644
>--- a/dbus/dbus-resources.c
>+++ b/dbus/dbus-resources.c
>@@ -63,6 +63,7 @@ struct DBusCounter
> 
>   DBusCounterNotifyFunction notify_function; /**< notify function */
>   void *notify_data; /**< data for notify function */
>+  dbus_bool_t notify_pending : 1; /**< TRUE if the guard value has been crossed */
> };
> 
> /** @} */  /* end of resource limits internals docs */
>@@ -95,6 +96,7 @@ _dbus_counter_new (void)
>   counter->notify_unix_fd_guard_value = 0;
>   counter->notify_function = NULL;
>   counter->notify_data = NULL;
>+  counter->notify_pending = FALSE;
>   
>   return counter;
> }
>@@ -138,8 +140,9 @@ _dbus_counter_unref (DBusCounter *counter)
> /**
>  * Adjusts the value of the size counter by the given
>  * delta which may be positive or negative.
>- * Calls the notify function from _dbus_counter_set_notify()
>- * if that function has been specified.
>+ *
>+ * This function may be called with locks held. After calling it, when
>+ * any relevant locks are no longer held you must call _dbus_counter_notify().
>  *
>  * @param counter the counter
>  * @param delta value to add to the size counter's current value
>@@ -162,14 +165,33 @@ _dbus_counter_adjust_size (DBusCounter *counter,
>         counter->size_value >= counter->notify_size_guard_value) ||
>        (old >= counter->notify_size_guard_value &&
>         counter->size_value < counter->notify_size_guard_value)))
>-    (* counter->notify_function) (counter, counter->notify_data);
>+    counter->notify_pending = TRUE;
>+}
>+
>+/**
>+ * Calls the notify function from _dbus_counter_set_notify(),
>+ * if that function has been specified and the counter has crossed the
>+ * guard value (in either direction) since the last call to this function.
>+ *
>+ * This function must not be called with locks held, since it can call out
>+ * to user code.
>+ */
>+void
>+_dbus_counter_notify (DBusCounter *counter)
>+{
>+  if (counter->notify_pending)
>+    {
>+      counter->notify_pending = FALSE;
>+      (* counter->notify_function) (counter, counter->notify_data);
>+    }
> }
> 
> /**
>  * Adjusts the value of the unix fd counter by the given
>  * delta which may be positive or negative.
>- * Calls the notify function from _dbus_counter_set_notify()
>- * if that function has been specified.
>+ *
>+ * This function may be called with locks held. After calling it, when
>+ * any relevant locks are no longer held you must call _dbus_counter_notify().
>  *
>  * @param counter the counter
>  * @param delta value to add to the unix fds counter's current value
>@@ -192,7 +214,7 @@ _dbus_counter_adjust_unix_fd (DBusCounter *counter,
>         counter->unix_fd_value >= counter->notify_unix_fd_guard_value) ||
>        (old >= counter->notify_unix_fd_guard_value &&
>         counter->unix_fd_value < counter->notify_unix_fd_guard_value)))
>-    (* counter->notify_function) (counter, counter->notify_data);
>+    counter->notify_pending = TRUE;
> }
> 
> /**
>@@ -241,6 +263,7 @@ _dbus_counter_set_notify (DBusCounter               *counter,
>   counter->notify_unix_fd_guard_value = unix_fd_guard_value;
>   counter->notify_function = function;
>   counter->notify_data = user_data;
>+  counter->notify_pending = FALSE;
> }
> 
> /** @} */  /* end of resource limits exported API */
>diff --git a/dbus/dbus-resources.h b/dbus/dbus-resources.h
>index 4763a97..5842a63 100644
>--- a/dbus/dbus-resources.h
>+++ b/dbus/dbus-resources.h
>@@ -42,6 +42,7 @@ void         _dbus_counter_adjust_size       (DBusCounter *counter,
>                                               long         delta);
> void         _dbus_counter_adjust_unix_fd    (DBusCounter *counter,
>                                               long         delta);
>+void         _dbus_counter_notify            (DBusCounter *counter);
> long         _dbus_counter_get_size_value    (DBusCounter *counter);
> long         _dbus_counter_get_unix_fd_value (DBusCounter *counter);
> 
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 34393: 43814 | 43815 | 43816 | 43817 | 43818 | 43819 | 43820 | 43821 | 43822 | 43823 | 44207 | 44314 | 44317 | 44353 | 46155 | 46157 | 48281

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.