mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-14 13:21:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-client: Clean up watch/watch context and related state consistently

Browse source 
And assert that it was cleaned up properly before the client is
finalized. If something is still around when the client is shut down
then something went very wrong before.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/115>
This commit is contained in:
Sebastian Dröge 2020-04-28 23:16:18 +03:00
parent 680ddb9fd3
commit 4188dbb99b
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gst/rtsp-server/rtsp-client.c
View file

@ -762,25 +762,15 @@ gst_rtsp_client_finalize (GObject * obj)
GST_INFO ("finalize client %p", client); GST_INFO ("finalize client %p", client);
if (priv->rtsp_ctrl_timeout_id != 0) { /* the watch and related state should be cleared before finalize
GST_DEBUG ("Killing leftover timeout GSource for client %p", client); * as the watch actually holds a strong reference to the client */
g_source_destroy (g_main_context_find_source_by_id (priv->watch_context, g_assert (priv->watch == NULL);
priv->rtsp_ctrl_timeout_id)); g_assert (priv->watch_context == NULL);
priv->rtsp_ctrl_timeout_id = 0; g_assert (priv->rtsp_ctrl_timeout_id == 0);
priv->rtsp_ctrl_timeout_cnt = 0;
}
if (priv->watch)
gst_rtsp_watch_set_flushing (priv->watch, TRUE);
gst_rtsp_client_set_send_func (client, NULL, NULL, NULL); gst_rtsp_client_set_send_func (client, NULL, NULL, NULL);
gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL); gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL);
if (priv->watch)
g_source_destroy ((GSource *) priv->watch);
if (priv->watch_context)
g_main_context_unref (priv->watch_context);
/* all sessions should have been removed by now. We keep a ref to /* all sessions should have been removed by now. We keep a ref to
* the client object for the session removed handler. The ref is * the client object for the session removed handler. The ref is
* dropped when the last session is removed from the list. */ * dropped when the last session is removed from the list. */
@ -1316,6 +1306,9 @@ gst_rtsp_client_close (GstRTSPClient * client)
gst_rtsp_client_set_send_func (client, NULL, NULL, NULL); gst_rtsp_client_set_send_func (client, NULL, NULL, NULL);
gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL); gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL);
rtsp_ctrl_timeout_remove (priv); rtsp_ctrl_timeout_remove (priv);
}
if (priv->watch_context) {
g_main_context_unref (priv->watch_context); g_main_context_unref (priv->watch_context);
priv->watch_context = NULL; priv->watch_context = NULL;
} }
@ -5049,6 +5042,12 @@ handle_tunnel (GstRTSPClient * client)
priv->watch = NULL; priv->watch = NULL;
gst_rtsp_client_set_send_func (client, NULL, NULL, NULL); gst_rtsp_client_set_send_func (client, NULL, NULL, NULL);
gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL); gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL);
rtsp_ctrl_timeout_remove (priv);
}
if (priv->watch_context) {
g_main_context_unref (priv->watch_context);
priv->watch_context = NULL;
} }
return GST_RTSP_STS_OK; return GST_RTSP_STS_OK;
@ -5145,8 +5144,15 @@ client_watch_notify (GstRTSPClient * client)
GST_INFO ("client %p: watch destroyed", client); GST_INFO ("client %p: watch destroyed", client);
priv->watch = NULL; priv->watch = NULL;
/* remove all sessions if the media says so and so drop the extra client ref */ /* remove all sessions if the media says so and so drop the extra client ref */
gst_rtsp_client_set_send_func (client, NULL, NULL, NULL);
gst_rtsp_client_set_send_messages_func (client, NULL, NULL, NULL);
rtsp_ctrl_timeout_remove (priv); rtsp_ctrl_timeout_remove (priv);
gst_rtsp_client_session_filter (client, cleanup_session, &closed); gst_rtsp_client_session_filter (client, cleanup_session, &closed);
if (priv->watch_context) {
g_main_context_unref (priv->watch_context);
priv->watch_context = NULL;
}
if (closed) if (closed)
g_signal_emit (client, gst_rtsp_client_signals[SIGNAL_CLOSED], 0, NULL); g_signal_emit (client, gst_rtsp_client_signals[SIGNAL_CLOSED], 0, NULL);
g_object_unref (client); g_object_unref (client);