Attachment 25771 Details for Bug 16841 – [PATCH 03/11] Don't allocate DBusTimeout for pending call when passed INT_MAX

[patch] [PATCH 03/11] Don't allocate DBusTimeout for pending call when passed INT_MAX

0003-Don-t-allocate-DBusTimeout-for-pending-call-when-pas.patch (text/plain), 3.50 KB, created by Scott James Remnant on 2009-05-11 15:43:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott James Remnant

Created: 2009-05-11 15:43:35 UTC

Size: 3.50 KB

patch

obsolete

>From 7551fa190e550e5e58de3e5af64510c2776b5d12 Mon Sep 17 00:00:00 2001
>From: Scott James Remnant <scott@ubuntu.com>
>Date: Mon, 11 May 2009 22:40:38 +0100
>Subject: [PATCH 03/11] Don't allocate DBusTimeout for pending call when passed INT_MAX
>
>* dbus/dbus-pending-call.c (_dbus_pending_call_new_unlocked): When passed
>  INT_MAX, do not clamp the value and do not allocate a timeout for the call
>  (_dbus_pending_call_get_timeout_unlocked): Document that this may return
>  NULL.
>
>Signed-off-by: Scott James Remnant <scott@ubuntu.com>
>---
> dbus/dbus-pending-call.c |   43 ++++++++++++++++++++++++-------------------
> 1 files changed, 24 insertions(+), 19 deletions(-)
>
>diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
>index 51b9378..8e840f0 100644
>--- a/dbus/dbus-pending-call.c
>+++ b/dbus/dbus-pending-call.c
>@@ -83,7 +83,7 @@ static dbus_int32_t notify_user_data_slot = -1;
>  * Creates a new pending reply object.
>  *
>  * @param connection connection where reply will arrive
>- * @param timeout_milliseconds length of timeout, -1 for default
>+ * @param timeout_milliseconds length of timeout, -1 for default, INT_MAX for no timeout
>  * @param timeout_handler timeout handler, takes pending call as data
>  * @returns a new #DBusPendingCall or #NULL if no memory.
>  */
>@@ -100,12 +100,11 @@ _dbus_pending_call_new_unlocked (DBusConnection    *connection,
>   if (timeout_milliseconds == -1)
>     timeout_milliseconds = _DBUS_DEFAULT_TIMEOUT_VALUE;
> 
>-  /* it would probably seem logical to pass in _DBUS_INT_MAX for
>-   * infinite timeout, but then math in
>-   * _dbus_connection_block_for_reply would get all overflow-prone, so
>-   * smack that down.
>+  /* clamp the timeout otherwise math in
>+   * _dbus_connection_block_for_reply would get all overflow-prone
>    */
>-  if (timeout_milliseconds > _DBUS_ONE_HOUR_IN_MILLISECONDS * 6)
>+  if ((timeout_milliseconds > _DBUS_ONE_HOUR_IN_MILLISECONDS * 6) &&
>+      (timeout_milliseconds < _DBUS_INT_MAX))
>     timeout_milliseconds = _DBUS_ONE_HOUR_IN_MILLISECONDS * 6;
>   
>   if (!dbus_pending_call_allocate_data_slot (&notify_user_data_slot))
>@@ -119,24 +118,30 @@ _dbus_pending_call_new_unlocked (DBusConnection    *connection,
>       return NULL;
>     }
> 
>-  timeout = _dbus_timeout_new (timeout_milliseconds,
>-                               timeout_handler,
>-			       pending, NULL);  
>-
>-  if (timeout == NULL)
>+  if (timeout_milliseconds != _DBUS_INT_MAX)
>     {
>-      dbus_pending_call_free_data_slot (&notify_user_data_slot);
>-      dbus_free (pending);
>-      return NULL;
>+      timeout = _dbus_timeout_new (timeout_milliseconds,
>+                                   timeout_handler,
>+                                   pending, NULL);  
>+
>+      if (timeout == NULL)
>+        {
>+          dbus_pending_call_free_data_slot (&notify_user_data_slot);
>+          dbus_free (pending);
>+          return NULL;
>+        }
>+
>+      pending->timeout = timeout;
>     }
>-  
>+  else
>+    {
>+      pending->timeout = NULL;
>+    }
>+      
>   pending->refcount.value = 1;
>   pending->connection = connection;
>   _dbus_connection_ref_unlocked (pending->connection);
> 
>-  pending->timeout = timeout;
>-
>-
>   _dbus_data_slot_list_init (&pending->slot_list);
>   
>   return pending;
>@@ -255,7 +260,7 @@ _dbus_pending_call_set_timeout_added_unlocked (DBusPendingCall  *pending,
>  * Retrives the timeout
>  *
>  * @param pending the pending_call
>- * @returns a timeout object 
>+ * @returns a timeout object or NULL if call has no timeout
>  */
> DBusTimeout *
> _dbus_pending_call_get_timeout_unlocked (DBusPendingCall  *pending)
>-- 
>1.6.0.4
>

Actions: View | Splinter Review

Attachments on bug 16841: 17862 | 17863 | 17864 | 17865 | 17866 | 17867 | 17868 | 17869 | 17870 | 25769 | 25770 | 25771 | 25772 | 25773 | 25774 | 25775 | 25776 | 25777 | 25778 | 25779

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.