Attachment 25770 Details for Bug 16841 – [PATCH 02/11] Allow a pending call to block forever

[patch] [PATCH 02/11] Allow a pending call to block forever

0002-Allow-a-pending-call-to-block-forever.patch (text/plain), 4.49 KB, created by Scott James Remnant on 2009-05-11 15:43:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott James Remnant

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

Size: 4.49 KB

patch

obsolete

>From 99be389b3abdaf0dfe054d7dbb17c7e6b1332a98 Mon Sep 17 00:00:00 2001
>From: Scott James Remnant <scott@ubuntu.com>
>Date: Mon, 11 May 2009 22:40:10 +0100
>Subject: [PATCH 02/11] Allow a pending call to block forever
>
>* dbus/dbus-connection.c (_dbus_connection_block_pending_call): Allow the
>  pending call to have no timeout, in which case we simply block until we
>  complete, have data or get disconnected.
>
>Signed-off-by: Scott James Remnant <scott@ubuntu.com>
>---
> dbus/dbus-connection.c |   62 +++++++++++++++++++++++++++++++++++++-----------
> 1 files changed, 48 insertions(+), 14 deletions(-)
>
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index 2530ad6..53d6307 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -2280,6 +2280,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
>   DBusDispatchStatus status;
>   DBusConnection *connection;
>   dbus_uint32_t client_serial;
>+  DBusTimeout *timeout;
>   int timeout_milliseconds;
> 
>   _dbus_assert (pending != NULL);
>@@ -2300,19 +2301,29 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
>    * in _dbus_pending_call_new() so overflows aren't possible
>    * below
>    */
>-  timeout_milliseconds = dbus_timeout_get_interval (_dbus_pending_call_get_timeout_unlocked (pending));
>-  
>-  _dbus_get_current_time (&start_tv_sec, &start_tv_usec);
>-  end_tv_sec = start_tv_sec + timeout_milliseconds / 1000;
>-  end_tv_usec = start_tv_usec + (timeout_milliseconds % 1000) * 1000;
>-  end_tv_sec += end_tv_usec / _DBUS_USEC_PER_SECOND;
>-  end_tv_usec = end_tv_usec % _DBUS_USEC_PER_SECOND;
>+  timeout = _dbus_pending_call_get_timeout_unlocked (pending);
>+  if (timeout)
>+    {
>+      timeout_milliseconds = dbus_timeout_get_interval (timeout);
>+      
>+      _dbus_get_current_time (&start_tv_sec, &start_tv_usec);
>+      end_tv_sec = start_tv_sec + timeout_milliseconds / 1000;
>+      end_tv_usec = start_tv_usec + (timeout_milliseconds % 1000) * 1000;
>+      end_tv_sec += end_tv_usec / _DBUS_USEC_PER_SECOND;
>+      end_tv_usec = end_tv_usec % _DBUS_USEC_PER_SECOND;
>+
>+      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): will block %d milliseconds for reply serial %u from %ld sec %ld usec to %ld sec %ld usec\n",
>+                     timeout_milliseconds,
>+                     client_serial,
>+                     start_tv_sec, start_tv_usec,
>+                     end_tv_sec, end_tv_usec);
>+    }
>+  else
>+    {
>+      timeout_milliseconds = -1;
> 
>-  _dbus_verbose ("dbus_connection_send_with_reply_and_block(): will block %d milliseconds for reply serial %u from %ld sec %ld usec to %ld sec %ld usec\n",
>-                 timeout_milliseconds,
>-                 client_serial,
>-                 start_tv_sec, start_tv_usec,
>-                 end_tv_sec, end_tv_usec);
>+      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): will block for reply serial %u\n", client_serial);
>+    }
> 
>   /* check to see if we already got the data off the socket */
>   /* from another blocked pending call */
>@@ -2368,10 +2379,33 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
>       dbus_pending_call_unref (pending);
>       return;
>     }
>-  else if (tv_sec < start_tv_sec)
>-    _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
>   else if (connection->disconnect_message_link == NULL)
>     _dbus_verbose ("dbus_connection_send_with_reply_and_block(): disconnected\n");
>+  else if (timeout == NULL)
>+    {
>+       if (status == DBUS_DISPATCH_NEED_MEMORY)
>+        {
>+          /* Try sleeping a bit, as we aren't sure we need to block for reading,
>+           * we may already have a reply in the buffer and just can't process
>+           * it.
>+           */
>+          _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
>+
>+          _dbus_memory_pause_based_on_timeout (timeout_milliseconds);
>+        }
>+      else
>+        {          
>+          /* block again, we don't have the reply buffered yet. */
>+          _dbus_connection_do_iteration_unlocked (connection,
>+                                                  DBUS_ITERATION_DO_READING |
>+                                                  DBUS_ITERATION_BLOCK,
>+                                                  timeout_milliseconds);
>+        }
>+
>+      goto recheck_status;
>+    }
>+  else if (tv_sec < start_tv_sec)
>+    _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
>   else if (tv_sec < end_tv_sec ||
>            (tv_sec == end_tv_sec && tv_usec < end_tv_usec))
>     {
>-- 
>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.