Change watchdog timeout based on g_dbus_connection_call_sync() timeout of runtime...

 - Currently, muse server watchdog is set to no response for 1 minute. If there is
   no response while executing the g_dbus_connection_call_sync() operation set to 2 minutes,
   the process is terminated by deadlock. Therefore, change the muse-server watchdog time to about 2 min 20 sec.
 - Add log at ms_connection_lock/unlock

Change-Id: I61a2082c51b1cf3fc24123318a221f4b67c3a4cb

diff --git a/server/include/muse_server_watchdog.h b/server/include/muse_server_watchdog.h
index af3e7db..04dd6f3 100644 (file)
--- a/server/include/muse_server_watchdog.h
+++ b/server/include/muse_server_watchdog.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "muse_core_internal.h"
 
 #define MS_WATCHDOG_CHECK_PERIOD                       20
-#define MS_WATCHDOG_CHECK_COUNT                                3
+#define MS_WATCHDOG_CHECK_COUNT                                7
 #define MS_WATCHDOG_TIMER_PERIOD                       5
 
 typedef struct ms_watchdog {

diff --git a/server/src/muse_server_connection.c b/server/src/muse_server_connection.c
index 3972079..6508932 100644 (file)
--- a/server/src/muse_server_connection.c
+++ b/server/src/muse_server_connection.c
@@ -146,6 +146,7 @@ int ms_connection_unregister(muse_module_h m)
 void ms_connection_lock(ms_connection_t *connection)
 {
        muse_return_if_fail(connection);
+       LOGD(">>> connection lock");
        g_mutex_lock(&connection->lock);
 }
 
@@ -153,6 +154,7 @@ void ms_connection_unlock(ms_connection_t *connection)
 {
        muse_return_if_fail(connection);
        g_mutex_unlock(&connection->lock);
+       LOGD("<<< connection unlock");
 }
 
 void ms_connection_deinit(ms_connection_t *connection)