mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-13 13:30:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix locking and threadsafety

Browse source 
Emit all notify in the context thread.
Handle error cases better.
Make sure we hold the lock when running the mainloop, this will cause
all of the signals to be emited with the lock. Make sure we call all
methods with the lock.
This commit is contained in:
Wim Taymans 2015-06-12 12:10:27 +02:00
parent 83223f0a83
commit b68b62740c
7 changed files with 153 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/client/pv-context.c
View file

@ -302,12 +302,22 @@ pv_context_new (GMainContext *context, const gchar *name, GVariant *properties)
return g_object_new (PV_TYPE_CONTEXT, "main-context", context, "name", name, "properties", properties, NULL);
}
static gboolean
do_notify_state (PvContext *context)
{
g_object_notify (G_OBJECT (context), "state");
g_object_unref (context);
return FALSE;
}
static void
context_set_state (PvContext *context, PvContextState state)
{
if (context->priv->state != state) {
context->priv->state = state;
g_object_notify (G_OBJECT (context), "state");
g_main_context_invoke (context->priv->context,
(GSourceFunc) do_notify_state,
g_object_ref (context));
}
}
static void
@ -333,7 +343,7 @@ client_failed:
{
priv->error = error;
context_set_state (context, PV_STREAM_STATE_ERROR);
g_error ("failed to get client proxy: %s", error->message);
g_warning ("failed to get client proxy: %s", error->message);
return;
}
}
@ -351,7 +361,7 @@ on_client_connected (GObject *source_object,
ret = g_dbus_proxy_call_finish (priv->daemon, res, &error);
if (ret == NULL) {
g_error ("failed to connect client: %s", error->message);
g_warning ("failed to connect client: %s", error->message);
priv->error = error;
context_set_state (context, PV_CONTEXT_STATE_ERROR);
return;
@ -554,7 +564,7 @@ on_client_disconnected (GObject *source_object,
ret = g_dbus_proxy_call_finish (priv->client, res, &error);
if (ret == NULL) {
g_error ("failed to disconnect client: %s", error->message);
g_warning ("failed to disconnect client: %s", error->message);
priv->error = error;
context_set_state (context, PV_CONTEXT_STATE_ERROR);
g_object_unref (context);

43
src/client/pv-stream.c
View file

@ -154,12 +154,22 @@ pv_stream_set_property (GObject *_object,
}
}
static gboolean
do_notify_state (PvStream *stream)
{
g_object_notify (G_OBJECT (stream), "state");
g_object_unref (stream);
return FALSE;
}
static void
stream_set_state (PvStream *stream, PvStreamState state)
{
if (stream->priv->state != state) {
stream->priv->state = state;
g_object_notify (G_OBJECT (stream), "state");
g_main_context_invoke (stream->priv->context->priv->context,
(GSourceFunc) do_notify_state,
g_object_ref (stream));
}
}
@ -461,7 +471,7 @@ source_output_failed:
{
priv->error = error;
stream_set_state (stream, PV_STREAM_STATE_ERROR);
g_error ("failed to get source output proxy: %s", error->message);
g_warning ("failed to get source output proxy: %s", error->message);
g_object_unref (stream);
return;
}
@ -687,7 +697,7 @@ pv_stream_disconnect (PvStream *stream)
g_return_val_if_fail (priv->state >= PV_STREAM_STATE_READY, FALSE);
g_return_val_if_fail (priv->source_output != NULL, FALSE);
context = priv->context;
g_return_val_if_fail (pv_context_get_state (context) == PV_CONTEXT_STATE_READY, FALSE);
g_return_val_if_fail (pv_context_get_state (context) >= PV_CONTEXT_STATE_READY, FALSE);
g_main_context_invoke (context->priv->context,
(GSourceFunc) do_disconnect,
@ -795,7 +805,7 @@ socket_failed:
{
priv->error = error;
stream_set_state (stream, PV_STREAM_STATE_ERROR);
g_error ("failed to create socket: %s", error->message);
g_warning ("failed to create socket: %s", error->message);
return;
}
}
@ -868,12 +878,12 @@ on_stream_started (GObject *source_object,
/* ERRORS */
start_failed:
{
g_error ("failed to start: %s", error->message);
g_warning ("failed to start: %s", error->message);
goto exit_error;
}
fd_failed:
{
g_error ("failed to get FD: %s", error->message);
g_warning ("failed to get FD: %s", error->message);
goto exit_error;
}
exit_error:
@ -966,7 +976,7 @@ call_failed:
{
priv->error = error;
stream_set_state (stream, PV_STREAM_STATE_ERROR);
g_error ("failed to release: %s", error->message);
g_warning ("failed to release: %s", error->message);
return;
}
}
@ -1082,11 +1092,24 @@ pv_stream_provide_buffer (PvStream *stream, PvBufferInfo *info)
flags,
NULL,
&error);
if (info->message) {
g_object_unref (info->message);
info->message = NULL;
}
if (len == -1)
goto send_error;
g_assert (len == sizeof (msg));
if (info->message)
g_object_unref (info->message);
return TRUE;
send_error:
{
priv->error = error;
stream_set_state (stream, PV_STREAM_STATE_ERROR);
g_warning ("failed to send_message: %s", error->message);
return FALSE;
}
}