FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

souphttpsrc: Always abort the session once its last user is gone

Browse Source 
And wait until there are no pending GSources on the main context anymore
afterwards.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1603>
This commit is contained in:
Sebastian Dröge 2022-01-29 12:55:30 +02:00 committed by GStreamer Marge Bot
parent 1db95a61c0
commit bd6e1a9f70
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c
View File

@ -125,7 +125,6 @@ _soup_session_finalize_cb (gpointer user_data)
{ {
GstSoupSession *sess = user_data; GstSoupSession *sess = user_data;
g_clear_object (&sess->session);
g_main_loop_quit (sess->loop); g_main_loop_quit (sess->loop);
return FALSE; return FALSE;
@ -1064,6 +1063,13 @@ thread_func (gpointer user_data)
g_main_loop_run (session->loop); g_main_loop_run (session->loop);
/* Abort any pending operations on the session ... */
_soup_session_abort (session->session);
g_clear_object (&session->session);
/* ... and iterate the main context until nothing is pending anymore */
while (g_main_context_iteration (ctx, FALSE));
g_main_context_pop_thread_default (ctx); g_main_context_pop_thread_default (ctx);
GST_DEBUG_OBJECT (session, "thread stop"); GST_DEBUG_OBJECT (session, "thread stop");
@ -1215,9 +1221,6 @@ _session_close_cb (gpointer user_data)
g_clear_object (&src->msg); g_clear_object (&src->msg);
} }
if (!src->session_is_shared)
_soup_session_abort (src->session->session);
/* there may be multiple of this callback attached to the session, /* there may be multiple of this callback attached to the session,
* each with different data pointer; disconnect the one we are closing * each with different data pointer; disconnect the one we are closing
* the session for, leave the others alone * the session for, leave the others alone