diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch b/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch new file mode 100644 index 0000000000..4c9e9f5182 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 3e9d85f1b75e2b1096d9643563d7d17380752fc7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> | ||
3 | Date: Tue, 11 Feb 2020 09:34:38 +0200 | ||
4 | Subject: [PATCH] GMainContext - Move mutex unlocking in destructor right | ||
5 | before freeing the mutex | ||
6 | |||
7 | This does not have any behaviour changes but is cleaner. The mutex is | ||
8 | only unlocked now after all operations on the context are done and right | ||
9 | before freeing the mutex and the context itself. | ||
10 | |||
11 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/730a75fc8e8271c38fbd5363d1f77a00876b9ddc] | ||
12 | |||
13 | --- | ||
14 | glib/gmain.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/glib/gmain.c b/glib/gmain.c | ||
18 | index 10ba2f8..b1df470 100644 | ||
19 | --- a/glib/gmain.c | ||
20 | +++ b/glib/gmain.c | ||
21 | @@ -584,7 +584,6 @@ g_main_context_unref (GMainContext *context) | ||
22 | source = s_iter->data; | ||
23 | g_source_destroy_internal (source, context, TRUE); | ||
24 | } | ||
25 | - UNLOCK_CONTEXT (context); | ||
26 | |||
27 | for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next) | ||
28 | { | ||
29 | @@ -595,6 +594,7 @@ g_main_context_unref (GMainContext *context) | ||
30 | |||
31 | g_hash_table_destroy (context->sources); | ||
32 | |||
33 | + UNLOCK_CONTEXT (context); | ||
34 | g_mutex_clear (&context->mutex); | ||
35 | |||
36 | g_ptr_array_free (context->pending_dispatches, TRUE); | ||