Fix bug - add daemon timeout

Now, gumd daemon is not ended. (daemon timeout does not work.)
Add release reference logic for dbus adapter, and set timeout to 7 sec.

Change-Id: I43ae1605a2cfabce008beec6ad93bd24345e41ea
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

diff --git a/data/tizen/etc/gumd/gumd-tizen-common.conf b/data/tizen/etc/gumd/gumd-tizen-common.conf
index 5cf7d39..ccda3a9 100644 (file)
--- a/data/tizen/etc/gumd/gumd-tizen-common.conf
+++ b/data/tizen/etc/gumd/gumd-tizen-common.conf
@@ -138,7 +138,7 @@ SMACK64_USER_FILES=User::Home
 # Timeout in seconds for the daemon. Daemon will exit after specified idle time.
 # If not set (or set to 0), the daemon will not exit. Has no effect if P2P DBus
 # is in use.
-#DAEMON_TIMEOUT=7
+DAEMON_TIMEOUT=7
 
 # Timeout in seconds for user dbus objects. If not set (or set to 0), the dbus
 # objects will persist

diff --git a/src/daemon/dbus/gumd-dbus-group-service-adapter.c b/src/daemon/dbus/gumd-dbus-group-service-adapter.c
index cc4a9c8..319ae4a 100644 (file)
--- a/src/daemon/dbus/gumd-dbus-group-service-adapter.c
+++ b/src/daemon/dbus/gumd-dbus-group-service-adapter.c
@@ -384,6 +384,10 @@ _on_bus_name_lost (
             (gpointer)&peer_group);
 
     g_hash_table_remove (self->priv->caller_watchers, (gpointer)peer_name);
+
+    if (g_list_length (self->priv->peer_groups) == 0) {
+        gum_disposable_set_auto_dispose (GUM_DISPOSABLE (self), TRUE);
+    }
 }
 
 static void

diff --git a/src/daemon/dbus/gumd-dbus-user-service-adapter.c b/src/daemon/dbus/gumd-dbus-user-service-adapter.c
index 9c15f89..eb77333 100644 (file)
--- a/src/daemon/dbus/gumd-dbus-user-service-adapter.c
+++ b/src/daemon/dbus/gumd-dbus-user-service-adapter.c
@@ -391,6 +391,10 @@ _on_bus_name_lost (
             (gpointer)&peer_user);
 
     g_hash_table_remove (self->priv->caller_watchers, (gpointer)peer_name);
+
+    if (g_list_length (self->priv->peer_users) == 0) {
+        gum_disposable_set_auto_dispose (GUM_DISPOSABLE (self), TRUE);
+    }
 }
 
 static void