mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: first restart timer, then dispatch it

Browse source 
This makes sure that we don't access the timer after it might have been
destroyed already from the dbus timeout callback.

https://bugzilla.redhat.com/attachment.cgi?id=389952
This commit is contained in:
Lennart Poettering 2010-02-16 02:49:44 +01:00
parent ff2474e5fc
commit 96592c2115
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/pulsecore/dbus-util.c
View file

@ -44,17 +44,16 @@ struct pa_dbus_wrap_connection {
}; };
struct timeout_data { struct timeout_data {
pa_dbus_wrap_connection *c; pa_dbus_wrap_connection *connection;
DBusTimeout *timeout; DBusTimeout *timeout;
}; };
static void dispatch_cb(pa_mainloop_api *ea, pa_defer_event *ev, void *userdata) { static void dispatch_cb(pa_mainloop_api *ea, pa_defer_event *ev, void *userdata) {
DBusConnection *conn = userdata; DBusConnection *conn = userdata;
if (dbus_connection_dispatch(conn) == DBUS_DISPATCH_COMPLETE) { if (dbus_connection_dispatch(conn) == DBUS_DISPATCH_COMPLETE)
/* no more data to process, disable the deferred */ /* no more data to process, disable the deferred */
ea->defer_enable(ev, 0); ea->defer_enable(ev, 0);
}
} }
/* DBusDispatchStatusFunction callback for the pa mainloop */ /* DBusDispatchStatusFunction callback for the pa mainloop */
@ -131,13 +130,17 @@ static void handle_time_event(pa_mainloop_api *ea, pa_time_event* e, const struc
struct timeout_data *d = userdata; struct timeout_data *d = userdata;
pa_assert(d); pa_assert(d);
pa_assert(d->c); pa_assert(d->connection);
if (dbus_timeout_get_enabled(d->timeout)) { if (dbus_timeout_get_enabled(d->timeout)) {
dbus_timeout_handle(d->timeout); /* Restart it for the next scheduled time. We do this before
* calling dbus_timeout_handle() to make sure that the time
* event is still around. */
ea->time_restart(e, pa_timeval_rtstore(&tv,
pa_timeval_load(t) + dbus_timeout_get_interval(d->timeout) * PA_USEC_PER_MSEC,
d->connection->use_rtclock));
/* restart it for the next scheduled time */ dbus_timeout_handle(d->timeout);
ea->time_restart(e, pa_timeval_rtstore(&tv, pa_timeval_load(t) + dbus_timeout_get_interval(d->timeout) * PA_USEC_PER_MSEC, d->c->use_rtclock));
} }
} }
@ -207,7 +210,7 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data) {
return FALSE; return FALSE;
d = pa_xnew(struct timeout_data, 1); d = pa_xnew(struct timeout_data, 1);
d->c = c; d->connection = c;
d->timeout = timeout; d->timeout = timeout;
ev = c->mainloop->time_new(c->mainloop, pa_timeval_rtstore(&tv, pa_rtclock_now() + dbus_timeout_get_interval(timeout) * PA_USEC_PER_MSEC, c->use_rtclock), handle_time_event, d); ev = c->mainloop->time_new(c->mainloop, pa_timeval_rtstore(&tv, pa_rtclock_now() + dbus_timeout_get_interval(timeout) * PA_USEC_PER_MSEC, c->use_rtclock), handle_time_event, d);
c->mainloop->time_set_destroy(ev, time_event_destroy_cb); c->mainloop->time_set_destroy(ev, time_event_destroy_cb);
@ -236,15 +239,15 @@ static void toggle_timeout(DBusTimeout *timeout, void *data) {
struct timeval tv; struct timeval tv;
pa_assert(d); pa_assert(d);
pa_assert(d->c); pa_assert(d->connection);
pa_assert(timeout); pa_assert(timeout);
pa_assert_se(ev = dbus_timeout_get_data(timeout)); pa_assert_se(ev = dbus_timeout_get_data(timeout));
if (dbus_timeout_get_enabled(timeout)) { if (dbus_timeout_get_enabled(timeout))
d->c->mainloop->time_restart(ev, pa_timeval_rtstore(&tv, pa_rtclock_now() + dbus_timeout_get_interval(timeout) * PA_USEC_PER_MSEC, d->c->use_rtclock)); d->connection->mainloop->time_restart(ev, pa_timeval_rtstore(&tv, pa_rtclock_now() + dbus_timeout_get_interval(timeout) * PA_USEC_PER_MSEC, d->connection->use_rtclock));
} else else
d->c->mainloop->time_restart(ev, pa_timeval_rtstore(&tv, PA_USEC_INVALID, d->c->use_rtclock)); d->connection->mainloop->time_restart(ev, pa_timeval_rtstore(&tv, PA_USEC_INVALID, d->connection->use_rtclock));
} }
static void wakeup_main(void *userdata) { static void wakeup_main(void *userdata) {