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

DBusLoop: remove second layer of watch callbacks where possible

Browse source 
Similar to the previous commit, almost every use of DBusWatch can just
have the main loop call dbus_watch_handle.

The one exception is the bus activation code; it's had a comment
explaining why it's wrong since 2003. We should fix that one day, but for
now, just migrate it to a new _dbus_loop_add_watch_full which preserves
the second-layer callback.

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:54:33 +00:00
parent 93385b7339
commit 4b43f5db7a
10 changed files with 49 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bus/activation.c
View file

@ -1427,9 +1427,9 @@ add_babysitter_watch (DBusWatch *watch,
{
BusPendingActivation *pending_activation = data;
return _dbus_loop_add_watch (bus_context_get_loop (pending_activation->activation->context),
watch, babysitter_watch_callback, pending_activation,
NULL);
return _dbus_loop_add_watch_full (
bus_context_get_loop (pending_activation->activation->context),
watch, babysitter_watch_callback, pending_activation, NULL);
}
static void
@ -1439,7 +1439,7 @@ remove_babysitter_watch (DBusWatch *watch,
BusPendingActivation *pending_activation = data;
_dbus_loop_remove_watch (bus_context_get_loop (pending_activation->activation->context),
watch, babysitter_watch_callback, pending_activation);
watch);
}
static dbus_bool_t

20
bus/bus.c
View file

@ -102,19 +102,6 @@ server_get_context (DBusServer *server)
return context;
}
static dbus_bool_t
server_watch_callback (DBusWatch *watch,
unsigned int condition,
void *data)
{
/* FIXME this can be done in dbus-mainloop.c
* if the code in activation.c for the babysitter
* watch handler is fixed.
*/
return dbus_watch_handle (watch, condition);
}
static dbus_bool_t
add_server_watch (DBusWatch *watch,
void *data)
@ -124,9 +111,7 @@ add_server_watch (DBusWatch *watch,
context = server_get_context (server);
return _dbus_loop_add_watch (context->loop,
watch, server_watch_callback, server,
NULL);
return _dbus_loop_add_watch (context->loop, watch);
}
static void
@ -138,8 +123,7 @@ remove_server_watch (DBusWatch *watch,
context = server_get_context (server);
_dbus_loop_remove_watch (context->loop,
watch, server_watch_callback, server);
_dbus_loop_remove_watch (context->loop, watch);
}
static dbus_bool_t

23
bus/connection.c
View file

