Attachment 42379 Details for Bug 33342 – [6/11] DBusLoop: factor out watch_flags_to_poll_events, watch_flags_from_poll_revents

[patch] [6/11] DBusLoop: factor out watch_flags_to_poll_events, watch_flags_from_poll_revents

DBusLoop-factor-out-watchflagstopollevents-watchfl.patch (text/plain), 2.65 KB, created by Simon McVittie on 2011-01-24 07:51:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-01-24 07:51:22 UTC

Size: 2.65 KB

patch

obsolete

>From 851bf067972bbe10d83c44e012e7fdbc79d41809 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 21 Jan 2011 18:29:05 +0000
>Subject: [PATCH] DBusLoop: factor out watch_flags_to_poll_events, watch_flags_from_poll_revents
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33342
>---
> dbus/dbus-mainloop.c |   47 ++++++++++++++++++++++++++++++++---------------
> 1 files changed, 32 insertions(+), 15 deletions(-)
>
>diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
>index 737c6bd..c315e66 100644
>--- a/dbus/dbus-mainloop.c
>+++ b/dbus/dbus-mainloop.c
>@@ -64,6 +64,36 @@ struct DBusLoop
>   DBusList *need_dispatch;
> };
> 
>+static short
>+watch_flags_to_poll_events (unsigned int flags)
>+{
>+  short events = 0;
>+
>+  if (flags & DBUS_WATCH_READABLE)
>+    events |= _DBUS_POLLIN;
>+  if (flags & DBUS_WATCH_WRITABLE)
>+    events |= _DBUS_POLLOUT;
>+
>+  return events;
>+}
>+
>+static unsigned int
>+watch_flags_from_poll_revents (short revents)
>+{
>+  unsigned int condition = 0;
>+
>+  if (revents & _DBUS_POLLIN)
>+    condition |= DBUS_WATCH_READABLE;
>+  if (revents & _DBUS_POLLOUT)
>+    condition |= DBUS_WATCH_WRITABLE;
>+  if (revents & _DBUS_POLLHUP)
>+    condition |= DBUS_WATCH_HANGUP;
>+  if (revents & _DBUS_POLLERR)
>+    condition |= DBUS_WATCH_ERROR;
>+
>+  return condition;
>+}
>+
> typedef enum
> {
>   CALLBACK_WATCH,
>@@ -587,11 +617,7 @@ _dbus_loop_iterate (DBusLoop     *loop,
>                   
>               fds[n_fds].fd = fd;
>               fds[n_fds].revents = 0;
>-              fds[n_fds].events = 0;
>-              if (flags & DBUS_WATCH_READABLE)
>-                fds[n_fds].events |= _DBUS_POLLIN;
>-              if (flags & DBUS_WATCH_WRITABLE)
>-                fds[n_fds].events |= _DBUS_POLLOUT;
>+              fds[n_fds].events = watch_flags_to_poll_events (flags);
> 
> #if MAINLOOP_SPEW
>               _dbus_verbose ("  polling watch on fd %d  %s\n",
>@@ -767,16 +793,7 @@ _dbus_loop_iterate (DBusLoop     *loop,
>               unsigned int condition;
>                   
>               wcb = watches_for_fds[i];
>-              
>-              condition = 0;
>-              if (fds[i].revents & _DBUS_POLLIN)
>-                condition |= DBUS_WATCH_READABLE;
>-              if (fds[i].revents & _DBUS_POLLOUT)
>-                condition |= DBUS_WATCH_WRITABLE;
>-              if (fds[i].revents & _DBUS_POLLHUP)
>-                condition |= DBUS_WATCH_HANGUP;
>-              if (fds[i].revents & _DBUS_POLLERR)
>-                condition |= DBUS_WATCH_ERROR;
>+              condition = watch_flags_from_poll_revents (fds[i].revents);
> 
>               /* condition may still be 0 if we got some
>                * weird POLLFOO thing like POLLWRBAND
>-- 
>1.7.2.3

Actions: View | Splinter Review

Attachments on bug 33342: 42374 | 42375 | 42376 | 42377 | 42378 | 42379 | 42380 | 42381 | 42382 | 42383 | 42384 | 42450 | 42451 | 42452 | 42453

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.