fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-19 05:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

DBusLoop: factor out watch_flags_to_poll_events, watch_flags_from_poll_revents

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33342
Reviewed-by: Thiago Macieira <thiago@kde.org>
This commit is contained in:
Simon McVittie 2011-01-21 18:29:05 +00:00
parent 63b9770604
commit 7d9592ef55
1 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
dbus/dbus-mainloop.c
View file

@ -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