@ -294,31 +294,13 @@ bus_connection_disconnected (DBusConnection *connection)
dbus_connection_unref (connection);
}
static dbus_bool_t
connection_watch_callback (DBusWatch *watch,
unsigned int condition,
void *data)
{
/* FIXME this can be done in dbus-mainloop.c
* if the code in activation.c for the babysitter
* watch handler is fixed.
*/
#if 0
_dbus_verbose ("Calling handle_watch\n");
#endif
return dbus_watch_handle (watch, condition);
}
static dbus_bool_t
add_connection_watch (DBusWatch *watch,
void *data)
{
DBusConnection *connection = data;
return _dbus_loop_add_watch (connection_get_loop (connection),
watch, connection_watch_callback, connection,
NULL);
return _dbus_loop_add_watch (connection_get_loop (connection), watch);
}
static void
@ -327,8 +309,7 @@ remove_connection_watch (DBusWatch *watch,
{
DBusConnection *connection = data;
_dbus_loop_remove_watch (connection_get_loop (connection),
watch, connection_watch_callback, connection);
_dbus_loop_remove_watch (connection_get_loop (connection), watch);
}
static dbus_bool_t

11
bus/dir-watch-inotify.c
View file

@ -49,12 +49,6 @@ static int inotify_fd = -1;
static DBusWatch *watch = NULL;
static DBusLoop *loop = NULL;
static dbus_bool_t
_inotify_watch_callback (DBusWatch *watch, unsigned int condition, void *data)
{
return dbus_watch_handle (watch, condition);
}
static dbus_bool_t
_handle_inotify_watch (DBusWatch *passed_watch, unsigned int flags, void *data)
{
@ -206,7 +200,7 @@ _shutdown_inotify (void *data)
if (watch != NULL)
{
_dbus_loop_remove_watch (loop, watch, _inotify_watch_callback, NULL);
_dbus_loop_remove_watch (loop, watch);
_dbus_watch_invalidate (watch);
_dbus_watch_unref (watch);
_dbus_loop_unref (loop);
@ -252,8 +246,7 @@ _init_inotify (BusContext *context)
goto out;
}
if (!_dbus_loop_add_watch (loop, watch, _inotify_watch_callback,
NULL, NULL))
if (!_dbus_loop_add_watch (loop, watch))
{
_dbus_warn ("Unable to add reload watch to main loop");
_dbus_watch_unref (watch);

11
bus/dir-watch-kqueue.c
View file

@ -49,12 +49,6 @@ static int num_fds = 0;
static DBusWatch *watch = NULL;
static DBusLoop *loop = NULL;
static dbus_bool_t
_kqueue_watch_callback (DBusWatch *watch, unsigned int condition, void *data)
{
return dbus_watch_handle (watch, condition);
}
static dbus_bool_t
_handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
{
@ -80,7 +74,7 @@ _handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
kq = -1;
if (watch != NULL)
{
_dbus_loop_remove_watch (loop, watch, _kqueue_watch_callback, NULL);
_dbus_loop_remove_watch (loop, watch);
_dbus_watch_invalidate (watch);
_dbus_watch_unref (watch);
watch = NULL;
@ -121,8 +115,7 @@ _init_kqueue (BusContext *context)
goto out;
}
if (!_dbus_loop_add_watch (loop, watch, _kqueue_watch_callback,
NULL, NULL))
if (!_dbus_loop_add_watch (loop, watch))
{
_dbus_warn ("Unable to add reload watch to main loop");
_dbus_watch_invalidate (watch);

14
bus/main.c
View file

@ -220,14 +220,6 @@ handle_reload_watch (DBusWatch *watch,
return TRUE;
}
static dbus_bool_t
reload_watch_callback (DBusWatch *watch,
unsigned int condition,
void *data)
{
return dbus_watch_handle (watch, condition);
}
static void
setup_reload_pipe (DBusLoop *loop)
{
@ -257,8 +249,7 @@ setup_reload_pipe (DBusLoop *loop)
exit (1);
}
if (!_dbus_loop_add_watch (loop, watch, reload_watch_callback,
NULL, NULL))
if (!_dbus_loop_add_watch (loop, watch))
{
_dbus_warn ("Unable to add reload watch to main loop: %s\n",
error.message);
@ -271,8 +262,7 @@ setup_reload_pipe (DBusLoop *loop)
static void
close_reload_pipe (DBusWatch **watch)
{
_dbus_loop_remove_watch (bus_context_get_loop (context),
*watch, reload_watch_callback, NULL);
_dbus_loop_remove_watch (bus_context_get_loop (context), *watch);
_dbus_watch_invalidate (*watch);
_dbus_watch_unref (*watch);
*watch = NULL;

20
bus/test.c
View file

@ -36,28 +36,13 @@
static DBusList *clients = NULL;
static DBusLoop *client_loop = NULL;
static dbus_bool_t
client_watch_callback (DBusWatch *watch,
unsigned int condition,
void *data)
{
/* FIXME this can be done in dbus-mainloop.c
* if the code in activation.c for the babysitter
* watch handler is fixed.
*/
return dbus_watch_handle (watch, condition);
}
static dbus_bool_t
add_client_watch (DBusWatch *watch,
void *data)
{
DBusConnection *connection = data;
return _dbus_loop_add_watch (client_loop,
watch, client_watch_callback, connection,
NULL);
return _dbus_loop_add_watch (client_loop, watch);
}
static void
@ -66,8 +51,7 @@ remove_client_watch (DBusWatch *watch,
{
DBusConnection *connection = data;
_dbus_loop_remove_watch (client_loop,
watch, client_watch_callback, connection);
_dbus_loop_remove_watch (client_loop, watch);
}
static dbus_bool_t

45
dbus/dbus-mainloop.c
View file

@ -254,11 +254,18 @@ _dbus_loop_unref (DBusLoop *loop)
}
dbus_bool_t
_dbus_loop_add_watch (DBusLoop *loop,
DBusWatch *watch,
DBusWatchFunction function,
void *data,
DBusFreeFunction free_data_func)
_dbus_loop_add_watch (DBusLoop *loop,
DBusWatch *watch)
{
return _dbus_loop_add_watch_full (loop, watch, NULL, NULL, NULL);
}
dbus_bool_t
_dbus_loop_add_watch_full (DBusLoop *loop,
DBusWatch *watch,
DBusWatchFunction function,
void *data,
DBusFreeFunction free_data_func)
{
WatchCallback *wcb;
@ -277,10 +284,8 @@ _dbus_loop_add_watch (DBusLoop *loop,
}
void
_dbus_loop_remove_watch (DBusLoop *loop,
DBusWatch *watch,
DBusWatchFunction function,
void *data)
_dbus_loop_remove_watch (DBusLoop *loop,
DBusWatch *watch)
{
DBusList *link;
@ -295,9 +300,7 @@ _dbus_loop_remove_watch (DBusLoop *loop,
Callback *this = link->data;
if (this->type == CALLBACK_WATCH &&
WATCH_CALLBACK (this)->watch == watch &&
WATCH_CALLBACK (this)->data == data &&
WATCH_CALLBACK (this)->function == function)
WATCH_CALLBACK (this)->watch == watch)
{
remove_callback (loop, link);
@ -307,8 +310,7 @@ _dbus_loop_remove_watch (DBusLoop *loop,
link = next;
}
_dbus_warn ("could not find watch %p function %p data %p to remove\n",
watch, (void *)function, data);
_dbus_warn ("could not find watch %p to remove\n", watch);
}
dbus_bool_t
@ -596,8 +598,7 @@ _dbus_loop_iterate (DBusLoop *loop,
{
_dbus_warn ("watch %p was invalidated but not removed; "
"removing it now\n", wcb->watch);
_dbus_loop_remove_watch (loop, wcb->watch, wcb->function,
wcb->data);
_dbus_loop_remove_watch (loop, wcb->watch);
}
else if (dbus_watch_get_enabled (wcb->watch))
{
@ -807,7 +808,14 @@ _dbus_loop_iterate (DBusLoop *loop,
if (condition != 0 &&
dbus_watch_get_enabled (wcb->watch))
{
if (!(* wcb->function) (wcb->watch, condition, wcb->data))
dbus_bool_t oom;
if (wcb->function)
oom = !(* wcb->function) (wcb->watch, condition, wcb->data);
else
oom = !dbus_watch_handle (wcb->watch, condition);
if (oom)
wcb->last_iteration_oom = TRUE;
#if MAINLOOP_SPEW
@ -824,8 +832,7 @@ _dbus_loop_iterate (DBusLoop *loop,
_dbus_warn ("invalid request, socket fd %d not open\n",
fds[i].fd);
_dbus_loop_remove_watch (loop, watch, wcb->function,
wcb->data);
_dbus_loop_remove_watch (loop, watch);
_dbus_watch_invalidate (watch);
_dbus_watch_unref (watch);
}

6
dbus/dbus-mainloop.h
View file

@ -38,14 +38,14 @@ DBusLoop* _dbus_loop_new (void);
DBusLoop* _dbus_loop_ref (DBusLoop *loop);
void _dbus_loop_unref (DBusLoop *loop);
dbus_bool_t _dbus_loop_add_watch (DBusLoop *loop,
DBusWatch *watch);
dbus_bool_t _dbus_loop_add_watch_full (DBusLoop *loop,
DBusWatch *watch,
DBusWatchFunction function,
void *data,
DBusFreeFunction free_data_func);
void _dbus_loop_remove_watch (DBusLoop *loop,
DBusWatch *watch,
DBusWatchFunction function,
void *data);
DBusWatch *watch);
dbus_bool_t _dbus_loop_add_timeout (DBusLoop *loop,
DBusTimeout *timeout);
void _dbus_loop_remove_timeout (DBusLoop *loop,

36
test/test-utils.c
View file

@ -8,24 +8,13 @@ typedef struct
} CData;
static dbus_bool_t
connection_watch_callback (DBusWatch *watch,
unsigned int condition,
void *data)
{
return dbus_watch_handle (watch, condition);
}
static dbus_bool_t
add_watch (DBusWatch *watch,
void *data)
{
CData *cd = data;
return _dbus_loop_add_watch (cd->loop,
watch,
connection_watch_callback,
cd, NULL);
return _dbus_loop_add_watch (cd->loop, watch);
}
static void
@ -34,8 +23,7 @@ remove_watch (DBusWatch *watch,
{
CData *cd = data;
_dbus_loop_remove_watch (cd->loop,
watch, connection_watch_callback, cd);
_dbus_loop_remove_watch (cd->loop, watch);
}
static dbus_bool_t
@ -215,28 +203,13 @@ serverdata_new (DBusLoop *loop,
return sd;
}
static dbus_bool_t
server_watch_callback (DBusWatch *watch,
unsigned int condition,
void *data)
{
/* FIXME this can be done in dbus-mainloop.c
* if the code in activation.c for the babysitter
* watch handler is fixed.
*/
return dbus_watch_handle (watch, condition);
}
static dbus_bool_t
add_server_watch (DBusWatch *watch,
void *data)
{
ServerData *context = data;
return _dbus_loop_add_watch (context->loop,
watch, server_watch_callback, context,
NULL);
return _dbus_loop_add_watch (context->loop, watch);
}
static void
@ -245,8 +218,7 @@ remove_server_watch (DBusWatch *watch,
{
ServerData *context = data;
_dbus_loop_remove_watch (context->loop,
watch, server_watch_callback, context);
_dbus_loop_remove_watch (context->loop, watch);
}
static dbus_bool_t