mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-25 11:18:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

http utils: push custom thread local main context

Browse Source 
We're calling async soup APIs with SOUP_SESSION_USE_THREAD_CONTEXT
set, which means that libsoup async APIs will run async callbacks on
the loop of the thread-default main context. We then manually spin
this main context, because we're supposed to look like a sync call and
the async stuff is just internally.

This is not really right, because normally there isn't any custom
mainloop context registred, which means we're spinning the main thread
context on some other thread, as well as queuing soup sorces on
it. This can't be any good!

Rather than doing this we actually create and push our own main
context that we then spin isolated from the default mainloop.
This commit is contained in:
Alexander Larsson
2021-03-18 10:14:30 +01:00
committed by Alexander Larsson
parent 49e8bfcea5
commit 1b130c5cc3
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/flatpak-utils-http.c
View File

@@ -670,6 +670,9 @@ flatpak_load_uri (SoupSession *soup_session,
{
g_autoptr(GError) local_error = NULL;
guint n_retries_remaining = DEFAULT_N_NETWORK_RETRIES;
g_autoptr(GMainContextPopDefault) main_context = NULL;
main_context = flatpak_main_context_new_default ();
/* Ensure we handle file: uris always */
if (g_ascii_strncasecmp (uri, "file:", 5) == 0)
@@ -788,6 +791,9 @@ flatpak_download_http_uri (SoupSession *soup_session,
{
g_autoptr(GError) local_error = NULL;
guint n_retries_remaining = DEFAULT_N_NETWORK_RETRIES;
g_autoptr(GMainContextPopDefault) main_context = NULL;
main_context = flatpak_main_context_new_default ();
do
{
@@ -1032,6 +1038,9 @@ flatpak_cache_http_uri (SoupSession *soup_session,
{
g_autoptr(GError) local_error = NULL;
guint n_retries_remaining = DEFAULT_N_NETWORK_RETRIES;
g_autoptr(GMainContextPopDefault) main_context = NULL;
main_context = flatpak_main_context_new_default ();
do
{