glib:remove self-join deadlock

Change-Id: Ia9fffe62c90d596efe29929c50e835d4a93fac52
Signed-off-by: sanghyeok.oh <sanghyeok.oh@samsung.com>

diff --git a/gio/gkdbus.c b/gio/gkdbus.c
index e2715c2..41435be 100755 (executable)
--- a/gio/gkdbus.c
+++ b/gio/gkdbus.c
@@ -587,6 +587,16 @@ _g_kdbus_quit_loop (gpointer loop)
   return FALSE;
 }
 
+static gboolean
+_g_kdbus_thread_end (gpointer thread)
+{
+  GThread *gthread = (GThread *)thread;
+
+  g_thread_join (gthread);
+
+  return FALSE;
+}
+
 /*
  * _g_kdbus_close
  */
@@ -605,7 +615,11 @@ _g_kdbus_close (GKDBusWorker *worker)
 
   g_main_loop_unref (worker->loop);
 
-  g_thread_join (worker->thread);
+  if (g_thread_self() == worker->thread)
+    g_main_context_invoke (NULL, _g_kdbus_thread_end, worker->thread);
+  else
+    g_thread_join (worker->thread);
+
   worker->thread = NULL;
 
   close (worker->fd);
@@ -615,7 +629,6 @@ _g_kdbus_close (GKDBusWorker *worker)
   return TRUE;
 }
 
-
 /*
  * _g_kdbus_is_closed
  */