From 5b4ac2e85853a672a56eae4d17f6077f62665be3 Mon Sep 17 00:00:00 2001 From: sungrae jo Date: Thu, 21 Nov 2019 16:51:31 +0900 Subject: [PATCH 01/16] Fixed not send pcm data when data size is 0. Change-Id: Ia6788f4a70a27b34da0307e85dcf51aff339dff4 Signed-off-by: sungrae jo --- server/vcd_recorder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index 736b3a4..303590e 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -770,10 +770,10 @@ Eina_Bool __read_test_func(void *data) if (buffer_size != BUFFER_LENGTH) SLOG(LOG_DEBUG, TAG_VCD, "[Recorder test] Get data size(%d)", buffer_size); - if (NULL != g_audio_cb) + if (NULL != g_audio_cb && buffer_size != 0) g_audio_cb(buffer, buffer_size); - float vol_db = get_volume_decibel(buffer, BUFFER_LENGTH); + float vol_db = get_volume_decibel(buffer, buffer_size); if (0 != vcdc_send_set_volume(vcd_client_manager_get_pid(), vol_db)) SLOG(LOG_ERROR, TAG_VCD, "[Recorder test] Fail to send recording volume(%f)", vol_db); -- 2.7.4 From 3d3d2ec69cdf32efc5d22fcc559f404ba693d9f1 Mon Sep 17 00:00:00 2001 From: "wn.jang" Date: Fri, 22 Nov 2019 08:17:10 +0900 Subject: [PATCH 02/16] Fix buffer overflow issue Change-Id: If76e9ff42c4aaa297bf36f31ba3293816c132eb6 --- server/vcd_recorder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index 303590e..491b530 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -773,7 +773,7 @@ Eina_Bool __read_test_func(void *data) if (NULL != g_audio_cb && buffer_size != 0) g_audio_cb(buffer, buffer_size); - float vol_db = get_volume_decibel(buffer, buffer_size); + float vol_db = get_volume_decibel(buffer, BUFFER_LENGTH); if (0 != vcdc_send_set_volume(vcd_client_manager_get_pid(), vol_db)) SLOG(LOG_ERROR, TAG_VCD, "[Recorder test] Fail to send recording volume(%f)", vol_db); -- 2.7.4 From ccb3cc6d2bd2399acf3049e5d3bb31ef51796853 Mon Sep 17 00:00:00 2001 From: sungrae jo Date: Thu, 21 Nov 2019 16:55:37 +0900 Subject: [PATCH 03/16] Fixed thread to timer for prepare Change-Id: Iab3f31b2c345cf81a7e3b6f70b60c6b71211debe Signed-off-by: sungrae jo --- client/vc_mgr.c | 73 ++++++++++++++++++++++++++------------------------------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 921f04f..bb411a5 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -44,6 +44,8 @@ #define VC_MANAGER_CONFIG_HANDLE 100000 static Ecore_Timer* g_m_connect_timer = NULL; +static Ecore_Idler* g_m_connect_idler = NULL; +static int g_retry_connect_count = 0; static Ecore_Timer* g_m_set_volume_timer = NULL; @@ -77,7 +79,6 @@ static vc_audio_channel_e g_feedback_audio_channel = 0; static vc_audio_type_e g_feedback_audio_type = 0; static Ecore_Thread* g_feedback_thread = NULL; -static Ecore_Thread* g_mgr_thread = NULL; static Eina_Bool __vc_mgr_notify_state_changed(void *data); static void __vc_mgr_notify_error(void *data); @@ -358,6 +359,11 @@ int vc_mgr_deinitialize(void) ecore_timer_del(g_m_connect_timer); g_m_connect_timer = NULL; } + if (g_m_connect_idler) { + SLOG(LOG_DEBUG, TAG_VCM, "Connect idler is deleted"); + ecore_idler_del(g_m_connect_idler); + g_m_connect_idler = NULL; + } vc_config_mgr_unset_lang_cb(g_vc_m->handle + VC_MANAGER_CONFIG_HANDLE); vc_config_mgr_finalize(g_vc_m->handle + VC_MANAGER_CONFIG_HANDLE); @@ -406,7 +412,6 @@ static Eina_Bool __vc_mgr_connect_daemon(void *data) int service_state = 0; int foreground = VC_RUNTIME_INFO_NO_FOREGROUND; - g_m_connect_timer = NULL; /* check handle */ if (true == vc_mgr_client_is_valid(g_vc_m)) { @@ -431,6 +436,7 @@ static Eina_Bool __vc_mgr_connect_daemon(void *data) ecore_main_loop_thread_safe_call_async(__vc_mgr_notify_error, (void*)g_vc_m); SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + g_m_connect_idler = NULL; return EINA_FALSE; } else if (0 != ret) { @@ -489,59 +495,44 @@ static Eina_Bool __vc_mgr_connect_daemon(void *data) } } else { SLOG(LOG_ERROR, TAG_VCM, "[Not ERROR] g_vc_m is not valid. It is destroyed."); //LCOV_EXCL_LINE + g_m_connect_idler = NULL; return EINA_FALSE; } SLOG(LOG_ERROR, TAG_VCM, "@@@"); + g_m_connect_idler = NULL; return EINA_FALSE; } -static void __start_prepare_thread(void *data, Ecore_Thread *thread) +static Eina_Bool __vc_mgr_prepare_daemon(void *data) { - SLOG(LOG_ERROR, TAG_VCM, "@@@ Start prepare thread"); - int ret = 1, retry_count = 0; - /* Send hello */ - while (0 != ret) { - - if (retry_count == 10) { + if (0 != vc_mgr_dbus_request_hello()) { + if (g_retry_connect_count == 20) { + g_retry_connect_count = 0; SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to request hello !! send error to manager"); __vc_mgr_cb_error(VC_ERROR_TIMED_OUT, -1, "voice_framework.error.vcfw.connect_engine_fail"); - return; - } - - ret = vc_mgr_dbus_request_hello(); - if (ret == 0) { - SLOG(LOG_INFO, TAG_VCM, "Success to request hello. retry count(%d)", retry_count); - break; + g_m_connect_timer = NULL; + return EINA_FALSE; } else { - retry_count++; + g_retry_connect_count++; + return EINA_TRUE; } } - ret = 1; - retry_count = 0; - while (0 != ret) { - if (retry_count == 10) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to connect daemon !!"); - return; - } - ret = __vc_mgr_connect_daemon(NULL); - if (ret == 0) - break; - else - retry_count++; - } + SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Connect daemon"); - return; -} + if (NULL == g_m_connect_idler) { + SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Create a new idler for preparation"); + g_m_connect_idler = ecore_idler_add(__vc_mgr_connect_daemon, NULL); + } else { + SLOG(LOG_DEBUG, TAG_VCM, "[INFO] idler handle is already created"); + } -static void __end_prepare_thread(void *data, Ecore_Thread *thread) -{ - SLOG(LOG_INFO, TAG_VCM, "@@@ End prepare thread"); - g_mgr_thread = NULL; + g_m_connect_timer = NULL; + return EINA_FALSE; } int vc_mgr_prepare(void) @@ -571,12 +562,14 @@ int vc_mgr_prepare(void) return VC_ERROR_INVALID_STATE; } - bool is_exist = ecore_thread_check(g_mgr_thread); - if (NULL == g_mgr_thread || TRUE == is_exist) { - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Create a new thread for preparation"); + if (NULL == g_m_connect_timer) { + g_retry_connect_count = 0; + SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Create a new timer for preparation"); ecore_thread_main_loop_begin(); - g_mgr_thread = ecore_thread_run(__start_prepare_thread, __end_prepare_thread, NULL, NULL); + g_m_connect_timer = ecore_timer_add(0.02, __vc_mgr_prepare_daemon, NULL); ecore_thread_main_loop_end(); + } else { + SLOG(LOG_DEBUG, TAG_VCM, "[INFO] timer handle is already created"); } SLOG(LOG_DEBUG, TAG_VCM, "@@@"); -- 2.7.4 From 511d43c9ccae61b10fd7d60317cea34a365e9f42 Mon Sep 17 00:00:00 2001 From: sungrae jo Date: Thu, 21 Nov 2019 19:50:55 +0900 Subject: [PATCH 04/16] Added mutex lock for feedback stream Change-Id: If6d7f84e802ade5ab58c10c7a31b9787e2b9ea7a Signed-off-by: sungrae jo --- client/vc_mgr.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index bb411a5..22f070d 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -79,6 +79,8 @@ static vc_audio_channel_e g_feedback_audio_channel = 0; static vc_audio_type_e g_feedback_audio_type = 0; static Ecore_Thread* g_feedback_thread = NULL; +static pthread_mutex_t g_feedback_streaming_cb_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t g_vc_tts_streaming_cb_mutex = PTHREAD_MUTEX_INITIALIZER; static Eina_Bool __vc_mgr_notify_state_changed(void *data); static void __vc_mgr_notify_error(void *data); @@ -4012,20 +4014,26 @@ int vc_mgr_set_feedback_streaming_cb(vc_mgr_feedback_streaming_cb callback, void if (NULL == callback) return VC_ERROR_INVALID_PARAMETER; + pthread_mutex_lock(&g_feedback_streaming_cb_mutex); + vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set feedback streaming callback : A handle is not available"); + pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); return VC_ERROR_INVALID_STATE; } /* check state */ if (VC_STATE_INITIALIZED != state) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set feedback streaming callback : Current state is not 'Initialized' (%d)", state); + pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); return VC_ERROR_INVALID_STATE; } vc_mgr_client_set_feedback_streaming_cb(g_vc_m, callback, user_data); + pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); + SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set feedback streaming callback"); return 0; @@ -4043,20 +4051,26 @@ int vc_mgr_unset_feedback_streaming_cb() return VC_ERROR_PERMISSION_DENIED; } + pthread_mutex_lock(&g_feedback_streaming_cb_mutex); + vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset feedback streaming callback : A handle is not available"); + pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); return VC_ERROR_INVALID_STATE; } /* check state */ if (VC_STATE_INITIALIZED != state) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset feedback streaming callback : Current state is not 'Initialized' (%d)", state); + pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); return VC_ERROR_INVALID_STATE; } vc_mgr_client_set_feedback_streaming_cb(g_vc_m, NULL, NULL); + pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); + SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Unset feedback streaming callback"); return 0; @@ -4067,20 +4081,26 @@ int vc_mgr_set_vc_tts_streaming_cb(vc_mgr_vc_tts_streaming_cb callback, void* us if (NULL == callback) return VC_ERROR_INVALID_PARAMETER; + pthread_mutex_lock(&g_vc_tts_streaming_cb_mutex); + vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set feedback streaming callback : A handle is not available"); + pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); return VC_ERROR_INVALID_STATE; } /* check state */ if (VC_STATE_INITIALIZED != state) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set feedback streaming callback : Current state is not 'Initialized' (%d)", state); + pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); return VC_ERROR_INVALID_STATE; } vc_mgr_client_set_vc_tts_streaming_cb(g_vc_m, callback, user_data); + pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); + SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set feedback streaming callback"); return 0; @@ -4088,20 +4108,26 @@ int vc_mgr_set_vc_tts_streaming_cb(vc_mgr_vc_tts_streaming_cb callback, void* us int vc_mgr_unset_vc_tts_streaming_cb() { + pthread_mutex_lock(&g_vc_tts_streaming_cb_mutex); + vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset feedback streaming callback : A handle is not available"); + pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); return VC_ERROR_INVALID_STATE; } /* check state */ if (VC_STATE_INITIALIZED != state) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset feedback streaming callback : Current state is not 'Initialized' (%d)", state); + pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); return VC_ERROR_INVALID_STATE; } vc_mgr_client_set_vc_tts_streaming_cb(g_vc_m, NULL, NULL); + pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); + SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Unset feedback streaming callback"); return 0; @@ -4149,10 +4175,13 @@ static void __tts_feedback_thread(void* data, Ecore_Thread* thread) vc_mgr_feedback_streaming_cb callback = NULL; void* user_data = NULL; + pthread_mutex_lock(&g_feedback_streaming_cb_mutex); + vc_mgr_client_get_feedback_streaming_cb(g_vc_m, &callback, &user_data); if (NULL == callback) { SLOG(LOG_WARN, TAG_VCM, "[WARNING] TTS feedback streaming callback is null"); vc_mgr_data_clear_feedback_data(&feedback_data); + pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); return; } @@ -4161,6 +4190,8 @@ static void __tts_feedback_thread(void* data, Ecore_Thread* thread) callback(feedback_data->event, feedback_data->data, feedback_data->data_size, user_data); vc_mgr_client_not_use_callback(g_vc_m); + pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); + /* If no feedback data and EVENT_FINISH */ if (0 >= vc_mgr_data_get_feedback_data_size() && VC_FEEDBACK_EVENT_FINISH == feedback_data->event) { SLOG(LOG_INFO, TAG_VCM, "[INFO] Finish feedback"); @@ -4170,10 +4201,13 @@ static void __tts_feedback_thread(void* data, Ecore_Thread* thread) vc_mgr_vc_tts_streaming_cb callback = NULL; void* user_data = NULL; + pthread_mutex_lock(&g_vc_tts_streaming_cb_mutex); + vc_mgr_client_get_vc_tts_streaming_cb(g_vc_m, &callback, &user_data); if (NULL == callback) { SLOG(LOG_WARN, TAG_VCM, "[WARNING] vc tts streaming callback is null"); vc_mgr_data_clear_feedback_data(&feedback_data); + pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); return; } @@ -4182,6 +4216,8 @@ static void __tts_feedback_thread(void* data, Ecore_Thread* thread) callback(feedback_data->pid, feedback_data->utt_id, feedback_data->event, feedback_data->data, feedback_data->data_size, user_data); vc_mgr_client_not_use_callback(g_vc_m); + pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); + /* If no feedback data and EVENT_FINISH */ if (0 >= vc_mgr_data_get_feedback_data_size() && VC_FEEDBACK_EVENT_FINISH == feedback_data->event) { SLOG(LOG_INFO, TAG_VCM, "[INFO] Finish vc tts feedback"); -- 2.7.4 From 0c7e2e12f5157c17d91e57ed9c3c7f92569d2ee8 Mon Sep 17 00:00:00 2001 From: "wn.jang" Date: Wed, 27 Nov 2019 16:37:28 +0900 Subject: [PATCH 05/16] Fix thread unsafety issue Change-Id: I11525ef74b89518ba16c44e1d0ad111c9aa51be9 --- client/vc_widget.c | 76 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/client/vc_widget.c b/client/vc_widget.c index 89faa97..c6dcd8a 100644 --- a/client/vc_widget.c +++ b/client/vc_widget.c @@ -41,9 +41,15 @@ static Ecore_Timer* g_w_notify_result_timer = NULL; static pthread_mutex_t g_w_init_mutex = PTHREAD_MUTEX_INITIALIZER; +typedef enum { + VC_PREPARE_THREAD_NONE = 0, + VC_PREPARE_THREAD_REQUESTED = 1, + VC_PREPARE_THREAD_STARTED = 2, + VC_PREPARE_THREAD_ENDED = VC_PREPARE_THREAD_NONE +} vc_prepare_thread_status_e; + static Ecore_Thread* g_w_prepare_thread = NULL; static bool g_ask_to_cancel_preparing = false; -static bool g_is_prepare_thread_alive = false; static int g_daemon_pid = 0; @@ -242,6 +248,31 @@ static void __vc_widget_delete_timer() return; } + +static int _vc_widget_wait_to_end_thread(void) +{ + int count = 0; + SLOG(LOG_WARN, TAG_VCW, "[Widget] prepare_thread info(%p)", g_w_prepare_thread); + if (g_w_prepare_thread) { + g_ask_to_cancel_preparing = true; + SLOG(LOG_WARN, TAG_VCW, "[WARNING] The cancel preparing_thread is asked"); + } + + while (g_w_prepare_thread) { + usleep(50000); + + if (100 == count) { + SLOG(LOG_WARN, TAG_VCW, "[WARNING!!] Thread is blocked, cnt(%d)", count); + break; + } else if (0 != count && 0 == count % 5) { + SLOG(LOG_WARN, TAG_VCW, "[WARNING!!] Thread is alive, cnt(%d)", count); + } + count++; + } + SLOG(LOG_WARN, TAG_VCW, "[Widget] prepare_thread is terminated"); + return 0; +} + int vc_widget_deinitialize(vc_h vc_w) { SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Deinitialize"); @@ -261,6 +292,9 @@ int vc_widget_deinitialize(vc_h vc_w) g_ask_to_cancel_preparing = true; + /* Wait for ending thread */ + _vc_widget_wait_to_end_thread(); + vc_state_e state; vc_widget_client_get_state(vc_w, &state); vc_widget_s* widget = widget_get(vc_w); @@ -484,22 +518,20 @@ static void __start_prepare_thread(void *data, Ecore_Thread *thread) SLOG(LOG_INFO, TAG_VCW, "@@@ Start prepare thread"); int ret = -1, retry_count = 0; vc_h vc_w = (vc_h)data; - g_is_prepare_thread_alive = true; /* Send hello */ while (0 != ret) { if (g_ask_to_cancel_preparing) { SLOG(LOG_WARN, TAG_VCW, "[WARNING] Thread is canceled."); - __vc_widget_internal_unprepare(vc_w); ecore_main_loop_thread_safe_call_async(__vc_widget_delete_focus_event_handler, NULL); - g_is_prepare_thread_alive = false; + g_w_prepare_thread = NULL; return; } if (retry_count == 30) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to request hello !!"); ecore_main_loop_thread_safe_call_async(__vc_widget_delete_focus_event_handler, NULL); - g_is_prepare_thread_alive = false; + g_w_prepare_thread = NULL; return; } @@ -517,17 +549,15 @@ static void __start_prepare_thread(void *data, Ecore_Thread *thread) while (0 != ret) { if (g_ask_to_cancel_preparing) { SLOG(LOG_WARN, TAG_VCW, "[WARNING] Thread is canceled."); - __vc_widget_internal_unprepare(vc_w); ecore_main_loop_thread_safe_call_async(__vc_widget_delete_focus_event_handler, NULL); - g_is_prepare_thread_alive = false; + g_w_prepare_thread = NULL; return; } if (retry_count == 10) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to connect daemon !!"); - __vc_widget_internal_unprepare(vc_w); ecore_main_loop_thread_safe_call_async(__vc_widget_delete_focus_event_handler, NULL); - g_is_prepare_thread_alive = false; + g_w_prepare_thread = NULL; return; } ret = __vc_widget_connect_daemon((void*)vc_w); @@ -537,21 +567,19 @@ static void __start_prepare_thread(void *data, Ecore_Thread *thread) retry_count++; } + g_w_prepare_thread = NULL; SLOG(LOG_DEBUG, TAG_VCW, "@@@"); - g_is_prepare_thread_alive = false; return; } static void __end_prepare_thread(void *data, Ecore_Thread *thread) { SLOG(LOG_DEBUG, TAG_VCW, "@@@ End prepare thread"); - g_w_prepare_thread = NULL; } static void __cancel_prepare_thread(void *data, Ecore_Thread *thread) { SLOG(LOG_DEBUG, TAG_VCW, "@@@ Cancel prepare thread"); - g_w_prepare_thread = NULL; } int vc_widget_prepare(vc_h vc_w) @@ -592,7 +620,7 @@ int vc_widget_prepare(vc_h vc_w) __vc_widget_add_focus_event_handler(NULL); // Check ecore thread - if (g_w_prepare_thread && !ecore_thread_check(g_w_prepare_thread)) { + if (g_w_prepare_thread) { SLOG(LOG_INFO, TAG_VCW, "[INFO] prepare_thread is already runnning"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_NONE; @@ -615,26 +643,12 @@ int vc_widget_unprepare(vc_h vc_w) } pthread_mutex_lock(&g_w_init_mutex); - int count = 0; - SLOG(LOG_WARN, TAG_VCW, "[Widget] prepare_thread info(%p), check(%d)", g_w_prepare_thread, ecore_thread_check(g_w_prepare_thread)); - if (g_w_prepare_thread && !ecore_thread_check(g_w_prepare_thread)) { - bool ret = ecore_thread_cancel(g_w_prepare_thread); - g_ask_to_cancel_preparing = true; - SLOG(LOG_WARN, TAG_VCW, "[WARNING] Thread is alive. The cancel_thread is called, ret(%d)", ret); - } - while (g_is_prepare_thread_alive) { - usleep(50000); + /* Ask to cancel preparing thread */ + g_ask_to_cancel_preparing = true; - if (100 == count) { - SLOG(LOG_WARN, TAG_VCW, "[WARNING!!] Thread is blocked, cnt(%d)", count); - break; - } else if (0 != count && 0 == count % 5) { - SLOG(LOG_WARN, TAG_VCW, "[WARNING!!] Thread is alive, cnt(%d)", count); - } - count++; - } - SLOG(LOG_WARN, TAG_VCW, "[Widget] prepare_thread is terminated"); + /* Wait for ending thread */ + _vc_widget_wait_to_end_thread(); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { -- 2.7.4 From 1f1c00004663c5ef4187c64edebaeabe55a9f6e1 Mon Sep 17 00:00:00 2001 From: "wn.jang" Date: Fri, 29 Nov 2019 09:42:25 +0900 Subject: [PATCH 06/16] Change log level properly Change-Id: I46db153c517b7099233b759d98c9c1fc9f95c501 --- client/vc_mgr.c | 229 +++++++++++++++++++++++---------------------- client/vc_mgr_data.cpp | 10 +- client/vc_mgr_dbus.c | 170 ++++++++++++++++----------------- server/vcd_client_data.c | 72 +++++++------- server/vcd_config.c | 2 +- server/vcd_dbus.c | 60 ++++++------ server/vcd_dbus_server.c | 156 +++++++++++++++--------------- server/vcd_engine_agent.c | 54 +++++------ server/vcd_recorder.c | 79 ++++++++-------- server/vcd_server.c | 174 +++++++++++++++++----------------- server/vcd_server_data.cpp | 6 +- server/vce.c | 6 +- 12 files changed, 510 insertions(+), 508 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 22f070d..e6111d8 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -109,7 +109,7 @@ static const char* __vc_mgr_get_error_code(vc_error_e err) static void __vc_mgr_lang_changed_cb(const char* before_lang, const char* current_lang) { - SLOG(LOG_DEBUG, TAG_VCM, "Lang changed : Before lang(%s) Current lang(%s)", + SLOG(LOG_INFO, TAG_VCM, "Lang changed : Before lang(%s) Current lang(%s)", before_lang, current_lang); vc_current_language_changed_cb callback = NULL; @@ -120,7 +120,7 @@ static void __vc_mgr_lang_changed_cb(const char* before_lang, const char* curren vc_mgr_client_use_callback(g_vc_m); callback(before_lang, current_lang, lang_user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Language changed callback is called"); + SLOG(LOG_INFO, TAG_VCM, "Language changed callback is called"); } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] Language changed callback is null"); } @@ -193,7 +193,7 @@ static int __check_privilege(const char* uid, const char * privilege) pid_t pid = getpid(); char *session = cynara_session_from_pid(pid); int ret = cynara_check(p_cynara, smack_label, session, uid, privilege); - SLOG(LOG_DEBUG, TAG_VCM, "[Client]cynara_check returned %d(%s), p_cynara(%p), label(%s), session(%s), uid(%s), priv(%s)", ret, (CYNARA_API_ACCESS_ALLOWED == ret) ? "Allowed" : "Denied", p_cynara, smack_label, session, uid, privilege); + SLOG(LOG_INFO, TAG_VCM, "[Client]cynara_check returned %d(%s), p_cynara(%p), label(%s), session(%s), uid(%s), priv(%s)", ret, (CYNARA_API_ACCESS_ALLOWED == ret) ? "Allowed" : "Denied", p_cynara, smack_label, session, uid, privilege); if (session) free(session); @@ -257,7 +257,7 @@ int vc_mgr_initialize(void) if (0 != __vc_mgr_get_feature_enabled()) { - SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] not supported"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); return VC_ERROR_NOT_SUPPORTED; } @@ -527,10 +527,10 @@ static Eina_Bool __vc_mgr_prepare_daemon(void *data) SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Connect daemon"); if (NULL == g_m_connect_idler) { - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Create a new idler for preparation"); + SLOG(LOG_INFO, TAG_VCM, "[DEBUG] Create a new idler for preparation"); g_m_connect_idler = ecore_idler_add(__vc_mgr_connect_daemon, NULL); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[INFO] idler handle is already created"); + SLOG(LOG_INFO, TAG_VCM, "[INFO] idler handle is already created"); } g_m_connect_timer = NULL; @@ -542,7 +542,7 @@ int vc_mgr_prepare(void) SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Prepare"); if (0 != __vc_mgr_get_feature_enabled()) { - SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] not supported"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); return VC_ERROR_NOT_SUPPORTED; } @@ -566,12 +566,12 @@ int vc_mgr_prepare(void) if (NULL == g_m_connect_timer) { g_retry_connect_count = 0; - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Create a new timer for preparation"); + SLOG(LOG_INFO, TAG_VCM, "[DEBUG] Create a new timer for preparation"); ecore_thread_main_loop_begin(); g_m_connect_timer = ecore_timer_add(0.02, __vc_mgr_prepare_daemon, NULL); ecore_thread_main_loop_end(); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[INFO] timer handle is already created"); + SLOG(LOG_INFO, TAG_VCM, "[INFO] timer handle is already created"); } SLOG(LOG_DEBUG, TAG_VCM, "@@@"); @@ -618,7 +618,7 @@ int vc_mgr_unprepare(void) int vc_mgr_foreach_supported_languages(vc_supported_language_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Foreach Supported Language"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Foreach Supported Language"); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -718,9 +718,9 @@ int vc_mgr_get_state(vc_state_e* state) *state = temp; switch (*state) { - case VC_STATE_NONE: SLOG(LOG_DEBUG, TAG_VCM, "Current state is 'None'"); break; - case VC_STATE_INITIALIZED: SLOG(LOG_DEBUG, TAG_VCM, "Current state is 'Created'"); break; - case VC_STATE_READY: SLOG(LOG_DEBUG, TAG_VCM, "Current state is 'Ready'"); break; + case VC_STATE_NONE: SLOG(LOG_INFO, TAG_VCM, "Current state is 'None'"); break; + case VC_STATE_INITIALIZED: SLOG(LOG_INFO, TAG_VCM, "Current state is 'Created'"); break; + case VC_STATE_READY: SLOG(LOG_INFO, TAG_VCM, "Current state is 'Ready'"); break; default: SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid state"); } @@ -783,7 +783,7 @@ int vc_mgr_get_service_state(vc_service_state_e* state) int vc_mgr_set_demandable_client_rule(const char* rule) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set Demandable client rule"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Set Demandable client rule(%s)", rule); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -828,6 +828,8 @@ int vc_mgr_set_demandable_client_rule(const char* rule) int vc_mgr_unset_demandable_client_rule(void) { + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Unset Demandable client"); + if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); return VC_ERROR_NOT_SUPPORTED; @@ -1103,7 +1105,7 @@ int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to save file, type(%d), ret(%d)", i, ret); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Save file, type(%d)", i); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Save file, type(%d)", i); success_save = true; } } @@ -1211,7 +1213,7 @@ int vc_mgr_set_command_list_from_file(const char* file_path, int type) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter!!"); return VC_ERROR_INVALID_PARAMETER; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ File path: %s", file_path); + SLOG(LOG_INFO, TAG_VCM, "@@@ File path: %s", file_path); } /* check type */ @@ -1291,7 +1293,7 @@ int vc_mgr_set_preloaded_commands_from_file(const char* file_path) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter!! file_path is NULL ptr"); return VC_ERROR_INVALID_PARAMETER; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ File path: %s", file_path); + SLOG(LOG_INFO, TAG_VCM, "@@@ File path: %s", file_path); } vc_state_e state; @@ -1384,7 +1386,7 @@ int vc_mgr_set_audio_type(const char* audio_id) } } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set audio type"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set audio type"); /* Save */ vc_mgr_client_set_audio_type(g_vc_m, audio_id); } @@ -1536,20 +1538,20 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) /* There is no foreground app for voice control */ SLOG(LOG_WARN, TAG_VCM, "[Manager WARNING] No foreground pid for voice control"); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Foreground pid(%d)", fg_pid); + SLOG(LOG_INFO, TAG_VCM, "[Manager] Foreground pid(%d)", fg_pid); } if (0 != vc_mgr_client_get_pid(g_vc_m, &mgr_pid)) { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Fail to get manager pid"); + SLOG(LOG_ERROR, TAG_VCM, "[Manager] Fail to get manager pid"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Manager pid(%d)", mgr_pid); + SLOG(LOG_INFO, TAG_VCM, "[Manager] Manager pid(%d)", mgr_pid); } /* Get system command */ ret = vc_cmd_parser_append_commands(mgr_pid, VC_COMMAND_TYPE_SYSTEM, temp_list); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] No system commands"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] No system commands"); } /* Request */ @@ -1571,7 +1573,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) } } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set client info"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set client info"); } } @@ -1581,7 +1583,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) bool is_fgpid = false; if (0 != vc_info_parser_get_client_info(&client_info_list)) { - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] No client"); + SLOG(LOG_INFO, TAG_VCM, "[DEBUG] No client"); return 0; } @@ -1602,7 +1604,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) /* Get foreground commands and widget */ if (true == is_fgpid) { /* Get handle */ - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] fore cmd(%d)", client_info->fg_cmd); + SLOG(LOG_INFO, TAG_VCM, "[Manager] fore cmd(%d)", client_info->fg_cmd); /* Get foreground command */ if (true == client_info->fg_cmd) { @@ -1611,16 +1613,16 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) SLOG(LOG_ERROR, TAG_VCM, "[Client Data ERROR] Fail to get the fg command list"); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] No foreground commands"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] No foreground commands"); } /* Check exclusive option */ if (true == client_info->exclusive_cmd) { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Exclusive command is ON"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] Exclusive command is ON"); /* Set background command for exclusive option */ if (true == client_info->bg_cmd) { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Set background command"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] Set background command"); ret = vc_cmd_parser_append_commands(client_info->pid, VC_COMMAND_TYPE_BACKGROUND, temp_list); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[Client Data ERROR] Fail to get the bg command list : pid(%d)", client_info->pid); @@ -1644,7 +1646,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) return 0; } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] No foreground app"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] No foreground app"); } /* Get background commands */ @@ -1655,7 +1657,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) client_info = iter->data; if (NULL != client_info) { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Pid(%d) Back cmd(%d)", client_info->pid, client_info->bg_cmd); + SLOG(LOG_INFO, TAG_VCM, "[Manager] Pid(%d) Back cmd(%d)", client_info->pid, client_info->bg_cmd); if (true == client_info->bg_cmd) { ret = vc_cmd_parser_append_commands(client_info->pid, VC_COMMAND_TYPE_BACKGROUND, temp_list); if (0 != ret) { @@ -1670,7 +1672,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) } } else { /* NO client */ - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] No background commands"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] No background commands"); } SLOG(LOG_ERROR, TAG_VCM, "@@@"); @@ -1680,7 +1682,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) int vc_mgr_set_recognition_mode(vc_recognition_mode_e mode) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set recognition mode = %d", mode); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Set recognition mode = %d", mode); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -1755,13 +1757,13 @@ int vc_mgr_get_recognition_mode(vc_recognition_mode_e* mode) return ret; } - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get recognition mode = %d", *mode); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Get recognition mode = %d", *mode); return 0; } int vc_mgr_set_private_data(const char* key, const char* data) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set private data"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Set private data"); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -1803,7 +1805,7 @@ int vc_mgr_set_private_data(const char* key, const char* data) int ret = -1; ret = vc_mgr_dbus_request_set_private_data(g_vc_m->handle, key, data); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Fail to set private data : %s", __vc_mgr_get_error_code(ret)); + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to set private data : %s", __vc_mgr_get_error_code(ret)); return ret; } else { SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set private data"); @@ -1863,7 +1865,7 @@ int vc_mgr_get_private_data(const char* key, char** data) ret = vc_mgr_dbus_request_get_private_data(g_vc_m->handle, key, &temp); if (0 != ret) { if (VC_ERROR_TIMED_OUT != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Fail to get private data request : %s", __vc_mgr_get_error_code(ret)); + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to get private data request : %s", __vc_mgr_get_error_code(ret)); break; } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] retry get private data request : %s", __vc_mgr_get_error_code(ret)); @@ -1875,7 +1877,7 @@ int vc_mgr_get_private_data(const char* key, char** data) } } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Get private data, key(%s), data(%s)", key, temp); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Get private data, key(%s), data(%s)", key, temp); } } @@ -1937,7 +1939,7 @@ int vc_mgr_set_domain(const char* domain) ret = vc_mgr_dbus_request_set_domain(g_vc_m->handle, domain); if (0 != ret) { if (VC_ERROR_TIMED_OUT != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Fail to set domain request : %s", __vc_mgr_get_error_code(ret)); + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to set domain request : %s", __vc_mgr_get_error_code(ret)); break; } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] retry set domain request : %s", __vc_mgr_get_error_code(ret)); @@ -1949,7 +1951,7 @@ int vc_mgr_set_domain(const char* domain) } } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set domain"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set domain"); } } SLOG(LOG_DEBUG, TAG_VCM, "@@@"); @@ -1959,7 +1961,7 @@ int vc_mgr_set_domain(const char* domain) int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] do action"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] do action"); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -2006,10 +2008,10 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) int ret = -1; ret = vc_mgr_dbus_request_do_action(g_vc_m->handle, type, send_event); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Fail to do action request : %s", __vc_mgr_get_error_code(ret)); + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to do action request : %s", __vc_mgr_get_error_code(ret)); return ret; } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] do action"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] do action"); } SLOG(LOG_DEBUG, TAG_VCM, "@@@"); @@ -2018,7 +2020,7 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) int vc_mgr_send_specific_engine_request(const char* engine_app_id, const char* event, const char* request) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] send specific engine request"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] send specific engine request"); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -2029,7 +2031,7 @@ int vc_mgr_send_specific_engine_request(const char* engine_app_id, const char* e return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] specific engine request. engine app id(%s), event(%s), request(%s)", engine_app_id, event, request); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] specific engine request. engine app id(%s), event(%s), request(%s)", engine_app_id, event, request); if (NULL == engine_app_id || NULL == event) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); @@ -2066,10 +2068,10 @@ int vc_mgr_send_specific_engine_request(const char* engine_app_id, const char* e int ret = -1; ret = vc_mgr_dbus_send_specific_engine_request(g_vc_m->handle, engine_app_id, event, request); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Fail to specific engine request : %s", __vc_mgr_get_error_code(ret)); + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to specific engine request : %s", __vc_mgr_get_error_code(ret)); return ret; } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] specific engine request"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] specific engine request"); } SLOG(LOG_DEBUG, TAG_VCM, "@@@"); @@ -2157,7 +2159,7 @@ int vc_mgr_start(bool exclusive_command_option) } } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] start recognition"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] start recognition"); } } @@ -2228,7 +2230,7 @@ int vc_mgr_stop(void) ret = vc_mgr_dbus_request_stop(g_vc_m->handle); if (0 != ret) { if (VC_ERROR_TIMED_OUT != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Fail to stop request : %s", __vc_mgr_get_error_code(ret)); + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to stop request : %s", __vc_mgr_get_error_code(ret)); vc_mgr_client_set_internal_state(g_vc_m, VC_INTERNAL_STATE_NONE); break; } else { @@ -2242,7 +2244,7 @@ int vc_mgr_stop(void) } } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Stop recognition"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Stop recognition"); } } @@ -2253,7 +2255,7 @@ int vc_mgr_stop(void) int vc_mgr_cancel(void) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request cancel"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Request cancel"); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -2321,7 +2323,7 @@ int vc_mgr_cancel(void) } } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Cancel recognition"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Cancel recognition"); } } @@ -2338,7 +2340,7 @@ static Eina_Bool __vc_mgr_set_volume(void* data) g_cnt++; g_volume_db = g_prev_volume_db + (g_cur_volume_db - g_prev_volume_db) / 5 * g_cnt; - SLOG(LOG_DEBUG, TAG_VCM, "Set volume (%f)(%f)", g_volume_db, g_cur_volume_db); + SLOG(LOG_INFO, TAG_VCM, "Set volume (%f)(%f)", g_volume_db, g_cur_volume_db); if (0 == g_cnt % 5) { return EINA_FALSE; @@ -2410,7 +2412,7 @@ int __vc_mgr_cb_set_foreground(int pid, bool value) if (true == value) { /* compare & set valid */ if (tmp_pid != pid) { - SLOG(LOG_DEBUG, TAG_VCM, "Authority(%d) changed to invalid", tmp_pid); + SLOG(LOG_INFO, TAG_VCM, "Authority(%d) changed to invalid", tmp_pid); /* set authorized valid */ if (true == vc_mgr_client_is_authorized_client(g_vc_m, pid)) { @@ -2423,7 +2425,7 @@ int __vc_mgr_cb_set_foreground(int pid, bool value) } } else { if (tmp_pid == pid) { - SLOG(LOG_DEBUG, TAG_VCM, "Authority(%d) changed to invalid", tmp_pid); + SLOG(LOG_INFO, TAG_VCM, "Authority(%d) changed to invalid", tmp_pid); vc_mgr_client_set_valid_authorized_client(g_vc_m, -1); } } @@ -2433,7 +2435,7 @@ int __vc_mgr_cb_set_foreground(int pid, bool value) int vc_mgr_set_selected_results(vc_cmd_list_h vc_cmd_list) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Select result"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Select result"); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -2480,7 +2482,7 @@ int vc_mgr_set_selected_results(vc_cmd_list_h vc_cmd_list) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to send result selection : %s", __vc_mgr_get_error_code(ret)); return ret; } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] result selection"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] result selection"); } vc_mgr_client_unset_all_result(g_vc_m); @@ -2572,11 +2574,11 @@ static void __vc_mgr_notify_all_result(vc_result_type_e result_type) vc_cmd_list_get_count(vc_cmd_list, &count); if (0 < count) { if (true == cb_ret) { - SLOG(LOG_DEBUG, TAG_VCM, "Callback result is true"); + SLOG(LOG_INFO, TAG_VCM, "Callback result is true"); if (VC_RESULT_TYPE_NOTIFICATION != result_type) ecore_idler_add(__vc_mgr_set_select_result, NULL); } else { - SLOG(LOG_DEBUG, TAG_VCM, "Callback result is false"); + SLOG(LOG_INFO, TAG_VCM, "Callback result is false"); /* need to select conflicted result */ } } else { @@ -2673,7 +2675,7 @@ void __vc_mgr_cb_pre_result(vc_pre_result_event_e event, const char* pre_result) vc_mgr_client_use_callback(g_vc_m); callback(event, pre_result, user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Pre result callback is called"); + SLOG(LOG_INFO, TAG_VCM, "Pre result callback is called"); return; } @@ -2698,7 +2700,7 @@ static Eina_Bool __vc_mgr_speech_detected(void *data) vc_mgr_client_use_callback(g_vc_m); callback(user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Speech detected callback called"); + SLOG(LOG_INFO, TAG_VCM, "Speech detected callback called"); return EINA_FALSE; } @@ -2738,7 +2740,7 @@ int vc_mgr_set_all_result_cb(vc_mgr_all_result_cb callback, void* user_data) vc_mgr_client_set_all_result_cb(g_vc_m, callback, user_data); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set all result callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set all result callback"); return 0; } @@ -2746,7 +2748,7 @@ int vc_mgr_set_all_result_cb(vc_mgr_all_result_cb callback, void* user_data) int vc_mgr_unset_all_result_cb(void) { if (0 != __vc_mgr_get_feature_enabled()) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] not supported"); return VC_ERROR_NOT_SUPPORTED; } @@ -2947,7 +2949,7 @@ static void __vc_mgr_notify_error(void *data) callback(reason, user_data); g_err_callback_status = false; vc_mgr_client_not_use_callback(vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Error callback is called"); + SLOG(LOG_INFO, TAG_VCM, "Error callback is called"); } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] Error callback is null"); } @@ -3012,7 +3014,7 @@ static Eina_Bool __vc_mgr_notify_state_changed(void *data) vc_mgr_client_use_callback(g_vc_m); changed_callback(before_state, current_state, user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "State changed callback is called"); + SLOG(LOG_INFO, TAG_VCM, "State changed callback is called"); } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] State changed callback is null"); } @@ -3048,7 +3050,7 @@ int vc_mgr_set_state_changed_cb(vc_state_changed_cb callback, void* user_data) vc_mgr_client_set_state_changed_cb(g_vc_m, callback, user_data); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set state changed callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set state changed callback"); return 0; } @@ -3086,7 +3088,7 @@ int __vc_mgr_cb_service_state(int state) vc_service_state_e before_state; vc_mgr_client_get_service_state(g_vc_m, &before_state); - SLOG(LOG_DEBUG, TAG_VCM, "Service State changed : Before(%d) Current(%d)", + SLOG(LOG_INFO, TAG_VCM, "Service State changed : Before(%d) Current(%d)", before_state, current_state); vc_internal_state_e internal_state = -1; @@ -3094,11 +3096,11 @@ int __vc_mgr_cb_service_state(int state) if ((VC_INTERNAL_STATE_STARTING == internal_state && VC_SERVICE_STATE_RECORDING == current_state) || (VC_INTERNAL_STATE_STOPPING == internal_state && VC_SERVICE_STATE_PROCESSING == current_state) || (VC_INTERNAL_STATE_CANCELING == internal_state && VC_SERVICE_STATE_READY == current_state)) { - SLOG(LOG_DEBUG, TAG_VCM, "Internal state is changed to NONE"); + SLOG(LOG_INFO, TAG_VCM, "Internal state is changed to NONE"); vc_mgr_client_set_internal_state(g_vc_m, VC_INTERNAL_STATE_NONE); } if (VC_SERVICE_STATE_UPDATING == current_state) { - SLOG(LOG_DEBUG, TAG_VCM, "Internal state is changed to NONE by updating"); + SLOG(LOG_INFO, TAG_VCM, "Internal state is changed to NONE by updating"); vc_mgr_client_set_internal_state(g_vc_m, VC_INTERNAL_STATE_NONE); } @@ -3119,7 +3121,7 @@ int __vc_mgr_cb_service_state(int state) vc_mgr_client_use_callback(g_vc_m); callback(before_state, current_state, service_user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Service state changed callback is called"); + SLOG(LOG_INFO, TAG_VCM, "Service state changed callback is called"); } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] Service state changed callback is null"); } @@ -3155,7 +3157,7 @@ int vc_mgr_set_service_state_changed_cb(vc_service_state_changed_cb callback, vo vc_mgr_client_set_service_state_changed_cb(g_vc_m, callback, user_data); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set service state changed callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set service state changed callback"); return 0; } @@ -3214,7 +3216,7 @@ int vc_mgr_set_speech_detected_cb(vc_mgr_begin_speech_detected_cb callback, void vc_mgr_client_set_speech_detected_cb(g_vc_m, callback, user_data); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set speech detected callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set speech detected callback"); return 0; } @@ -3273,7 +3275,7 @@ int vc_mgr_set_current_language_changed_cb(vc_current_language_changed_cb callba vc_mgr_client_set_current_lang_changed_cb(g_vc_m, callback, user_data); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set current language changed callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set current language changed callback"); return 0; } @@ -3375,7 +3377,7 @@ int __vc_mgr_cb_dialog(int pid, const char* disp_text, const char* utt_text, boo vc_mgr_client_use_callback(g_vc_m); callback(pid, disp_text, utt_text, continuous, user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Dialog callback is called, disp_text(%s), utt)text(%s), continuous(%d)", disp_text, utt_text, continuous); + SLOG(LOG_INFO, TAG_VCM, "Dialog callback is called, disp_text(%s), utt)text(%s), continuous(%d)", disp_text, utt_text, continuous); } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] Error callback is null"); } @@ -3395,7 +3397,7 @@ int __vc_mgr_cb_private_data_set(const char* key, const char* data) vc_mgr_client_use_callback(g_vc_m); ret = callback(key, data, user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Private data set callback is called"); + SLOG(LOG_INFO, TAG_VCM, "Private data set callback is called"); } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] Private data set callback is null"); } @@ -3415,7 +3417,7 @@ int __vc_mgr_cb_private_data_requested(const char* key, char** data) vc_mgr_client_use_callback(g_vc_m); ret = callback(key, data, user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Private data requested callback is called"); + SLOG(LOG_INFO, TAG_VCM, "Private data requested callback is called"); } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] Private data requested callback is null"); } @@ -3440,7 +3442,7 @@ int __vc_mgr_cb_feedback_audio_format(int rate, vc_audio_channel_e channel, vc_a vc_mgr_client_use_callback(g_vc_m); callback(rate, channel, audio_type, user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "TTS feedback audio format callback is called"); + SLOG(LOG_INFO, TAG_VCM, "TTS feedback audio format callback is called"); } else { SLOG(LOG_WARN, TAG_VCM, "[WARNING] TTS feedback audio format callback is null"); } @@ -3691,7 +3693,7 @@ static bool __vc_mgr_check_demandable_client(int pid) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to get callee appid by pid"); return false; } - SLOG(LOG_DEBUG, TAG_VCM, "[CHECK] Appid - %s", appid); + SLOG(LOG_INFO, TAG_VCM, "[CHECK] Appid - %s", appid); GSList *iter = NULL; vc_demandable_client_s* temp_client; @@ -3777,7 +3779,7 @@ int __vc_mgr_request_auth_disable(int pid) static Eina_Bool __request_auth_start(void* data) { - SLOG(LOG_DEBUG, TAG_VCM, "Request Start"); + SLOG(LOG_INFO, TAG_VCM, "Request Start"); if (0 != vc_mgr_client_set_start_by_client(g_vc_m, true)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to set start by client"); @@ -3812,7 +3814,7 @@ int __vc_mgr_request_auth_start(int pid) static Eina_Bool __request_auth_stop(void* data) { - SLOG(LOG_DEBUG, TAG_VCM, "Request Stop"); + SLOG(LOG_INFO, TAG_VCM, "Request Stop"); if (0 != vc_mgr_stop()) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Request stop is failed"); @@ -3838,7 +3840,7 @@ int __vc_mgr_request_auth_stop(int pid) static Eina_Bool __request_auth_cancel(void* data) { - SLOG(LOG_DEBUG, TAG_VCM, "Request Cancel"); + SLOG(LOG_INFO, TAG_VCM, "Request Cancel"); if (0 != vc_mgr_cancel()) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Request cancel is failed"); @@ -3928,7 +3930,7 @@ void __vc_mgr_cb_specific_engine_result(const char* engine_app_id, const char* e vc_mgr_client_use_callback(g_vc_m); callback(engine_app_id, event, result, user_data); vc_mgr_client_not_use_callback(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "Specific engine result callback is called, engine app id(%s), event(%s), result(%s)", engine_app_id, event, result); + SLOG(LOG_INFO, TAG_VCM, "Specific engine result callback is called, engine app id(%s), event(%s), result(%s)", engine_app_id, event, result); return; } @@ -3936,7 +3938,7 @@ void __vc_mgr_cb_specific_engine_result(const char* engine_app_id, const char* e /* for TTS feedback */ int vc_mgr_set_feedback_audio_format_cb(vc_mgr_feedback_audio_format_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] set feedback audio format"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] set feedback audio format"); if (0 != __vc_mgr_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; @@ -3963,14 +3965,14 @@ int vc_mgr_set_feedback_audio_format_cb(vc_mgr_feedback_audio_format_cb callback vc_mgr_client_set_feedback_audio_format_cb(g_vc_m, callback, user_data); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set feedback audio format callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set feedback audio format callback"); return 0; } int vc_mgr_unset_feedback_audio_format_cb() { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] unset feedback audio format"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] unset feedback audio format"); if (0 != __vc_mgr_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; @@ -3994,14 +3996,14 @@ int vc_mgr_unset_feedback_audio_format_cb() vc_mgr_client_set_feedback_audio_format_cb(g_vc_m, NULL, NULL); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Unset feedback audio format callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Unset feedback audio format callback"); return 0; } int vc_mgr_set_feedback_streaming_cb(vc_mgr_feedback_streaming_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] set feedback streaming"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] set feedback streaming"); if (0 != __vc_mgr_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; @@ -4034,14 +4036,14 @@ int vc_mgr_set_feedback_streaming_cb(vc_mgr_feedback_streaming_cb callback, void pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set feedback streaming callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set feedback streaming callback"); return 0; } int vc_mgr_unset_feedback_streaming_cb() { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] unset feedback streaming"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] unset feedback streaming"); if (0 != __vc_mgr_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; @@ -4071,7 +4073,7 @@ int vc_mgr_unset_feedback_streaming_cb() pthread_mutex_unlock(&g_feedback_streaming_cb_mutex); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Unset feedback streaming callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Unset feedback streaming callback"); return 0; } @@ -4101,7 +4103,7 @@ int vc_mgr_set_vc_tts_streaming_cb(vc_mgr_vc_tts_streaming_cb callback, void* us pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set feedback streaming callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set feedback streaming callback"); return 0; } @@ -4128,14 +4130,14 @@ int vc_mgr_unset_vc_tts_streaming_cb() pthread_mutex_unlock(&g_vc_tts_streaming_cb_mutex); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Unset feedback streaming callback"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Unset feedback streaming callback"); return 0; } static void __tts_feedback_thread(void* data, Ecore_Thread* thread) { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Start thread"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Start thread"); vc_feedback_data_s* feedback_data = NULL; @@ -4147,7 +4149,7 @@ static void __tts_feedback_thread(void* data, Ecore_Thread* thread) ret = vc_mgr_data_get_feedback_data(&feedback_data); if (0 != ret || NULL == feedback_data) { /* empty queue */ - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] No feedback data. Waiting mode"); + SLOG(LOG_INFO, TAG_VCM, "[DEBUG] No feedback data. Waiting mode"); /* waiting */ while (1) { @@ -4232,13 +4234,13 @@ static void __tts_feedback_thread(void* data, Ecore_Thread* thread) static void __end_tts_feedback_thread(void* data, Ecore_Thread* thread) { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] End thread"); + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] End thread"); g_feedback_thread = NULL; } int vc_mgr_start_feedback(void) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] start feedback"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] start feedback"); if (0 != __vc_mgr_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; @@ -4248,7 +4250,7 @@ int vc_mgr_start_feedback(void) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request start TTS feedback"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Request start TTS feedback"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -4281,7 +4283,7 @@ int vc_mgr_start_feedback(void) int vc_mgr_stop_feedback(void) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] stop feedback"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] stop feedback"); if (0 != __vc_mgr_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; @@ -4291,7 +4293,7 @@ int vc_mgr_stop_feedback(void) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request stop TTS feedback"); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] Request stop TTS feedback"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -4337,7 +4339,7 @@ int vc_mgr_stop_feedback(void) int vc_mgr_send_utterance_status(int pid, int utt_id, int utt_status) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] send utterance status, pid(%d), utt_id(%d), utt_status(%d)", pid, utt_id, utt_status); + SLOG(LOG_INFO, TAG_VCM, "@@@ [Manager] send utterance status, pid(%d), utt_id(%d), utt_status(%d)", pid, utt_id, utt_status); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -4362,14 +4364,13 @@ int vc_mgr_send_utterance_status(int pid, int utt_id, int utt_status) return VC_ERROR_INVALID_STATE; } - int ret = -1; - ret = vc_mgr_dbus_send_utterance_status(pid, utt_id, utt_status); - if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Fail to send utterance status : %s", __vc_mgr_get_error_code(ret)); + int ret = vc_mgr_dbus_send_utterance_status(pid, utt_id, utt_status); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to send utterance status : %s", __vc_mgr_get_error_code(ret)); return ret; - } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Send utterance status"); - } + } else { + SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Send utterance status"); + } SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; @@ -4377,7 +4378,7 @@ int vc_mgr_send_utterance_status(int pid, int utt_id, int utt_status) int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* buffer, unsigned int len) { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Send audio streaming to the engine service"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] Send audio streaming to the engine service"); if (NULL == buffer) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); @@ -4423,7 +4424,7 @@ int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* if (0 != ret) { SLOG(LOG_WARN, TAG_VCM, "[WARNING] retry to send audio streaming data"); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Success to send"); + SLOG(LOG_INFO, TAG_VCM, "[DEBUG] Success to send"); } return ret; @@ -4431,7 +4432,7 @@ int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* int vc_mgr_set_audio_streaming_mode(vc_audio_streaming_mode_e streaming_mode) { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Set multi assistant mode"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] Set multi assistant mode"); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -4506,7 +4507,7 @@ int __vc_change_system_volume(vc_system_volume_event_e volume_event) ret = sound_manager_create_stream_information_internal(stream_type, NULL, NULL, &g_stream_for_volume_h); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Fail to create stream information, ret(%d)", ret); + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to create stream information, ret(%d)", ret); return VC_ERROR_OPERATION_FAILED; } @@ -4577,7 +4578,7 @@ int __vc_recover_system_volume() int vc_mgr_change_system_volume(vc_system_volume_event_e volume_event) { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] Change system volume, volume_event(%d)", volume_event); + SLOG(LOG_INFO, TAG_VCM, "[Manager] Change system volume, volume_event(%d)", volume_event); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -4607,14 +4608,14 @@ int vc_mgr_change_system_volume(vc_system_volume_event_e volume_event) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to change volume"); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Success to change volume"); + SLOG(LOG_INFO, TAG_VCM, "[DEBUG] Success to change volume"); } return ret; } int vc_mgr_recover_system_volume() { - SLOG(LOG_DEBUG, TAG_VCM, "[Manager] recover system volume"); + SLOG(LOG_INFO, TAG_VCM, "[Manager] recover system volume"); if (0 != __vc_mgr_get_feature_enabled()) { SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); @@ -4644,7 +4645,7 @@ int vc_mgr_recover_system_volume() if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to recover volume"); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Success to recover volume"); + SLOG(LOG_INFO, TAG_VCM, "[DEBUG] Success to recover volume"); } return ret; } diff --git a/client/vc_mgr_data.cpp b/client/vc_mgr_data.cpp index 26482c1..53adae3 100644 --- a/client/vc_mgr_data.cpp +++ b/client/vc_mgr_data.cpp @@ -35,7 +35,7 @@ int vc_mgr_data_add_feedback_data(vc_feedback_data_s* data) SLOG(LOG_ERROR, TAG_VCM, "[DATA ERROR] feedback data is NULL"); return VC_ERROR_INVALID_PARAMETER; } - SLOG(LOG_DEBUG, TAG_VCM, "[DATA] feedback_data : %p", data); + SLOG(LOG_INFO, TAG_VCM, "[DATA] feedback_data : %p", data); pthread_mutex_lock(&g_feedback_data_mutex); @@ -57,12 +57,12 @@ int vc_mgr_data_add_feedback_data(vc_feedback_data_s* data) int vc_mgr_data_get_feedback_data(vc_feedback_data_s** data) { - SLOG(LOG_DEBUG, TAG_VCM, "[DATA] feedback_data : %p", *data); + SLOG(LOG_INFO, TAG_VCM, "[DATA] feedback_data : %p", *data); pthread_mutex_lock(&g_feedback_data_mutex); if (0 == g_feedback_data.size()) { - SLOG(LOG_DEBUG, TAG_VCM, "[DATA] There is no feedback data"); + SLOG(LOG_INFO, TAG_VCM, "[DATA] There is no feedback data"); *data = NULL; pthread_mutex_unlock(&g_feedback_data_mutex); @@ -96,13 +96,13 @@ int vc_mgr_data_get_feedback_data_size() int vc_mgr_data_clear_feedback_data(vc_feedback_data_s** data) { - SLOG(LOG_DEBUG, TAG_VCM, "[DATA] clear feedback data, empty(%d)", g_feedback_data.empty()); + SLOG(LOG_INFO, TAG_VCM, "[DATA] clear feedback data, empty(%d)", g_feedback_data.empty()); pthread_mutex_lock(&g_feedback_data_mutex); if (!g_feedback_data.empty()) { if (NULL != *data) { - SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] pid(%d), utt_id(%d), data(%p) size(%d) rate(%d)", (*data)->pid, (*data)->utt_id, (*data)->data, (*data)->data_size, (*data)->rate); + SLOG(LOG_INFO, TAG_VCM, "[DEBUG] pid(%d), utt_id(%d), data(%p) size(%d) rate(%d)", (*data)->pid, (*data)->utt_id, (*data)->data, (*data)->data_size, (*data)->rate); if (NULL != (*data)->data) { free((*data)->data); diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c index caf56e9..ab64df0 100644 --- a/client/vc_mgr_dbus.c +++ b/client/vc_mgr_dbus.c @@ -173,7 +173,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VCD_MANAGER_METHOD_SET_SERVICE_STATE */ else if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_SPEECH_DETECTED)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get Speech detected"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get Speech detected"); __vc_mgr_cb_speech_detected(); @@ -182,7 +182,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VCD_MANAGER_METHOD_SPEECH_DETECTED */ else if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_ALL_RESULT)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get All Result"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get All Result"); int result_type = 0; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &result_type, DBUS_TYPE_INVALID); @@ -194,7 +194,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VCD_MANAGER_METHOD_ALL_RESULT */ else if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_PRE_RESULT)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get Pre Result"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get Pre Result"); int event; char* pre_result = NULL; @@ -207,7 +207,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_PRE_RESULT */ else if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_SPECIFIC_ENGINE_RESULT)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get specific engine result"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get specific engine result"); char* engine_app_id = NULL; char* event = NULL; char* result = NULL; @@ -221,7 +221,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_SPECIFIC_ENGINE_RESULT */ else if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_RESULT)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get System Result"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get System Result"); __vc_mgr_cb_system_result(); @@ -230,7 +230,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VCD_MANAGER_METHOD_RESULT */ else if (dbus_message_is_signal(msg, if_name, VCC_MANAGER_METHOD_SET_FOREGROUND)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Set foreground"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Set foreground"); int pid = 0; int value = 0; @@ -243,14 +243,14 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_VCM, "@@ foreground changed : pid(%d) value(%s)", pid, value ? "true" : "false"); + SLOG(LOG_INFO, TAG_VCM, "@@ foreground changed : pid(%d) value(%s)", pid, value ? "true" : "false"); __vc_mgr_cb_set_foreground(pid, (bool)value); SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCC_MANAGER_METHOD_SET_FOREGROUND */ else if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_DIALOG)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Request Dialog"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Request Dialog"); int pid = -1; char* disp_text = NULL; char* utt_text = NULL; @@ -306,7 +306,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VCD_MANAGER_METHOD_ERROR */ else if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_SET_PRIVATE_DATA)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request set private data"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get request set private data"); int pid = 0; char* key = NULL; char* private_data = NULL; @@ -323,7 +323,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } if (pid > 0) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr get request set private data : pid(%d) ", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr get request set private data : pid(%d) ", pid); __vc_mgr_cb_private_data_set(key, private_data); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get request set private data : invalid pid "); @@ -333,7 +333,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VCD_MANAGER_METHOD_SET_PRIVATE_DATA */ else if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_GET_PRIVATE_DATA)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request get private data"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get request get private data"); int pid = 0; int ret = -1; char* key = NULL; @@ -350,7 +350,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } if (pid > 0) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr get request get private data : pid(%d) ", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr get request get private data : pid(%d) ", pid); ret = __vc_mgr_cb_private_data_requested(key, &temp); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get request get private data : invalid pid "); @@ -365,7 +365,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) SLOG(LOG_ERROR, TAG_VCM, "@@ vc get request get private data : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc get request get private data : result(%d)", ret); + SLOG(LOG_INFO, TAG_VCM, "@@ vc get request get private data : result(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); @@ -418,7 +418,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd /* Authority */ else if (dbus_message_is_method_call(msg, if_name, VC_METHOD_AUTH_ENABLE)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth enable"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get request auth enable"); int pid; int ret = 0; @@ -430,7 +430,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth enable : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth enable : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth enable : pid(%d)", pid); ret = __vc_mgr_request_auth_enable(pid); } @@ -444,7 +444,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth enable : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth enable : ret(%d)", ret); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth enable : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { @@ -455,7 +455,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VC_METHOD_AUTH_ENABLE */ else if (dbus_message_is_method_call(msg, if_name, VC_METHOD_AUTH_DISABLE)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth disable"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get request auth disable"); int pid; int ret = 0; @@ -467,7 +467,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth disable : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth disable : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth disable : pid(%d)", pid); ret = __vc_mgr_request_auth_disable(pid); } @@ -481,7 +481,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth disable : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth disable : ret(%d)", ret); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth disable : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { @@ -492,7 +492,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VC_METHOD_AUTH_DISABLE */ else if (dbus_message_is_method_call(msg, if_name, VC_METHOD_AUTH_START)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth start"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get request auth start"); int pid; int ret = 0; @@ -504,7 +504,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth start : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth start : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth start : pid(%d)", pid); ret = __vc_mgr_request_auth_start(pid); } @@ -518,7 +518,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth start : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth start : ret(%d)", ret); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth start : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { @@ -529,7 +529,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VC_METHOD_AUTH_START */ else if (dbus_message_is_method_call(msg, if_name, VC_METHOD_AUTH_STOP)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth stop"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get request auth stop"); int pid; int ret = 0; @@ -541,7 +541,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth stop : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth stop : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth stop : pid(%d)", pid); ret = __vc_mgr_request_auth_stop(pid); } @@ -555,7 +555,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth stop : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth stop : ret(%d)", ret); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth stop : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { @@ -566,7 +566,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VC_METHOD_AUTH_STOP */ else if (dbus_message_is_method_call(msg, if_name, VC_METHOD_AUTH_CANCEL)) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth cancel"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Get request auth cancel"); int pid; int ret = 0; @@ -578,7 +578,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth cancel : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr request auth cancel : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr request auth cancel : pid(%d)", pid); ret = __vc_mgr_request_auth_cancel(pid); } @@ -592,7 +592,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) SLOG(LOG_ERROR, TAG_VCM, "@@ vc request auth cancel : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc request auth cancel : ret(%d)", ret); + SLOG(LOG_INFO, TAG_VCM, "@@ vc request auth cancel : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { @@ -603,7 +603,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } /* VC_METHOD_AUTH_CANCEL */ else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ Owner Changed"); + SLOG(LOG_INFO, TAG_VCM, "@@@ Owner Changed"); /* remove a rule for daemon error */ DBusError err; /* initialize the error value */ @@ -835,7 +835,7 @@ int vc_mgr_dbus_reconnect() return -1; } - SLOG(LOG_DEBUG, TAG_VCM, "[DBUS] Reconnect"); + SLOG(LOG_INFO, TAG_VCM, "[DBUS] Reconnect"); } return 0; @@ -878,7 +878,7 @@ int vc_mgr_dbus_request_hello() result_msg = dbus_connection_send_with_reply_and_block(g_m_conn_sender, msg, g_m_waiting_short_time, &err); if (dbus_error_is_set(&err)) { - SLOG(LOG_DEBUG, TAG_VCM, "[ERROR] Dbus Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Dbus Error (%s)", err.message); dbus_error_free(&err); } @@ -1077,7 +1077,7 @@ int vc_mgr_dbus_request_finalize(int pid) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr finalize : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr finalize : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr finalize : pid(%d)", pid); } dbus_message_append_args(msg, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); @@ -1107,7 +1107,7 @@ int vc_mgr_dbus_request_finalize(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr finalize : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr finalize : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr finalize : result = %d", result); } @@ -1157,7 +1157,7 @@ int vc_mgr_dbus_request_set_command(int pid) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set command : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set command : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr set command : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1188,7 +1188,7 @@ int vc_mgr_dbus_request_set_command(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set command : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr set command : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set command : result = %d", result); } @@ -1238,7 +1238,7 @@ int vc_mgr_dbus_request_unset_command(int pid) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr unset command : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr unset command : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr unset command : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1269,7 +1269,7 @@ int vc_mgr_dbus_request_unset_command(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr unset command : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr unset command : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr unset command : result = %d", result); } @@ -1319,7 +1319,7 @@ int vc_mgr_dbus_request_demandable_client(int pid) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set demandable client : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set demandable client : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr set demandable client : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1350,7 +1350,7 @@ int vc_mgr_dbus_request_demandable_client(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set demandable client : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr set demandable client : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set demandable client : result = %d", result); } @@ -1401,7 +1401,7 @@ int vc_mgr_dbus_request_set_audio_type(int pid, const char* audio_type) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set audio type : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set audio type : pid(%d), audio type(%s)", pid, audio_type); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr set audio type : pid(%d), audio type(%s)", pid, audio_type); } dbus_message_append_args(msg, @@ -1433,12 +1433,12 @@ int vc_mgr_dbus_request_set_audio_type(int pid, const char* audio_type) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set audio type : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr set audio type : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set audio type : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1484,7 +1484,7 @@ int vc_mgr_dbus_request_get_audio_type(int pid, char** audio_type) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get audio type : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr get audio type : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr get audio type : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1521,12 +1521,12 @@ int vc_mgr_dbus_request_get_audio_type(int pid, char** audio_type) if (NULL != audio_type && NULL != temp) { *audio_type = strdup(temp); } - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr get audio type : result = %d audio type = %s", result, temp); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr get audio type : result = %d audio type = %s", result, temp); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get audio type : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1553,7 +1553,7 @@ int vc_mgr_dbus_request_set_private_data(int pid, const char* key, const char* d SLOG(LOG_ERROR, TAG_VCM, "@@ vc set private data : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc set private data : pid(%d), data(%s)", pid, data); + SLOG(LOG_INFO, TAG_VCM, "@@ vc set private data : pid(%d), data(%s)", pid, data); } dbus_message_append_args(msg, @@ -1598,7 +1598,7 @@ int vc_mgr_dbus_request_get_private_data(int pid, const char* key, char** data) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get private data : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr get private data : pid(%d), key(%s)", pid, key); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr get private data : pid(%d), key(%s)", pid, key); } dbus_message_append_args(msg, @@ -1640,12 +1640,12 @@ int vc_mgr_dbus_request_get_private_data(int pid, const char* key, char** data) } else { *data = strdup(temp); } - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr get private data : result = %d private data = %s", result, *data); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr get private data : result = %d private data = %s", result, *data); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get private data : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_INFO, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1691,7 +1691,7 @@ int vc_mgr_dbus_request_set_client_info(int pid) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set client info : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set client info : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr set client info : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1722,12 +1722,12 @@ int vc_mgr_dbus_request_set_client_info(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set client info : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr set client info : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set client info : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1754,7 +1754,7 @@ int vc_mgr_dbus_request_set_domain(int pid, const char* domain) SLOG(LOG_ERROR, TAG_VCM, "@@ vc set domain : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc set domain : pid(%d), domain(%s)", pid, domain); + SLOG(LOG_INFO, TAG_VCM, "@@ vc set domain : pid(%d), domain(%s)", pid, domain); } dbus_message_append_args(msg, @@ -1789,12 +1789,12 @@ int vc_mgr_dbus_request_set_domain(int pid, const char* domain) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc set domain : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc set domain : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc set domain : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1821,7 +1821,7 @@ int vc_mgr_dbus_request_do_action(int pid, vc_send_event_type_e type, char* send SLOG(LOG_ERROR, TAG_VCM, "@@ vc set domain : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc set domain : pid(%d), type(%d), send_event(%s)", pid, type, send_event); + SLOG(LOG_INFO, TAG_VCM, "@@ vc set domain : pid(%d), type(%d), send_event(%s)", pid, type, send_event); } dbus_message_append_args(msg, @@ -1837,7 +1837,7 @@ int vc_mgr_dbus_request_do_action(int pid, vc_send_event_type_e type, char* send dbus_message_unref(msg); return -1; } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } dbus_message_unref(msg); @@ -1883,7 +1883,7 @@ int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_comm SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr start : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr start : pid(%d), recognition_mode(%d) exclusive(%d) start by client(%d)", + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr start : pid(%d), recognition_mode(%d) exclusive(%d) start by client(%d)", pid, recognition_mode, exclusive_command_option, start_by_client); } @@ -1921,12 +1921,12 @@ int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_comm dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr start : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr start : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr start : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1972,7 +1972,7 @@ int vc_mgr_dbus_request_stop(int pid) SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr stop : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr stop : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr stop : pid(%d)", pid); } dbus_message_append_args(msg, @@ -2003,12 +2003,12 @@ int vc_mgr_dbus_request_stop(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr stop : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr stop : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr stop : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -2054,7 +2054,7 @@ int vc_mgr_dbus_request_cancel(int pid) SLOG(LOG_ERROR, TAG_VCM, "@@ vc cancel : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc cancel : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc cancel : pid(%d)", pid); } dbus_message_append_args(msg, @@ -2085,12 +2085,12 @@ int vc_mgr_dbus_request_cancel(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc cancel : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc cancel : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc cancel : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -2136,7 +2136,7 @@ int vc_mgr_dbus_request_enable_command_type(int pid, int cmd_type) SLOG(LOG_ERROR, TAG_VCM, "@@ vc enable command type : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc enable command type : pid(%d) type(%d)", pid, cmd_type); + SLOG(LOG_INFO, TAG_VCM, "@@ vc enable command type : pid(%d) type(%d)", pid, cmd_type); } dbus_message_append_args(msg, @@ -2168,12 +2168,12 @@ int vc_mgr_dbus_request_enable_command_type(int pid, int cmd_type) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc enable command type : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc enable command type : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc enable command type : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -2219,7 +2219,7 @@ int vc_mgr_dbus_request_disable_command_type(int pid, int cmd_type) SLOG(LOG_ERROR, TAG_VCM, "@@ vc disable command type : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc disable command type : pid(%d) type(%d)", pid, cmd_type); + SLOG(LOG_INFO, TAG_VCM, "@@ vc disable command type : pid(%d) type(%d)", pid, cmd_type); } dbus_message_append_args(msg, @@ -2251,12 +2251,12 @@ int vc_mgr_dbus_request_disable_command_type(int pid, int cmd_type) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc disable command type : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc disable command type : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc disable command type : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -2286,7 +2286,7 @@ static DBusMessage* __get_message(int pid, const char* method, int type) return NULL; } - SLOG(LOG_DEBUG, TAG_VCM, "[Dbus] Service(%s) object(%s) if(%s)", service_name, object_path, target_if_name); + SLOG(LOG_INFO, TAG_VCM, "[Dbus] Service(%s) object(%s) if(%s)", service_name, object_path, target_if_name); return dbus_message_new_method_call(service_name, object_path, target_if_name, method); } @@ -2323,7 +2323,7 @@ int vc_mgr_dbus_send_result(int pid, int cmd_type, int result_id) if (!dbus_connection_send(g_m_conn_sender, msg, NULL)) { SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to send result message"); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Dbus] Success to send result"); + SLOG(LOG_INFO, TAG_VCM, "[Dbus] Success to send result"); dbus_connection_flush(g_m_conn_sender); } @@ -2352,7 +2352,7 @@ int vc_mgr_dbus_send_result_selection(int pid) SLOG(LOG_ERROR, TAG_VCM, "@@ vc result selection : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc result selection : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCM, "@@ vc result selection : pid(%d)", pid); } dbus_message_append_args(msg, @@ -2365,7 +2365,7 @@ int vc_mgr_dbus_send_result_selection(int pid) SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to Send"); return -1; } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } @@ -2391,7 +2391,7 @@ int vc_mgr_dbus_send_specific_engine_request(int pid, const char* engine_app_id, SLOG(LOG_ERROR, TAG_VCM, "@@ vc send specific engine : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc send specific engine : pid(%d), engine_app_id(%s), event(%s), request(%s)", pid, engine_app_id, event, request); + SLOG(LOG_INFO, TAG_VCM, "@@ vc send specific engine : pid(%d), engine_app_id(%s), event(%s), request(%s)", pid, engine_app_id, event, request); } dbus_message_append_args(msg, @@ -2408,7 +2408,7 @@ int vc_mgr_dbus_send_specific_engine_request(int pid, const char* engine_app_id, dbus_message_unref(msg); return -1; } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } dbus_message_unref(msg); @@ -2429,7 +2429,7 @@ int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, int utt_status) SLOG(LOG_ERROR, TAG_VCM, "@@ vc send utterance status : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc send utterance status : pid(%d), utt_id(%d), utt_status(%d)", pid, utt_id, utt_status); + SLOG(LOG_INFO, TAG_VCM, "@@ vc send utterance status : pid(%d), utt_id(%d), utt_status(%d)", pid, utt_id, utt_status); } dbus_message_append_args(msg, @@ -2444,7 +2444,7 @@ int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, int utt_status) dbus_message_unref(msg); return -1; } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } dbus_message_unref(msg); @@ -2469,7 +2469,7 @@ int vc_mgr_dbus_send_audio_streaming(int pid, vc_audio_streaming_event_e event, SLOG(LOG_ERROR, TAG_VCM, "@@ vc send audio streaming : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc send audio streaming : pid(%d), event(%d), buffer(%p), len(%d)", pid, event, buffer, len); + SLOG(LOG_INFO, TAG_VCM, "@@ vc send audio streaming : pid(%d), event(%d), buffer(%p), len(%d)", pid, event, buffer, len); } dbus_message_append_args(msg, @@ -2485,7 +2485,7 @@ int vc_mgr_dbus_send_audio_streaming(int pid, vc_audio_streaming_event_e event, if (!dbus_connection_send(g_m_conn_sender, msg, NULL)) { SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to send audio streaming"); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Dbus DEBUG] Success to send audio streaming"); + SLOG(LOG_INFO, TAG_VCM, "[Dbus DEBUG] Success to send audio streaming"); dbus_connection_flush(g_m_conn_sender); } @@ -2533,7 +2533,7 @@ int vc_mgr_dbus_change_system_volume(int pid, vc_system_volume_event_e volume_ev SLOG(LOG_ERROR, TAG_VCM, "@@ vc change system volume : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc change system volume : pid(%d) volume_event(%d)", pid, temp_event); + SLOG(LOG_INFO, TAG_VCM, "@@ vc change system volume : pid(%d) volume_event(%d)", pid, temp_event); } dbus_message_append_args(msg, @@ -2565,12 +2565,12 @@ int vc_mgr_dbus_change_system_volume(int pid, vc_system_volume_event_e volume_ev dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCM, "@@ vc change system volume : result = %d", result); + SLOG(LOG_INFO, TAG_VCM, "@@ vc change system volume : result = %d", result); } else { SLOG(LOG_ERROR, TAG_VCM, "@@ vc change system volume : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } diff --git a/server/vcd_client_data.c b/server/vcd_client_data.c index ac1bee7..202c2e0 100644 --- a/server/vcd_client_data.c +++ b/server/vcd_client_data.c @@ -167,16 +167,16 @@ int vcd_client_manager_set_demandable_client(int pid, GSList* client_list) bool vcd_client_manager_check_demandable_client(int pid) { if (0 == g_slist_length(g_demandable_client)) { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] All client is available to request start"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] All client is available to request start"); return true; } /* Check demandable appid */ char appid[1024] = {0, }; if (0 == aul_app_get_appid_bypid(pid, appid, sizeof(appid) - 1)) { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] %s(%d) requests start", appid, pid); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] %s(%d) requests start", appid, pid); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] daemon(%d) requests start", pid); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] daemon(%d) requests start", pid); } /* Compare appid */ @@ -193,12 +193,12 @@ bool vcd_client_manager_check_demandable_client(int pid) if (NULL != temp_client->appid) { if (0 == strcmp(temp_client->appid, appid)) { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] pid(%d) is available", pid); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] pid(%d) is available", pid); return true; } } else { if (0 == strlen(appid)) { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] pid(%d) is available", pid); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] pid(%d) is available", pid); return true; } } @@ -320,14 +320,14 @@ int vcd_client_command_collect_command() /* There is no foreground app for voice control */ } - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Foreground pid(%d)", fg_pid); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] Foreground pid(%d)", fg_pid); /* 2. Clean up command list */ __vcd_client_release_commands(); /* Check exclusive system command */ if (true == g_manager.exclusive_cmd_option && 1 == vcd_config_get_command_type_enabled(VC_COMMAND_TYPE_EXCLUSIVE)) { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Exclusive option of manager is ON"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] Exclusive option of manager is ON"); GSList* ex_sys_cmd_list = NULL; if (true == g_manager.manager_cmd) { @@ -338,7 +338,7 @@ int vcd_client_command_collect_command() g_cur_cmd_list.exclusive_system_cmds = ex_sys_cmd_list; } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No exclusive system commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No exclusive system commands"); } return 0; @@ -354,7 +354,7 @@ int vcd_client_command_collect_command() g_cur_cmd_list.system_cmds = sys_cmd_list; } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No system commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No system commands"); } GSList* sys_back_cmd_list = NULL; @@ -366,7 +366,7 @@ int vcd_client_command_collect_command() g_cur_cmd_list.system_background_cmds = sys_back_cmd_list; } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No system background commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No system background commands"); } /* 4. Set foreground commands and widget */ @@ -389,7 +389,7 @@ int vcd_client_command_collect_command() } } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No widget commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No widget commands"); } /* 4-2. Set foreground command of foreground app */ @@ -402,13 +402,13 @@ int vcd_client_command_collect_command() } } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No foreground app"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No foreground app"); } if (true == g_manager.manager_cmd && 1 == vcd_config_get_command_type_enabled(VC_COMMAND_TYPE_FOREGROUND)) { /* 4-3. Set foreground command by manager */ ret = vc_cmd_parser_get_commands(g_manager.pid, VC_COMMAND_TYPE_FOREGROUND, &fg_cmd_list); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No foreground commands of manager app"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No foreground commands of manager app"); } else { g_cur_cmd_list.foreground_cmds = fg_cmd_list; } @@ -440,7 +440,7 @@ int vcd_client_get_length() g_cur_cmd_list.total_cmd_count = command_count; - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Command count : %d ", g_cur_cmd_list.total_cmd_count); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] Command count : %d ", g_cur_cmd_list.total_cmd_count); return command_count; } @@ -478,7 +478,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No widget commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No widget commands"); } if (0 < g_slist_length(g_cur_cmd_list.foreground_cmds)) { @@ -494,7 +494,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No foreground commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No foreground commands"); } if (0 < g_slist_length(g_cur_cmd_list.system_cmds)) { @@ -510,7 +510,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No system commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No system commands"); } if (0 < g_slist_length(g_cur_cmd_list.system_background_cmds)) { @@ -526,7 +526,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No system background commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No system background commands"); } if (0 < g_slist_length(g_cur_cmd_list.exclusive_system_cmds)) { @@ -542,7 +542,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No exclusive system commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No exclusive system commands"); } if (0 < g_slist_length(g_cur_cmd_list.background_cmds)) { @@ -558,7 +558,7 @@ int vcd_client_foreach_command(client_foreach_command_cb callback, void* user_da iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No background commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No background commands"); } return 0; } @@ -622,7 +622,7 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result) GSList *iter = NULL; vc_cmd_s* temp_cmd; - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Result id(%d)", result_id); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] Result id(%d)", result_id); if (0 < g_slist_length(g_cur_cmd_list.widget_cmds)) { iter = g_slist_nth(g_cur_cmd_list.widget_cmds, 0); @@ -642,7 +642,7 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result) iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No widget commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No widget commands"); } if (0 < g_slist_length(g_cur_cmd_list.foreground_cmds)) { @@ -665,7 +665,7 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result) iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No foreground commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No foreground commands"); } if (0 < g_slist_length(g_cur_cmd_list.system_cmds)) { @@ -685,7 +685,7 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result) iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No system commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No system commands"); } if (0 < g_slist_length(g_cur_cmd_list.system_background_cmds)) { @@ -705,7 +705,7 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result) iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No system background commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No system background commands"); } if (0 < g_slist_length(g_cur_cmd_list.exclusive_system_cmds)) { @@ -725,7 +725,7 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result) iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No exclusive system commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No exclusive system commands"); } if (0 < g_slist_length(g_cur_cmd_list.background_cmds)) { @@ -744,7 +744,7 @@ int vcd_client_get_cmd_from_result_id(int result_id, vc_cmd_s** result) iter = g_slist_next(iter); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] No background commands"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] No background commands"); } SLOG(LOG_ERROR, TAG_VCD, "[Client Data ERROR] Not find matched result"); @@ -785,7 +785,7 @@ int vcd_client_set_server_dialog(int pid, bool is_server_dialog) client_info->server_dialog = is_server_dialog; - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Set server dialog, client pid(%d), server_dialog(%d)", pid, client_info->server_dialog); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] Set server dialog, client pid(%d), server_dialog(%d)", pid, client_info->server_dialog); return 0; } @@ -801,7 +801,7 @@ int vcd_client_get_server_dialog(int pid, bool* is_server_dialog) *is_server_dialog = client_info->server_dialog; - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] Get server dialog, client pid(%d), server_dialog(%d)", pid, *is_server_dialog); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] Get server dialog, client pid(%d), server_dialog(%d)", pid, *is_server_dialog); return 0; } @@ -1047,7 +1047,7 @@ int vcd_client_add(int pid) return -1; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data SUCCESS] Add new client"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data SUCCESS] Add new client"); } #ifdef CLIENT_DATA_DEBUG @@ -1107,7 +1107,7 @@ int vcd_client_get_ref_count() count++; } - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data] client count : %d", count); + SLOG(LOG_INFO, TAG_VCD, "[Client Data] client count : %d", count); return count; } @@ -1372,7 +1372,7 @@ int vcd_client_widget_add(int pid) return -1; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Client Data SUCCESS] Add new widget"); + SLOG(LOG_INFO, TAG_VCD, "[Client Data SUCCESS] Add new widget"); } #ifdef CLIENT_DATA_DEBUG @@ -1545,7 +1545,7 @@ void vcd_client_update_foreground_pid() int i; if (0 == count) { - SLOG(LOG_DEBUG, TAG_VCD, "No Client"); + SLOG(LOG_INFO, TAG_VCD, "No Client"); } else { iter = g_slist_nth(g_client_list, 0); for (i = 0; i < count; i++) { @@ -1555,7 +1555,7 @@ void vcd_client_update_foreground_pid() data = iter->data; if (NULL != data) { - SLOG(LOG_DEBUG, TAG_VCD, "[%dth] pid(%d)", i, data->pid); + SLOG(LOG_INFO, TAG_VCD, "[%dth] pid(%d)", i, data->pid); if (pid == data->pid) { SLOG(LOG_INFO, TAG_VCD, "[INFO] foreground pid (%d)", data->pid); vcd_config_set_foreground(data->pid, true); @@ -1573,7 +1573,7 @@ void vcd_client_update_foreground_pid() count = g_slist_length(g_widget_list); if (0 == count) { - SLOG(LOG_DEBUG, TAG_VCD, "No widget"); + SLOG(LOG_INFO, TAG_VCD, "No widget"); } else { iter = g_slist_nth(g_widget_list, 0); for (i = 0; i < count; i++) { @@ -1583,7 +1583,7 @@ void vcd_client_update_foreground_pid() widget_data = iter->data; if (NULL != widget_data) { - SLOG(LOG_DEBUG, TAG_VCD, "[%dth] pid(%d)", i, widget_data->pid); + SLOG(LOG_INFO, TAG_VCD, "[%dth] pid(%d)", i, widget_data->pid); if (pid == widget_data->pid) { SLOG(LOG_INFO, TAG_VCD, "[INFO] foreground pid (%d)", widget_data->pid); vcd_config_set_foreground(widget_data->pid, true); diff --git a/server/vcd_config.c b/server/vcd_config.c index 03114d5..ce97815 100644 --- a/server/vcd_config.c +++ b/server/vcd_config.c @@ -117,7 +117,7 @@ int vcd_config_set_service_state(vcd_state_e state) { g_state = state; - SLOG(LOG_DEBUG, TAG_VCD, "[Config] Config is changed : %d", g_state); + SLOG(LOG_INFO, TAG_VCD, "[Config] Config is changed : %d", g_state); return 0; } diff --git a/server/vcd_dbus.c b/server/vcd_dbus.c index 758ecf8..834c951 100644 --- a/server/vcd_dbus.c +++ b/server/vcd_dbus.c @@ -71,7 +71,7 @@ int vcd_dbus_reconnect() return -1; } - SLOG(LOG_DEBUG, TAG_VCD, "[DBUS] Reconnect"); + SLOG(LOG_INFO, TAG_VCD, "[DBUS] Reconnect"); } return 0; @@ -153,7 +153,7 @@ int vcdc_send_hello(int pid, vcd_client_type_e type) dbus_message_unref(result_msg); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] Result message is NULL. Client is not available"); + SLOG(LOG_WARN, TAG_VCD, "[Dbus] Result message is NULL. Client is not available"); } return result; @@ -179,7 +179,7 @@ int vcdc_send_show_tooltip(int pid, bool show) DBusMessage* msg; - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] send widget show tooltip signal : pid(%d) show(%d)", pid, show); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] send widget show tooltip signal : pid(%d) show(%d)", pid, show); msg = dbus_message_new_method_call( service_name, @@ -207,7 +207,7 @@ int vcdc_send_show_tooltip(int pid, bool show) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_conn_sender); } @@ -243,8 +243,8 @@ int vcdc_send_set_volume(int manger_pid, float volume) dbus_message_unref(msg); return -1; } else { - if (10 == g_volume_count) { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send set volume : pid(%d), volume(%f)", manger_pid, volume); + if (20 == g_volume_count) { + SLOG(LOG_INFO, TAG_VCD, "@@ Send set volume : pid(%d), volume(%f)", manger_pid, volume); g_volume_count = 0; } @@ -266,7 +266,7 @@ int vcdc_send_result(int pid, int manager_pid, int cmd_type) DBusMessage* msg = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] Result command type(%d)", cmd_type); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] Result command type(%d)", cmd_type); switch (cmd_type) { case VC_COMMAND_TYPE_FOREGROUND: @@ -302,7 +302,7 @@ int vcdc_send_result(int pid, int manager_pid, int cmd_type) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_conn_sender); } @@ -319,7 +319,7 @@ int vcdc_send_asr_result(int pid, int event, const char* asr_result, int cmd_typ DBusMessage* msg = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] Result command type(%d)", cmd_type); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] Result command type(%d)", cmd_type); switch (cmd_type) { case VC_COMMAND_TYPE_WIDGET: @@ -363,7 +363,7 @@ int vcdc_send_asr_result(int pid, int event, const char* asr_result, int cmd_typ } dbus_message_unref(result_msg); - SLOG(LOG_DEBUG, TAG_VCD, "@@ vc send asr result : result = %d", result); + SLOG(LOG_INFO, TAG_VCD, "@@ vc send asr result : result = %d", result); *is_consumed = result; return VCD_ERROR_NONE; } else { @@ -398,7 +398,7 @@ int vcdc_send_pre_result_to_manager(int manager_pid, int event, const char* pre_ SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_conn_sender); } @@ -407,7 +407,7 @@ int vcdc_send_pre_result_to_manager(int manager_pid, int event, const char* pre_ int vcdc_send_specific_engine_result_to_manager(int manager_pid, const char* engine_app_id, const char* event, const char* result) { - SLOG(LOG_DEBUG, TAG_VCD, "[VCDC] send specific engine result to manager, mgr pid(%d), engine app id(%s), event(%s), result(%s),", + SLOG(LOG_INFO, TAG_VCD, "[VCDC] send specific engine result to manager, mgr pid(%d), engine app id(%s), event(%s), result(%s),", manager_pid, engine_app_id, event, result); if (0 != __dbus_check()) { @@ -434,7 +434,7 @@ int vcdc_send_specific_engine_result_to_manager(int manager_pid, const char* eng SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_conn_sender); } @@ -459,7 +459,7 @@ int vcdc_send_result_to_manager(int manger_pid, int result_type) return VCD_ERROR_OUT_OF_MEMORY; } - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] send result : result type(%d)", result_type); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] send result : result type(%d)", result_type); dbus_message_append_args(msg, DBUS_TYPE_INT32, &result_type, DBUS_TYPE_INVALID); @@ -469,7 +469,7 @@ int vcdc_send_result_to_manager(int manger_pid, int result_type) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_conn_sender); } @@ -503,7 +503,7 @@ int vcdc_send_speech_detected(int manger_pid) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_conn_sender); } @@ -538,7 +538,7 @@ int vcdc_send_service_state(vcd_state_e state) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send service state message to manager : state(%d)", state); + SLOG(LOG_INFO, TAG_VCD, "@@ Send service state message to manager : state(%d)", state); dbus_connection_flush(g_conn_sender); } @@ -563,7 +563,7 @@ int vcdc_send_service_state(vcd_state_e state) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send service state message to client : state(%d)", state); + SLOG(LOG_INFO, TAG_VCD, "@@ Send service state message to client : state(%d)", state); dbus_connection_flush(g_conn_sender); } @@ -588,7 +588,7 @@ int vcdc_send_service_state(vcd_state_e state) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send service state message to widget client : state(%d)", state); + SLOG(LOG_INFO, TAG_VCD, "@@ Send service state message to widget client : state(%d)", state); dbus_connection_flush(g_conn_sender); } @@ -621,7 +621,7 @@ int vcdc_send_manager_pid(int manager_pid) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send manager pid to client : pid(%d)", manager_pid); + SLOG(LOG_INFO, TAG_VCD, "@@ Send manager pid to client : pid(%d)", manager_pid); dbus_connection_flush(g_conn_sender); } @@ -648,7 +648,7 @@ int vcdc_send_dialog(int manger_pid, int pid, const char* disp_text, const char* return VCD_ERROR_OUT_OF_MEMORY; } - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] send dialog : pid(%d), disp_text(%s), utt_text(%s), continue(%d)", pid, disp_text, utt_text, continuous); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] send dialog : pid(%d), disp_text(%s), utt_text(%s), continue(%d)", pid, disp_text, utt_text, continuous); char* disp_null = NULL; char* utt_null = NULL; @@ -676,7 +676,7 @@ int vcdc_send_dialog(int manger_pid, int pid, const char* disp_text, const char* SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] SUCCESS Send"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_conn_sender); } @@ -738,7 +738,7 @@ int vcdc_send_error_signal_to_manager(int manager_pid, int reason, char *err_msg } return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send error signal to manager : reason(%d), Error Msg(%s)", reason, temp_msg); + SLOG(LOG_INFO, TAG_VCD, "@@ Send error signal to manager : reason(%d), Error Msg(%s)", reason, temp_msg); dbus_connection_flush(g_conn_sender); } @@ -787,7 +787,7 @@ int vcdc_send_error_signal(int reason, char *err_msg) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send error signal to manager: reason(%d), daemon_pid(%d), Error Msg(%s)", reason, daemon_pid, err_msg); + SLOG(LOG_INFO, TAG_VCD, "@@ Send error signal to manager: reason(%d), daemon_pid(%d), Error Msg(%s)", reason, daemon_pid, err_msg); dbus_connection_flush(g_conn_sender); } @@ -810,7 +810,7 @@ int vcdc_send_error_signal(int reason, char *err_msg) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send error signal : reason(%d), daemon_pid(%d), Error Msg(%s)", reason, daemon_pid, err_msg); + SLOG(LOG_INFO, TAG_VCD, "@@ Send error signal : reason(%d), daemon_pid(%d), Error Msg(%s)", reason, daemon_pid, err_msg); dbus_connection_flush(g_conn_sender); } @@ -833,7 +833,7 @@ int vcdc_send_error_signal(int reason, char *err_msg) SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Fail to Send"); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "@@ Send error signal to widget : reason(%d), daemon_pid(%d), Error Msg(%s)", reason, daemon_pid, err_msg); + SLOG(LOG_INFO, TAG_VCD, "@@ Send error signal to widget : reason(%d), daemon_pid(%d), Error Msg(%s)", reason, daemon_pid, err_msg); dbus_connection_flush(g_conn_sender); } @@ -868,7 +868,7 @@ int vcdc_send_request_set_private_data(int pid, const char* key, const char* dat dbus_message_unref(msg); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] SUCCESS Send request set private data"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] SUCCESS Send request set private data"); dbus_connection_flush(g_conn_sender); } @@ -928,7 +928,7 @@ int vcdc_send_request_get_private_data(int pid, const char* key, char** data) dbus_message_unref(result_msg); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus] Result message is NULL. Client is not available"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus] Result message is NULL. Client is not available"); } if (NULL != data && NULL != temp) { @@ -1319,7 +1319,7 @@ int vcd_dbus_open_connection() /* Flush messages which are received before fd event handler registration */ while (DBUS_DISPATCH_COMPLETE != dbus_connection_get_dispatch_status(g_conn_listener)) { - SLOG(LOG_DEBUG, TAG_VCD, "Dbus data is remained, g_conn_listener(%p)", g_conn_listener); + SLOG(LOG_INFO, TAG_VCD, "Dbus data is remained, g_conn_listener(%p)", g_conn_listener); listener_event_callback(NULL, NULL); } @@ -1330,7 +1330,7 @@ int vcd_dbus_open_connection() __vcd_dbus_connection_free(); return VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "Get fd from dbus : %d", fd); + SLOG(LOG_INFO, TAG_VCD, "Get fd from dbus : %d", fd); } g_dbus_fd_handler = ecore_main_fd_handler_add(fd, ECORE_FD_READ, (Ecore_Fd_Cb)listener_event_callback, g_conn_listener, NULL, NULL); diff --git a/server/vcd_dbus_server.c b/server/vcd_dbus_server.c index b1affc8..77a666f 100644 --- a/server/vcd_dbus_server.c +++ b/server/vcd_dbus_server.c @@ -110,7 +110,7 @@ int vcd_dbus_server_mgr_initialize(DBusConnection* conn, DBusMessage* msg) foreground = vcd_server_get_foreground(); daemon_pid = getpid(); - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr initialize : pid(%d) service state(%d) foreground(%d) daemon_pid(%d)", pid, service_state, foreground, daemon_pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr initialize : pid(%d) service state(%d) foreground(%d) daemon_pid(%d)", pid, service_state, foreground, daemon_pid); } DBusMessage* reply; @@ -125,7 +125,7 @@ int vcd_dbus_server_mgr_initialize(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -161,7 +161,7 @@ int vcd_dbus_server_mgr_finalize(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr finalize : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr finalize : pid(%d)", pid); ret = vcd_server_mgr_finalize(pid); } @@ -173,7 +173,7 @@ int vcd_dbus_server_mgr_finalize(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -210,7 +210,7 @@ int vcd_dbus_server_mgr_set_command(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr set command : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set command : pid(%d)", pid); ret = vcd_server_mgr_set_command(pid); } @@ -222,7 +222,7 @@ int vcd_dbus_server_mgr_set_command(DBusConnection* conn, DBusMessage* msg) /* Append result and language */ dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); @@ -261,7 +261,7 @@ int vcd_dbus_server_mgr_unset_command(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr unset command : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr unset command : pid(%d)", pid); ret = vcd_server_mgr_unset_command(pid); } @@ -273,7 +273,7 @@ int vcd_dbus_server_mgr_unset_command(DBusConnection* conn, DBusMessage* msg) /* Append result and language */ dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); @@ -312,7 +312,7 @@ int vcd_dbus_server_mgr_set_demandable_client(DBusConnection* conn, DBusMessage* dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr set demandable client : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set demandable client : pid(%d)", pid); ret = vcd_server_mgr_set_demandable_client(pid); } @@ -324,7 +324,7 @@ int vcd_dbus_server_mgr_set_demandable_client(DBusConnection* conn, DBusMessage* /* Append result and language */ dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); @@ -368,7 +368,7 @@ int vcd_dbus_server_mgr_set_audio_type(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr set audio type : pid(%d), audio type(%s)", pid, audio_type); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set audio type : pid(%d), audio type(%s)", pid, audio_type); ret = vcd_server_mgr_set_audio_type(pid, audio_type); } @@ -379,7 +379,7 @@ int vcd_dbus_server_mgr_set_audio_type(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -420,7 +420,7 @@ int vcd_dbus_server_mgr_get_audio_type(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr set audio type : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set audio type : pid(%d)", pid); ret = vcd_server_mgr_get_audio_type(pid, &audio_type); } @@ -434,7 +434,7 @@ int vcd_dbus_server_mgr_get_audio_type(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d), audio type(%s)", ret, audio_type); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d), audio type(%s)", ret, audio_type); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -476,7 +476,7 @@ int vcd_dbus_server_mgr_set_client_info(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr set client info : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set client info : pid(%d)", pid); ret = vcd_server_mgr_set_client_info(pid); } @@ -489,7 +489,7 @@ int vcd_dbus_server_mgr_set_client_info(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -533,7 +533,7 @@ int vcd_dbus_server_mgr_set_private_data(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr set domain : pid(%d), key(%s), data(%s)", pid, key, data); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set domain : pid(%d), key(%s), data(%s)", pid, key, data); ret = vcd_server_mgr_set_private_data(pid, key, data); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to set private data"); @@ -568,13 +568,13 @@ int vcd_dbus_server_mgr_get_private_data(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr get private data : pid(%d), key(%s)", pid, key); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr get private data : pid(%d), key(%s)", pid, key); ret = vcd_server_mgr_get_private_data(pid, key, &data); } char *temp_data = NULL; if (NULL == data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Dbus INFO] data parameter is NULL"); + SLOG(LOG_INFO, TAG_VCD, "[Dbus INFO] data parameter is NULL"); temp_data = strdup("#NULL"); } else { temp_data = strdup(data); @@ -590,7 +590,7 @@ int vcd_dbus_server_mgr_get_private_data(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d), private data(%s)", ret, temp_data); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d), private data(%s)", ret, temp_data); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -646,7 +646,7 @@ int vcd_dbus_server_mgr_send_specific_engine_request(DBusConnection* conn, DBusM ret = VCD_ERROR_OPERATION_FAILED; } else { ret = vcd_server_mgr_send_specific_engine_request(pid, engine_app_id, event, request); - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr specific engine request : pid(%d), engine_app_id(%s), event(%s), request(%s), ret(%d)", pid, engine_app_id, event, request, ret); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr specific engine request : pid(%d), engine_app_id(%s), event(%s), request(%s), ret(%d)", pid, engine_app_id, event, request, ret); } return 0; @@ -674,7 +674,7 @@ int vcd_dbus_server_mgr_set_domain(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr set domain : pid(%d), domain(%s)", pid, domain); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set domain : pid(%d), domain(%s)", pid, domain); ret = vcd_server_mgr_set_domain(pid, domain); } @@ -685,7 +685,7 @@ int vcd_dbus_server_mgr_set_domain(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -729,7 +729,7 @@ int vcd_dbus_server_mgr_do_action(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr request to do action : pid(%d), type(%d) send_event(%s)", pid, type, send_event); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr request to do action : pid(%d), type(%d) send_event(%s)", pid, type, send_event); ret = vcd_server_mgr_do_action(pid, type, send_event); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to do action"); @@ -763,7 +763,7 @@ int vcd_dbus_server_mgr_enable_command_type(DBusConnection* conn, DBusMessage* m dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr enable command type : pid(%d), cmd_type(%d)", pid, cmd_type); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr enable command type : pid(%d), cmd_type(%d)", pid, cmd_type); ret = vcd_server_mgr_enable_command_type(pid, cmd_type); } @@ -774,7 +774,7 @@ int vcd_dbus_server_mgr_enable_command_type(DBusConnection* conn, DBusMessage* m dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -816,7 +816,7 @@ int vcd_dbus_server_mgr_disable_command_type(DBusConnection* conn, DBusMessage* dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr disable command type : pid(%d), cmd_type(%d)", pid, cmd_type); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr disable command type : pid(%d), cmd_type(%d)", pid, cmd_type); ret = vcd_server_mgr_disable_command_type(pid, cmd_type); } @@ -827,7 +827,7 @@ int vcd_dbus_server_mgr_disable_command_type(DBusConnection* conn, DBusMessage* dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -873,7 +873,7 @@ int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr start : pid(%d) recognition_mode(%d) exclusive(%d) start by client(%d)", pid, recognition_mode, exclusive, start_by_client); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr start : pid(%d) recognition_mode(%d) exclusive(%d) start by client(%d)", pid, recognition_mode, exclusive, start_by_client); ret = vcd_server_mgr_start((vcd_recognition_mode_e)recognition_mode, (bool)exclusive, (bool)start_by_client); } @@ -884,7 +884,7 @@ int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -920,7 +920,7 @@ int vcd_dbus_server_mgr_stop(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr stop : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr stop : pid(%d)", pid); ret = vcd_server_mgr_stop(); } @@ -931,7 +931,7 @@ int vcd_dbus_server_mgr_stop(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -967,7 +967,7 @@ int vcd_dbus_server_mgr_cancel(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr cancel : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr cancel : pid(%d)", pid); ret = vcd_server_mgr_cancel(); } @@ -978,7 +978,7 @@ int vcd_dbus_server_mgr_cancel(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1012,7 +1012,7 @@ int vcd_dbus_server_mgr_result_selection(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr result selection : get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr result selection : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr result selection : pid(%d)", pid); vcd_server_mgr_result_select(); } return 0; @@ -1039,7 +1039,7 @@ int vcd_dbus_server_mgr_start_feedback(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] vcd mgr start TTS feedback : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] vcd mgr start TTS feedback : pid(%d)", pid); ret = vcd_server_mgr_start_feedback(); } @@ -1052,7 +1052,7 @@ int vcd_dbus_server_mgr_start_feedback(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Result(%d)", ret); } @@ -1092,7 +1092,7 @@ int vcd_dbus_server_mgr_stop_feedback(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] vcd mgr stop TTS feedback : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] vcd mgr stop TTS feedback : pid(%d)", pid); ret = vcd_server_mgr_stop_feedback(); } @@ -1105,7 +1105,7 @@ int vcd_dbus_server_mgr_stop_feedback(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Result(%d)", ret); } @@ -1151,7 +1151,7 @@ int vcd_dbus_server_mgr_send_audio_streaming(DBusConnection* conn, DBusMessage* dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr send audio streaming : pid(%d), event(%d), buffer(%p), len(%d)", pid, event, buffer, len); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr send audio streaming : pid(%d), event(%d), buffer(%p), len(%d)", pid, event, buffer, len); ret = vcd_server_mgr_send_audio_streaming(pid, event, buffer, len); } @@ -1180,7 +1180,7 @@ int vcd_dbus_server_mgr_change_system_volume(DBusConnection* conn, DBusMessage* dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd mgr change system volume: pid(%d), volume_event(%d)", pid, volume_event); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr change system volume: pid(%d), volume_event(%d)", pid, volume_event); ret = vcd_server_mgr_change_system_volume(pid, volume_event); } @@ -1191,7 +1191,7 @@ int vcd_dbus_server_mgr_change_system_volume(DBusConnection* conn, DBusMessage* dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1239,7 +1239,7 @@ int vcd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg) ret = vcd_server_initialize(pid); service_state = vcd_server_get_service_state(); daemon_pid = getpid(); - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd initialize : pid(%d) daemon_pid(%d)", pid, daemon_pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd initialize : pid(%d) daemon_pid(%d)", pid, daemon_pid); } int mgr_pid = vcd_client_manager_get_pid(); @@ -1256,7 +1256,7 @@ int vcd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1292,7 +1292,7 @@ int vcd_dbus_server_finalize(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd finalize : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd finalize : pid(%d)", pid); ret = vcd_server_finalize(pid); } @@ -1304,7 +1304,7 @@ int vcd_dbus_server_finalize(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1396,7 +1396,7 @@ int vcd_dbus_server_set_command(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd set command : pid(%d), cmd_type(%d)", pid, cmd_type); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd set command : pid(%d), cmd_type(%d)", pid, cmd_type); ret = vcd_server_set_command(pid, (vc_cmd_type_e)cmd_type); } @@ -1408,7 +1408,7 @@ int vcd_dbus_server_set_command(DBusConnection* conn, DBusMessage* msg) /* Append result and language */ dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); @@ -1448,7 +1448,7 @@ int vcd_dbus_server_unset_command(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd unset command : pid(%d), cmd_type(%d)", pid, cmd_type); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd unset command : pid(%d), cmd_type(%d)", pid, cmd_type); ret = vcd_server_unset_command(pid, (vc_cmd_type_e)cmd_type); } @@ -1460,7 +1460,7 @@ int vcd_dbus_server_unset_command(DBusConnection* conn, DBusMessage* msg) /* Append result and language */ dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); @@ -1500,7 +1500,7 @@ int vcd_dbus_server_set_foreground(DBusConnection* conn, DBusMessage* msg) } else { bool tmp_value; tmp_value = (bool)value; - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd set foreground : pid(%d), value(%s)", pid, value ? "true" : "false"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd set foreground : pid(%d), value(%s)", pid, value ? "true" : "false"); vcd_server_set_foreground(pid, tmp_value); } @@ -1532,7 +1532,7 @@ int vcd_dbus_server_set_server_dialog(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd set server dialog : pid(%d), app_id(%s)", pid, app_id); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd set server dialog : pid(%d), app_id(%s)", pid, app_id); ret = vcd_server_set_server_dialog(pid, app_id, credential); } @@ -1544,7 +1544,7 @@ int vcd_dbus_server_set_server_dialog(DBusConnection* conn, DBusMessage* msg) /* Append result and language */ dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); @@ -1591,7 +1591,7 @@ int vcd_dbus_server_dialog(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd request dialog : get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd dialog : pid(%d), disp_text(%s), utt_text(%s), continuous(%d)", pid, disp_text, utt_text, continuous); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd dialog : pid(%d), disp_text(%s), utt_text(%s), continuous(%d)", pid, disp_text, utt_text, continuous); ret = vcd_server_dialog(pid, disp_text, utt_text, continuous); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to dialog"); @@ -1623,7 +1623,7 @@ int vcd_dbus_server_is_system_command_valid(DBusConnection* conn, DBusMessage* m SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd request to check system command is valid : get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd dialog : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd dialog : pid(%d)", pid); ret = vcd_server_is_system_command_valid(pid, &is_sys_cmd_valid); } @@ -1637,7 +1637,7 @@ int vcd_dbus_server_is_system_command_valid(DBusConnection* conn, DBusMessage* m DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d), is_sys_cmd_valid (%d)", ret, is_sys_cmd_valid); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d), is_sys_cmd_valid (%d)", ret, is_sys_cmd_valid); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1830,7 +1830,7 @@ int vcd_dbus_server_widget_initialize(DBusConnection* conn, DBusMessage* msg) ret = vcd_server_widget_initialize(pid); service_state = vcd_server_get_service_state(); daemon_pid = getpid(); - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd widget initialize : pid(%d) daemon_pid(%d)", pid, daemon_pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget initialize : pid(%d) daemon_pid(%d)", pid, daemon_pid); } DBusMessage* reply; @@ -1844,7 +1844,7 @@ int vcd_dbus_server_widget_initialize(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1880,7 +1880,7 @@ int vcd_dbus_server_widget_finalize(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd widget finalize : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget finalize : pid(%d)", pid); ret = vcd_server_widget_finalize(pid); } @@ -1892,7 +1892,7 @@ int vcd_dbus_server_widget_finalize(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1933,7 +1933,7 @@ int vcd_dbus_server_widget_start_recording(DBusConnection* conn, DBusMessage* ms dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd widget start recording : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget start recording : pid(%d)", pid); ret = vcd_server_widget_start_recording(pid, widget_command); } @@ -1945,7 +1945,7 @@ int vcd_dbus_server_widget_start_recording(DBusConnection* conn, DBusMessage* ms /* Append result and language */ dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); @@ -1986,7 +1986,7 @@ int vcd_dbus_server_widget_start(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd widget start : pid(%d), silence(%d)", pid, silence); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget start : pid(%d), silence(%d)", pid, silence); ret = vcd_server_widget_start(pid, (bool)silence); } @@ -1997,7 +1997,7 @@ int vcd_dbus_server_widget_start(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -2033,7 +2033,7 @@ int vcd_dbus_server_widget_stop(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd widget stop : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget stop : pid(%d)", pid); ret = vcd_server_widget_stop(pid); } @@ -2044,7 +2044,7 @@ int vcd_dbus_server_widget_stop(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -2080,7 +2080,7 @@ int vcd_dbus_server_widget_cancel(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd widget cancel : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget cancel : pid(%d)", pid); ret = vcd_server_widget_cancel(pid); } @@ -2091,7 +2091,7 @@ int vcd_dbus_server_widget_cancel(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -2128,7 +2128,7 @@ int vcd_dbus_server_widget_enable_asr_result(DBusConnection* conn, DBusMessage* dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd widget enable asr result : pid(%d) enable(%d)", pid, enable); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget enable asr result : pid(%d) enable(%d)", pid, enable); ret = vcd_server_widget_enable_asr_result(pid, enable); } @@ -2139,7 +2139,7 @@ int vcd_dbus_server_widget_enable_asr_result(DBusConnection* conn, DBusMessage* dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -2176,7 +2176,7 @@ int vcd_dbus_server_set_language(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd server set language : language(%s)", language); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd server set language : language(%s)", language); ret = vcd_server_set_language(language); } @@ -2187,7 +2187,7 @@ int vcd_dbus_server_set_language(DBusConnection* conn, DBusMessage* msg) dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -2232,7 +2232,7 @@ int vcd_dbus_server_request_tts(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd request tts : get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd request tts : pid(%d), text(%s), language(%s), to_vcm(%d)", pid, text, language, to_vcm); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd request tts : pid(%d), text(%s), language(%s), to_vcm(%d)", pid, text, language, to_vcm); ret = vcd_server_request_tts(pid, text, language, to_vcm, &utt_id); } @@ -2246,7 +2246,7 @@ int vcd_dbus_server_request_tts(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d), utt_id(%d)", ret, utt_id); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d), utt_id(%d)", ret, utt_id); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -2286,7 +2286,7 @@ int vcd_dbus_server_cancel_tts(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd cancel tts : get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd cancel tts : pid(%d), utt_id(%d)", pid, utt_id); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd cancel tts : pid(%d), utt_id(%d)", pid, utt_id); ret = vcd_server_cancel_tts(pid, utt_id); } @@ -2299,7 +2299,7 @@ int vcd_dbus_server_cancel_tts(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -2340,7 +2340,7 @@ int vcd_dbus_server_get_tts_audio_format(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd get tts audio format : get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[IN] vcd get tts audio format : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd get tts audio format : pid(%d)", pid); ret = vcd_server_get_tts_audio_format(pid, &rate, &channel, &audio_type); } @@ -2356,7 +2356,7 @@ int vcd_dbus_server_get_tts_audio_format(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } diff --git a/server/vcd_engine_agent.c b/server/vcd_engine_agent.c index b73eb86..345959f 100644 --- a/server/vcd_engine_agent.c +++ b/server/vcd_engine_agent.c @@ -81,7 +81,7 @@ static int __internal_get_engine_info(vce_request_callback_s* callback); int vcd_engine_agent_init() { if (true == g_agent_init) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Already initialized"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Already initialized"); return VCD_ERROR_NONE; } @@ -120,7 +120,7 @@ int vcd_engine_agent_init() } } - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent SUCCESS] Engine Agent Initialize"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent SUCCESS] Engine Agent Initialize"); return 0; } @@ -158,7 +158,7 @@ int vcd_engine_agent_release() g_agent_init = false; - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent SUCCESS] Engine Agent release"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent SUCCESS] Engine Agent release"); return 0; } @@ -173,7 +173,7 @@ bool vcd_engine_is_available_engine() static int __internal_get_engine_info(vce_request_callback_s* callback) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] inside __internal_get_engine_info"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] inside __internal_get_engine_info"); if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Invalid engine"); @@ -242,18 +242,18 @@ static int __internal_get_engine_info(vce_request_callback_s* callback) g_dynamic_engine.internal_callbacks->get_tts_audio_format = NULL; g_dynamic_engine.internal_callbacks->get_tts_audio_format_user_data = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "@@@ Valid Engine"); - SLOG(LOG_DEBUG, TAG_VCD, "Engine uuid : %s", g_dynamic_engine.engine_uuid); - SLOG(LOG_DEBUG, TAG_VCD, "Engine name : %s", g_dynamic_engine.engine_name); - SLOG(LOG_DEBUG, TAG_VCD, "Engine setting : %s", g_dynamic_engine.engine_setting_path); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "@@@ Valid Engine"); + SLOG(LOG_INFO, TAG_VCD, "Engine uuid : %s", g_dynamic_engine.engine_uuid); + SLOG(LOG_INFO, TAG_VCD, "Engine name : %s", g_dynamic_engine.engine_name); + SLOG(LOG_INFO, TAG_VCD, "Engine setting : %s", g_dynamic_engine.engine_setting_path); + SLOG(LOG_INFO, TAG_VCD, "@@@"); return 0; } int vcd_engine_agent_load_current_engine(vce_request_callback_s* callback) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] load current engine START"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] load current engine START"); if (false == g_agent_init) { SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Not Initialized"); @@ -316,7 +316,7 @@ int vcd_engine_agent_load_current_engine(vce_request_callback_s* callback) return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent SUCCESS] The %s has been loaded!!!", g_dynamic_engine.engine_name); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent SUCCESS] The %s has been loaded!!!", g_dynamic_engine.engine_name); g_dynamic_engine.is_loaded = true; } else { SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent WARNING] This engine do not support default language : lang(%s)", g_default_lang); @@ -324,7 +324,7 @@ int vcd_engine_agent_load_current_engine(vce_request_callback_s* callback) return VCD_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] load current engine FINISH"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] load current engine FINISH"); return 0; } @@ -337,7 +337,7 @@ int vcd_engine_agent_unload_current_engine() } if (false == g_dynamic_engine.is_loaded) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Engine has already been unloaded"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Engine has already been unloaded"); return VCD_ERROR_NONE; } @@ -378,9 +378,9 @@ int vcd_engine_set_commands() g_dynamic_engine.is_command_ready = true; } - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent SUCCESS] set command"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent SUCCESS] set command"); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Dynamic engine is not available"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Dynamic engine is not available"); } return 0; @@ -394,7 +394,7 @@ int vcd_engine_recognize_start(bool silence) } int ret = -1; - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] silence is %s", silence ? "true" : "false"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] silence is %s", silence ? "true" : "false"); if (true == g_dynamic_engine.is_loaded && true == g_dynamic_engine.is_command_ready) { ret = g_dynamic_engine.callbacks->start(silence); @@ -403,11 +403,11 @@ int vcd_engine_recognize_start(bool silence) return VCD_ERROR_OPERATION_FAILED; } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Engine is not available (Cannot start)"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Engine is not available (Cannot start)"); return VCD_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent SUCCESS] Engine start"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent SUCCESS] Engine start"); return 0; } @@ -797,7 +797,7 @@ static bool __supported_language_cb(const char* language, void* user_data) return false; } - SLOG(LOG_DEBUG, TAG_VCD, "-- Language(%s)", language); + SLOG(LOG_INFO, TAG_VCD, "-- Language(%s)", language); char* temp_lang = g_strdup(language); @@ -867,7 +867,7 @@ int vcd_engine_set_current_language(const char* language) SLOG(LOG_WARN, TAG_VCD, "[Engine Agent] Fail to set language of dynamic engine error(%d, %s)", ret, language); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Dynamic engine is not available (Cannot start)"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Dynamic engine is not available (Cannot start)"); } return 0; @@ -875,13 +875,13 @@ int vcd_engine_set_current_language(const char* language) int vcd_engine_agent_get_foreach_command(vce_cmd_h vce_command, vce_command_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request foreach command from engine"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Request foreach command from engine"); return vcd_client_foreach_command((client_foreach_command_cb)callback, user_data); } int vcd_engine_agent_get_command_count(vce_cmd_h vce_command, int* count) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request command length from engine"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Request command length from engine"); *count = vcd_client_get_length(); return 0; @@ -889,14 +889,14 @@ int vcd_engine_agent_get_command_count(vce_cmd_h vce_command, int* count) int vcd_engine_agent_get_audio_type(char** audio_type) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request audio type"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Request audio type"); return vcd_recorder_get(audio_type); } int vcd_engine_agent_set_private_data(const char* key, const char* data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request set private data, key(%s), data(%s)", key, data); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Request set private data, key(%s), data(%s)", key, data); vcdc_send_request_set_private_data(vcd_client_manager_get_pid(), key, data); return VCD_ERROR_NONE; @@ -904,7 +904,7 @@ int vcd_engine_agent_set_private_data(const char* key, const char* data) int vcd_engine_agent_get_private_data(const char* key, char** data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request get private data, key(%s)", key); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Request get private data, key(%s)", key); vcdc_send_request_get_private_data(vcd_client_manager_get_pid(), key, data); return VCD_ERROR_NONE; @@ -912,7 +912,7 @@ int vcd_engine_agent_get_private_data(const char* key, char** data) int vcd_engine_agent_start_recording() { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request start recording"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Request start recording"); int ret = vcd_recorder_start(); if (0 != ret) { @@ -928,7 +928,7 @@ int vcd_engine_agent_start_recording() int vcd_engine_agent_stop_recording() { - SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent] Request stop recording"); + SLOG(LOG_INFO, TAG_VCD, "[Engine Agent] Request stop recording"); return vcd_recorder_stop(); } diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index 491b530..96abd7b 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -206,7 +206,7 @@ static void _bt_hid_audio_data_receive_cb(bt_hid_voice_data_s *voice_data, void if (BT_ERROR_NONE != bt_hid_send_rc_command(NULL, input_data, sizeof(input_data))) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail bt_hid_send_rc_command"); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Extend bt audio recorder"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Extend bt audio recorder"); } } g_bt_extend_count++; @@ -280,7 +280,7 @@ static const char* __get_focus_changed_reason_code(sound_stream_focus_change_rea static void __recorder_focus_state_cb(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, sound_stream_focus_state_e focus_state, sound_stream_focus_change_reason_e reason, int sound_behavior, const char *extra_info, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Focus state changed cb"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Focus state changed cb"); if (stream_info != g_stream_info_h) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Invalid stream info handle"); @@ -340,7 +340,7 @@ static int __apply_device_for_stream_routing() if (0 != ret) { SLOG(LOG_WARN, TAG_VCD, "[Recorder] No device"); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Apply device for stream routing"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Apply device for stream routing"); } return ret; } @@ -356,7 +356,7 @@ static void __device_connection_changed_cb(sound_device_h device, bool is_connec if (type == SOUND_DEVICE_USB_AUDIO) { bool is_recording_state = false; if (VCD_RECORDER_STATE_RECORDING == g_recorder_state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Stop recorder"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Stop recorder"); vcd_recorder_stop(); is_recording_state = true; } @@ -372,10 +372,10 @@ static void __device_connection_changed_cb(sound_device_h device, bool is_connec return; } if (true == is_recording_state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Start recorder"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Start recorder"); vcd_recorder_start(); } - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Apply device for stream routing"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Apply device for stream routing"); } } return; @@ -418,7 +418,7 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb audio_channel_e audio_ch; audio_sample_type_e audio_type; - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Audio type(%d) rate(%d) channel(%d)", g_audio_type, g_audio_rate, g_audio_channel); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Audio type(%d) rate(%d) channel(%d)", g_audio_type, g_audio_rate, g_audio_channel); switch (g_audio_channel) { case 1: audio_ch = AUDIO_CHANNEL_MONO; break; @@ -486,7 +486,7 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb } if (false == is_bt_failed) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Bluetooth is available"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Bluetooth is available"); g_is_valid_bt_in = true; } #endif @@ -502,7 +502,7 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb } } - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Audio type : %s", g_current_audio_type); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Audio type : %s", g_current_audio_type); return 0; } @@ -573,12 +573,13 @@ int vcd_recorder_destroy() int vcd_recorder_set(const char* audio_type, vce_audio_type_e type, int rate, int channel) { if (NULL == audio_type) { + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Audio type is NULL"); return VCD_ERROR_INVALID_PARAMETER; } if (NULL != g_current_audio_type) { if (0 == strncmp(g_current_audio_type, audio_type, strlen(g_current_audio_type))) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Current audio type is already set : %s", audio_type); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Current audio type is already set : %s", audio_type); return 0; } } else { @@ -586,7 +587,7 @@ int vcd_recorder_set(const char* audio_type, vce_audio_type_e type, int rate, in return VCD_ERROR_INVALID_STATE; } - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] set audio type (%s)", audio_type); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] set audio type (%s)", audio_type); vcd_engine_set_audio_type(audio_type); if (VCD_RECORDER_STATE_READY != g_recorder_state) { @@ -600,7 +601,7 @@ int vcd_recorder_set(const char* audio_type, vce_audio_type_e type, int rate, in strncmp(g_current_audio_type, VCE_AUDIO_ID_WIFI, strlen(g_current_audio_type)) && strncmp(g_current_audio_type, VCE_AUDIO_ID_NONE, strlen(g_current_audio_type)) && !strncmp(audio_type, VCE_AUDIO_ID_NONE, strlen(audio_type)))) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Skip stop recording while Recorder is NOT ready"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Skip stop recording while Recorder is NOT ready"); } else { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Recorder is NOT ready"); vcd_recorder_stop(); @@ -644,7 +645,7 @@ int vcd_recorder_set(const char* audio_type, vce_audio_type_e type, int rate, in } if (g_audio_type != type || g_audio_rate != rate || g_audio_channel != channel) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] New audio type(%d) rate(%d) channel(%d)", type, rate, channel); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] New audio type(%d) rate(%d) channel(%d)", type, rate, channel); audio_in_destroy(g_audio_h); audio_channel_e audio_ch; @@ -694,7 +695,7 @@ int vcd_recorder_set(const char* audio_type, vce_audio_type_e type, int rate, in #endif } - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Current audio type is changed : %s", g_current_audio_type); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Current audio type is changed : %s", g_current_audio_type); return 0; } @@ -790,7 +791,7 @@ Eina_Bool __read_normal_func(void *data) int ret = -1; if (VCD_RECORDER_STATE_RECORDING != g_recorder_state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Exit audio reading normal func"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Exit audio reading normal func"); return EINA_FALSE; } @@ -865,7 +866,7 @@ static void __check_audio_format() } if (g_audio_type != type || g_audio_rate != rate || g_audio_channel != channel) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] New audio type(%d) rate(%d) channel(%d)", type, rate, channel); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] New audio type(%d) rate(%d) channel(%d)", type, rate, channel); audio_in_destroy(g_audio_h); audio_channel_e audio_ch; @@ -904,18 +905,18 @@ static void __check_audio_format() g_audio_rate = rate; g_audio_channel = channel; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] audio type(%d) rate(%d) channel(%d)", g_audio_type, g_audio_rate, g_audio_channel); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] audio type(%d) rate(%d) channel(%d)", g_audio_type, g_audio_rate, g_audio_channel); } } int vcd_recorder_start_streaming() { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] start streaming"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] start streaming"); vcd_audio_streaming_mode_e streaming_mode; vcd_config_get_audio_streaming_mode(&streaming_mode); if (VCD_AUDIO_STREAMING_MODE_VC_SERVICE == streaming_mode) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); return VCD_ERROR_NONE; } @@ -957,7 +958,7 @@ int vcd_recorder_send_streaming(const void* buffer, const unsigned int length) vcd_audio_streaming_mode_e streaming_mode; vcd_config_get_audio_streaming_mode(&streaming_mode); if (VCD_AUDIO_STREAMING_MODE_VC_SERVICE == streaming_mode) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); return VCD_ERROR_NONE; } @@ -981,12 +982,12 @@ int vcd_recorder_send_streaming(const void* buffer, const unsigned int length) int vcd_recorder_stop_streaming() { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] stop streaming"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] stop streaming"); vcd_audio_streaming_mode_e streaming_mode; vcd_config_get_audio_streaming_mode(&streaming_mode); if (VCD_AUDIO_STREAMING_MODE_VC_SERVICE == streaming_mode) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); return VCD_ERROR_NONE; } @@ -1005,7 +1006,7 @@ int vcd_recorder_change_system_volume() if (!g_stream_for_volume_h) { ret = sound_manager_create_stream_information_internal(SOUND_STREAM_TYPE_VOICE_RECOGNITION_SERVICE, NULL, NULL, &g_stream_for_volume_h); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Fail to create stream information, ret(%d)", ret); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Fail to create stream information, ret(%d)", ret); return VCD_ERROR_OPERATION_FAILED; } } @@ -1064,18 +1065,18 @@ int vcd_recorder_start() vcd_audio_streaming_mode_e streaming_mode; vcd_config_get_audio_streaming_mode(&streaming_mode); if (VCD_AUDIO_STREAMING_MODE_MULTI_ASSISTANT == streaming_mode || VCD_AUDIO_STREAMING_MODE_OUTSIDE == streaming_mode) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); return VCD_ERROR_NONE; } g_buffer_count = 0; - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Enter, recorder state(%d)", g_recorder_state); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Enter, recorder state(%d)", g_recorder_state); if (VCD_RECORDER_STATE_RECORDING == g_recorder_state) return 0; bool started = false; - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] audio type : %s", g_current_audio_type); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] audio type : %s", g_current_audio_type); if (NULL != g_current_audio_type) { if (0 == strncmp(VCE_AUDIO_ID_BLUETOOTH, g_current_audio_type, strlen(VCE_AUDIO_ID_BLUETOOTH))) { @@ -1083,12 +1084,12 @@ int vcd_recorder_start() if (BT_ERROR_NONE != bt_hid_set_audio_data_receive_cb(_bt_hid_audio_data_receive_cb, NULL)) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail bt_hid_set_audio_data_receive_cb()"); } - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Start bt audio"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Start bt audio"); g_bt_extend_count = 0; started = true; #endif } else if (0 == strncmp(VCE_AUDIO_ID_FFV, g_current_audio_type, strlen(VCE_AUDIO_ID_FFV))) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] call farfield_voice_register_audio_cb() function"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] call farfield_voice_register_audio_cb() function"); #ifdef TV_FFV_MODE if (g_farfieldvoice_h) { SLOG(LOG_INFO, TAG_VCD, "[Recorder INFO] Register farfield voice audio callback"); @@ -1097,7 +1098,7 @@ int vcd_recorder_start() #endif started = true; } else if (0 == strncmp(VCE_AUDIO_ID_WIFI, g_current_audio_type, strlen(VCE_AUDIO_ID_WIFI))) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] call RegisterMSFAudioCallback() function"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] call RegisterMSFAudioCallback() function"); #ifdef TV_MSF_WIFI_MODE ret = RegisterMSFAudioCallback(__msf_wifi_audio_data_receive_cb, NULL); @@ -1112,7 +1113,7 @@ int vcd_recorder_start() } } - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] started = %d", started); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] started = %d", started); if (false == started) { /* check audio format */ __check_audio_format(); @@ -1141,7 +1142,7 @@ int vcd_recorder_start() /* Add ecore timer to read audio data */ ecore_main_loop_thread_safe_call_async(__timer_read_normal_func, NULL); - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Start audio in recorder"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Start audio in recorder"); } g_recorder_state = VCD_RECORDER_STATE_RECORDING; @@ -1184,7 +1185,7 @@ int vcd_recorder_stop() vcd_audio_streaming_mode_e streaming_mode; vcd_config_get_audio_streaming_mode(&streaming_mode); if (VCD_AUDIO_STREAMING_MODE_MULTI_ASSISTANT == streaming_mode || VCD_AUDIO_STREAMING_MODE_OUTSIDE == streaming_mode) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Current audio streaming mode(%d)", streaming_mode); return VCD_ERROR_NONE; } @@ -1217,7 +1218,7 @@ int vcd_recorder_stop() while (5 > bt_retry) { ret = bt_hid_rc_stop_sending_voice(NULL); if (BT_ERROR_NONE == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Stop bt audio recorder"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] Stop bt audio recorder"); stoped = true; break; } else if (BT_ERROR_NOW_IN_PROGRESS == ret) { @@ -1232,7 +1233,7 @@ int vcd_recorder_stop() (!strncmp(g_current_audio_type, VCE_AUDIO_ID_BLUETOOTH, sizeof(VCE_AUDIO_ID_BLUETOOTH)) || !strncmp(g_current_audio_type, VCE_AUDIO_ID_FFV, sizeof(VCE_AUDIO_ID_FFV)) || !strncmp(g_current_audio_type, VCE_AUDIO_ID_WIFI, sizeof(VCE_AUDIO_ID_WIFI)))) { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] Recorder reset to NONE"); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] Recorder reset to NONE"); vcd_recorder_set(VCE_AUDIO_ID_NONE, g_audio_type, g_audio_rate, g_audio_channel); } @@ -1242,7 +1243,7 @@ int vcd_recorder_stop() } #endif } else if (0 == strncmp(VCE_AUDIO_ID_FFV, g_current_audio_type, strlen(VCE_AUDIO_ID_FFV))) { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] FFV"); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] FFV"); #ifdef TV_FFV_MODE // Unregister callback for far field audio if (g_farfieldvoice_h) @@ -1252,7 +1253,7 @@ int vcd_recorder_stop() (!strncmp(g_current_audio_type, VCE_AUDIO_ID_BLUETOOTH, sizeof(VCE_AUDIO_ID_BLUETOOTH)) || !strncmp(g_current_audio_type, VCE_AUDIO_ID_FFV, sizeof(VCE_AUDIO_ID_FFV)) || !strncmp(g_current_audio_type, VCE_AUDIO_ID_WIFI, sizeof(VCE_AUDIO_ID_WIFI)))) { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] Recorder reset to NONE"); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] Recorder reset to NONE"); vcd_recorder_set(VCE_AUDIO_ID_NONE, g_audio_type, g_audio_rate, g_audio_channel); } stoped = true; @@ -1264,13 +1265,13 @@ int vcd_recorder_stop() if (NULL != g_current_audio_type && (!strncmp(g_current_audio_type, VCE_AUDIO_ID_BLUETOOTH, sizeof(VCE_AUDIO_ID_BLUETOOTH)) || !strncmp(g_current_audio_type, VCE_AUDIO_ID_WIFI, sizeof(VCE_AUDIO_ID_WIFI)))) { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] Recorder reset to NONE"); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] Recorder reset to NONE"); vcd_recorder_set(VCE_AUDIO_ID_NONE, g_audio_type, g_audio_rate, g_audio_channel); } stoped = true; #endif } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] current audio type is NONE"); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] current audio type is NONE"); } } @@ -1299,7 +1300,7 @@ int vcd_recorder_get_state() int vcd_recorder_set_pcm_path(const char *path) { - SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] set pcm path : %s", path); + SLOG(LOG_INFO, TAG_VCD, "[Recorder] set pcm path : %s", path); if (path == NULL) return 0; diff --git a/server/vcd_server.c b/server/vcd_server.c index 8f8c608..77e0ff8 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -66,7 +66,7 @@ static int __start_internal_recognition(); */ static Eina_Bool __stop_by_silence(void *data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ Silence Detected "); + SLOG(LOG_INFO, TAG_VCD, "@@@ Silence Detected "); vcd_server_mgr_stop(); @@ -76,7 +76,7 @@ static Eina_Bool __stop_by_silence(void *data) static Eina_Bool __cancel_by_interrupt(void *data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ Cancel by interrupt"); + SLOG(LOG_INFO, TAG_VCD, "@@@ Cancel by interrupt"); vcd_server_mgr_cancel(); @@ -86,7 +86,7 @@ static Eina_Bool __cancel_by_interrupt(void *data) static void __cancel_by_error(void *data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ Cancel by error"); + SLOG(LOG_INFO, TAG_VCD, "@@@ Cancel by error"); vcd_server_mgr_cancel(); @@ -96,7 +96,7 @@ static void __cancel_by_error(void *data) static Eina_Bool __restart_engine(void *data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ Restart by no result"); + SLOG(LOG_INFO, TAG_VCD, "@@@ Restart by no result"); g_restart_timer = NULL; @@ -107,7 +107,7 @@ static Eina_Bool __restart_engine(void *data) return EINA_FALSE; } - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Start engine"); + SLOG(LOG_INFO, TAG_VCD, "[Server Success] Start engine"); vcd_recognition_mode_e mode = vcd_client_get_recognition_mode(); if (VCD_RECOGNITION_MODE_RESTART_AFTER_REJECT == mode || VCD_RECOGNITION_MODE_RESTART_CONTINUOUSLY == mode) { @@ -115,7 +115,7 @@ static Eina_Bool __restart_engine(void *data) vcdc_send_service_state(VCD_STATE_RECORDING); } - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Restart recognition"); + SLOG(LOG_INFO, TAG_VCD, "[Server Success] Restart recognition"); SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return EINA_FALSE; @@ -168,7 +168,7 @@ static int __server_recorder_callback(const void* data, const unsigned int lengt vcd_config_set_service_state(VCD_STATE_PROCESSING); vcdc_send_service_state(VCD_STATE_PROCESSING); - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Stop engine only by silence"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Stop engine only by silence"); } else if (VCD_RECOGNITION_MODE_RESTART_CONTINUOUSLY == vcd_client_get_recognition_mode()) { /* Stop engine recognition */ int ret = vcd_engine_recognize_stop(); @@ -183,7 +183,7 @@ static int __server_recorder_callback(const void* data, const unsigned int lengt void __server_recorder_interrupt_callback() { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ Cancel by sound interrupt"); + SLOG(LOG_INFO, TAG_VCD, "@@@ Cancel by sound interrupt"); ecore_timer_add(0, __cancel_by_interrupt, NULL); @@ -192,12 +192,12 @@ void __server_recorder_interrupt_callback() static void __config_lang_changed_cb(const char* current_lang, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ Change language "); + SLOG(LOG_INFO, TAG_VCD, "@@@ Change language "); /* Current state is recording */ vcd_state_e state = vcd_config_get_service_state(); if (VCD_STATE_RECORDING == state || VCD_STATE_PROCESSING == state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Current state is 'Recording'. Cancel recognition"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Current state is 'Recording'. Cancel recognition"); vcd_server_mgr_cancel(); } @@ -207,7 +207,7 @@ static void __config_lang_changed_cb(const char* current_lang, void* user_data) SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to set language of engine : %d", ret); } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "@@@"); return; } @@ -216,13 +216,13 @@ static void __config_foreground_changed_cb(int previous, int current, void* user { SLOG(LOG_DEBUG, TAG_VCD, "@@@ Change foreground"); - SLOG(LOG_DEBUG, TAG_VCD, "Foreground pid(%d)", current); + SLOG(LOG_INFO, TAG_VCD, "Foreground pid(%d)", current); if (VC_NO_FOREGROUND_PID != current) { /* Foreground app is changed */ vcd_state_e state = vcd_config_get_service_state(); if (VCD_STATE_RECORDING == state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Foreground pid(%d) is changed. Cancel recognition", current); + SLOG(LOG_INFO, TAG_VCD, "[Server] Foreground pid(%d) is changed. Cancel recognition", current); ecore_timer_add(0, __cancel_by_interrupt, NULL); } } @@ -442,7 +442,7 @@ int vcd_send_asr_result(vce_asr_result_event_e event, const char* asr_result, vo } if (NULL != asr_result) { - SECURE_SLOG(LOG_DEBUG, TAG_VCD, "[Server] ASR result - Event(%d), Text(%s)", event, asr_result); + SECURE_SLOG(LOG_INFO, TAG_VCD, "[Server] ASR result - Event(%d), Text(%s)", event, asr_result); ret = vcdc_send_pre_result_to_manager(vcd_client_manager_get_pid(), event, asr_result); if (0 != ret) { SECURE_SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send ASR result : mgr_pid(%d), asr_result(%s)", vcd_client_manager_get_pid(), asr_result); @@ -455,7 +455,7 @@ int vcd_send_asr_result(vce_asr_result_event_e event, const char* asr_result, vo int vcd_send_specific_engine_result(const char* engine_app_id, const char* event, const char* result, void *user_info) { if (NULL != result) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] specific engine result - Event(%s), Text(%s)", event, result); + SLOG(LOG_INFO, TAG_VCD, "[Server] specific engine result - Event(%s), Text(%s)", event, result); vcdc_send_specific_engine_result_to_manager(vcd_client_manager_get_pid(), engine_app_id, event, result); } @@ -506,7 +506,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c #if 1 /* if nlu_result is exist, Add command handle(is_action) into result list */ /* Normal result */ - SLOG(LOG_DEBUG, TAG_VCD, "[Server] @ Get engine result @"); + SLOG(LOG_INFO, TAG_VCD, "[Server] @ Get engine result @"); vc_cmd_s* temp_cmd = NULL; vc_cmd_list_h vc_cmd_list = NULL; @@ -563,7 +563,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c bool enable = false; vcd_client_widget_get_asr_result_enabled(pid, &enable); if (true == enable) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Send ASR result to Widget client"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Send ASR result to Widget client"); bool is_consumed = false; if (NULL != user_info) { *user_info = 0x00; @@ -571,7 +571,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c if (0 != vcdc_send_asr_result(pid, event, all_result, VC_COMMAND_TYPE_WIDGET, &is_consumed)) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send asr result"); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] ASR result is consumed(%d)", is_consumed); + SLOG(LOG_INFO, TAG_VCD, "[Server] ASR result is consumed(%d)", is_consumed); if (true == is_consumed) { if (NULL != user_info) { *user_info = 0x01; @@ -635,7 +635,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c temp_cmd->id = i; if (0 != vc_cmd_list_add(vc_cmd_list, (vc_cmd_h)temp_cmd)) { - SLOG(LOG_DEBUG, TAG_VCD, "Fail to add command to list"); + SLOG(LOG_WARN, TAG_VCD, "[Server WARNING] Fail to add command to list"); vc_cmd_destroy((vc_cmd_h)temp_cmd); temp_cmd = NULL; } @@ -676,7 +676,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c vc_cmd_print_list(vc_cmd_list); - SLOG(LOG_DEBUG, TAG_VCD, "[Server] @@@@"); + SLOG(LOG_INFO, TAG_VCD, "[Server] @@@@"); int result_count = 0; vc_cmd_list_get_count(vc_cmd_list, &result_count); @@ -687,7 +687,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c vc_cmd_list_h widget_cmd_list = NULL; vc_cmd_list_h foreground_cmd_list = NULL; if (NULL != all_result) { - SECURE_SLOG(LOG_DEBUG, TAG_VCD, "[Server] Engine result is no command : %s", all_result); + SECURE_SLOG(LOG_INFO, TAG_VCD, "[Server] Engine result is no command : %s", all_result); int cnt = 0; if (0 != vc_cmd_list_create(&widget_cmd_list)) { @@ -736,21 +736,21 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c vc_cmd_list_destroy(widget_cmd_list, true); widget_cmd_list = NULL; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Engine result is NULL"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Engine all result is NULL"); } vc_cmd_list_get_count(vc_cmd_list, &result_count); // After running partial matching algorithm, if there is no result. if (0 == result_count) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] No commands even after partial matching"); + SLOG(LOG_INFO, TAG_VCD, "[Server] No commands even after partial matching"); bool temp = vcd_client_manager_get_exclusive(); vc_info_parser_set_result(all_result, event, msg, NULL, temp); int pid = vcd_client_widget_get_foreground_pid(); if (-1 != pid) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Request tooltip hide"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Request tooltip hide"); /* Send to hide tooltip */ vcdc_send_show_tooltip(pid, false); } @@ -851,7 +851,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c int pid = vcd_client_widget_get_foreground_pid(); if (-1 != pid) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Request tooltip hide"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Request tooltip hide"); vcdc_send_show_tooltip(pid, false); } @@ -865,7 +865,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c SLOG(LOG_WARN, TAG_VCD, "[Server WARNING] Fail to send result"); } } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Manager is NOT available. Send result to client directly"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Manager is NOT available. Send result to client directly"); ecore_timer_add(0, __vcd_send_selected_result, NULL); } } else { @@ -888,7 +888,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c if (VCD_RECOGNITION_MODE_RESTART_AFTER_REJECT == recognition_mode) { if (VCE_RESULT_EVENT_REJECTED == event) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Restart by no or rejected result"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Restart by no or rejected result"); /* If no result and restart option is ON */ /* Send reject message */ bool temp = vcd_client_manager_get_exclusive(); @@ -901,11 +901,11 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c g_restart_timer = ecore_timer_add(0, __restart_engine, NULL); return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Stop recorder due to success"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Stop recorder due to success"); //vcd_recorder_stop(); ecore_main_loop_thread_safe_call_sync(__recorder_stop, NULL); } else if (VCD_RECOGNITION_MODE_RESTART_CONTINUOUSLY == recognition_mode) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Restart continuously"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Restart continuously"); /* Restart option is ON */ g_restart_timer = ecore_timer_add(0, __restart_engine, NULL); if (VCE_RESULT_EVENT_REJECTED == event) { @@ -1180,7 +1180,7 @@ int vcd_send_feedback_streaming(vce_feedback_event_e event, char* buffer, int le */ static void __vcd_file_clean_up() { - SLOG(LOG_DEBUG, TAG_VCD, "== Old file clean up == "); + SLOG(LOG_INFO, TAG_VCD, "== Old file clean up == "); DIR *dp = NULL; struct dirent *dirp = NULL; @@ -1204,7 +1204,7 @@ static void __vcd_file_clean_up() if (0 != remove(remove_path)) { SLOG(LOG_WARN, TAG_VCD, "[File message WARN] Fail to remove file : %s", remove_path); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[File message] Remove file : %s", remove_path); + SLOG(LOG_INFO, TAG_VCD, "[File message] Remove file : %s", remove_path); } } } @@ -1434,7 +1434,7 @@ static void __vcd_cleanup_client(vcd_client_type_e type) } if (0 == ret || mgr_pid > 0) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ Clean up %s client ", type ? (type == 1) ? "Widget" : "Manager" : "Normal"); + SLOG(LOG_INFO, TAG_VCD, "@@@ Clean up %s client ", type ? (type == 1) ? "Widget" : "Manager" : "Normal"); if (NULL != client_list && client_count > 0) { for (i = 0; i < client_count; i++) { exist = false; @@ -1443,7 +1443,7 @@ static void __vcd_cleanup_client(vcd_client_type_e type) iter = g_list_nth(g_proc_list, j); if (NULL != iter) { if (*(client_list + i) == GPOINTER_TO_INT(iter->data)) { - SLOG(LOG_DEBUG, TAG_VCD, "%s pid(%d) is running", type ? (type == 1) ? "Widget" : "Manager" : "Normal", *(client_list + i)); + SLOG(LOG_INFO, TAG_VCD, "%s pid(%d) is running", type ? (type == 1) ? "Widget" : "Manager" : "Normal", *(client_list + i)); exist = true; break; } @@ -1461,7 +1461,7 @@ static void __vcd_cleanup_client(vcd_client_type_e type) } } } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "@@@"); } if (NULL != client_list && -1 == mgr_pid) { free(client_list); @@ -1479,7 +1479,7 @@ Eina_Bool vcd_cleanup_client_all(void *data) __vcd_cleanup_client(VCD_CLIENT_TYPE_MANAGER); if (0 == vcd_client_get_ref_count()) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Connected client list is empty"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Connected client list is empty"); ecore_timer_add(0, __finalize_quit_ecore_loop, NULL); } #if 0 @@ -1650,7 +1650,7 @@ int vcd_server_mgr_finalize(int pid) } if (0 == vcd_client_get_ref_count()) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Connected client list is empty"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Connected client list is empty"); ecore_timer_add(0, __finalize_quit_ecore_loop, NULL); } @@ -1968,7 +1968,7 @@ int vcd_server_mgr_stop() return VCD_ERROR_INVALID_STATE; } if (-1 == vcd_client_manager_get_pid()) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Manager is NOT available."); + SLOG(LOG_INFO, TAG_VCD, "[Server] Manager is NOT available."); return VCD_ERROR_OPERATION_FAILED; } SLOG(LOG_ERROR, TAG_VCD, "[Server] stop internal recognition"); @@ -1995,7 +1995,7 @@ int vcd_server_mgr_stop() int vcd_server_mgr_cancel() { if (-1 == vcd_client_manager_get_pid()) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Manager is NOT available."); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Manager is NOT available."); return VCD_ERROR_OPERATION_FAILED; } @@ -2008,14 +2008,14 @@ int vcd_server_mgr_cancel() /* 1. Check current state */ vcd_state_e state = vcd_config_get_service_state(); if (VCD_STATE_READY == state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Current state is READY"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Current state is READY"); vcd_recorder_stop(); if (false == vcd_client_manager_get_exclusive()) { if (1 == vcd_config_get_command_type_enabled(VC_COMMAND_TYPE_WIDGET)) { int pid = vcd_client_widget_get_foreground_pid(); if (-1 != pid) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Request tooltip hide"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Request tooltip hide"); ecore_timer_add(0, __vcd_request_show_tooltip, (void*)false); } } @@ -2041,7 +2041,7 @@ int vcd_server_mgr_cancel() if (1 == vcd_config_get_command_type_enabled(VC_COMMAND_TYPE_WIDGET)) { int pid = vcd_client_widget_get_foreground_pid(); if (-1 != pid) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Request tooltip hide"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Request tooltip hide"); ecore_timer_add(0, __vcd_request_show_tooltip, (void*)false); } } @@ -2084,7 +2084,7 @@ int vcd_server_mgr_set_domain(int pid, const char* domain) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to set domain : %d", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] Set domain"); + SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] Set domain"); } return ret; @@ -2109,7 +2109,7 @@ int vcd_server_mgr_set_private_data(int pid, const char* key, const char* data) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to set private data : %d", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] Set private data"); + SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] Set private data"); } return ret; @@ -2133,7 +2133,7 @@ int vcd_server_mgr_get_private_data(int pid, const char* key, char** data) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to get private data : %d", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] Set private data"); + SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] Set private data"); } return ret; @@ -2157,7 +2157,7 @@ int vcd_server_mgr_send_specific_engine_request(int pid, const char* engine_app_ if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to set specific engine request : %d", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] Set specific engine request "); + SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] Set specific engine request "); } return ret; @@ -2192,7 +2192,7 @@ int vcd_server_mgr_do_action(int pid, int type, const char* action) } else { vcd_config_set_service_state(VCD_STATE_PROCESSING); vcdc_send_service_state(VCD_STATE_PROCESSING); - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] Process do action"); + SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] Process do action"); } return ret; @@ -2261,7 +2261,7 @@ int vcd_server_mgr_start_feedback(void) return VCD_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCD, "[Server] start TTS feedback"); + SLOG(LOG_INFO, TAG_VCD, "[Server] start TTS feedback"); /* check there is TTS buffer to be spoken */ @@ -2278,14 +2278,14 @@ int vcd_server_mgr_stop_feedback(void) return VCD_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCD, "[Server] stop TTS feedback"); + SLOG(LOG_INFO, TAG_VCD, "[Server] stop TTS feedback"); return VCD_ERROR_NONE; } int vcd_server_mgr_send_audio_streaming(int pid, int event, unsigned char* buffer, unsigned int len) { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] Send Audio Streaming from Multi-assistant. event(%d), buffer(%p), len(%d)", event, &buffer, len); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] Send Audio Streaming from Multi-assistant. event(%d), buffer(%p), len(%d)", event, &buffer, len); int ret = 0; if (VCD_AUDIO_STREAMING_EVENT_START == event) { @@ -2315,7 +2315,7 @@ int vcd_server_mgr_send_audio_streaming(int pid, int event, unsigned char* buffe int vcd_server_mgr_change_system_volume(int pid, vcd_system_volume_event_e system_volume_event) { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] change system volume, system volume event(%d)", system_volume_event); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] change system volume, system volume event(%d)", system_volume_event); int ret = 0; if (VCD_SYSTEM_VOLUME_EVENT_CHANGE == system_volume_event) { @@ -2358,7 +2358,7 @@ int vcd_server_initialize(int pid) return VCD_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Client Initialize : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[Server Success] Client Initialize : pid(%d)", pid); return VCD_ERROR_NONE; } @@ -2377,11 +2377,11 @@ int vcd_server_finalize(int pid) } if (0 == vcd_client_get_ref_count()) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Connected client list is empty"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Connected client list is empty"); ecore_timer_add(0, __finalize_quit_ecore_loop, NULL); } - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Client Finalize : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[Server Success] Client Finalize : pid(%d)", pid); return VCD_ERROR_NONE; } @@ -2502,11 +2502,11 @@ int vcd_server_set_server_dialog(int pid, const char* app_id, const char* creden if (0 != strncmp(credential, "#NULL", strlen(credential))) { ret = vcd_client_set_server_dialog(pid, true); if (0 != ret) - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set to true for server dialog, app_id(%s)", app_id); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set to true for server dialog, app_id(%s)", app_id); } else { ret = vcd_client_set_server_dialog(pid, false); if (0 != ret) - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set to false for server dialog, app_id(%s)", app_id); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set to false for server dialog, app_id(%s)", app_id); } return 0; @@ -2565,7 +2565,7 @@ int vcd_server_is_system_command_valid(int pid, int* is_sys_cmd_valid) static void __start_tts_request_thread(void* data, Ecore_Thread* thread) { - SLOG(LOG_DEBUG, TAG_VCD, "[SUCCESS] Start tts request thread"); + SLOG(LOG_INFO, TAG_VCD, "[SUCCESS] Start tts request thread"); vc_tts_text_data_s* tts_text_data = NULL; while (1) { @@ -2577,7 +2577,7 @@ static void __start_tts_request_thread(void* data, Ecore_Thread* thread) if (0 != ret || NULL == tts_text_data) { /* empty queue */ if (0 >= vcd_data_get_tts_text_data_size()) { - SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] No tts text data"); + SLOG(LOG_INFO, TAG_VCD, "[DEBUG] No tts text data"); return; } SLOG(LOG_INFO, TAG_VCD, "[INFO] tts text data is just incoming"); @@ -2606,7 +2606,7 @@ static void __start_tts_request_thread(void* data, Ecore_Thread* thread) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to request tts : %d", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] request tts, uid(%d) pid(%d), text(%s), language(%s), utt_id(%d)", + SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] request tts, uid(%d) pid(%d), text(%s), language(%s), utt_id(%d)", tts_text_data->uid, tts_text_data->pid, tts_text_data->text, tts_text_data->language, tts_text_data->utt_id); } /* clear tts text data after use */ @@ -2617,7 +2617,7 @@ static void __start_tts_request_thread(void* data, Ecore_Thread* thread) static void __end_tts_request_thread(void* data, Ecore_Thread* thread) { - SLOG(LOG_DEBUG, TAG_VCD, "[SUCCESS] End tts request thread"); + SLOG(LOG_INFO, TAG_VCD, "[SUCCESS] End tts request thread"); g_tts_thread = NULL; } @@ -2693,7 +2693,7 @@ int vcd_server_cancel_tts(int pid, int utt_id) if (0 != ret) { SLOG(LOG_WARN, TAG_VCD, "[Server WARN] No data in vcd tts text queue"); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Clear tts text data, pid(%d), utt_id(%d), text(%s)", pid, utt_id, tts_text_data->text); + SLOG(LOG_INFO, TAG_VCD, "[Server] Clear tts text data, pid(%d), utt_id(%d), text(%s)", pid, utt_id, tts_text_data->text); vcd_data_clear_tts_text_data(&tts_text_data); } @@ -2702,7 +2702,7 @@ int vcd_server_cancel_tts(int pid, int utt_id) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to cancel tts : %d", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] request tts, pid(%d), utt_id(%d)", pid, utt_id); + SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] request tts, pid(%d), utt_id(%d)", pid, utt_id); } return 0; @@ -2727,7 +2727,7 @@ int vcd_server_get_tts_audio_format(int pid, int* rate, int* channel, int* audio if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to get tts audio format : %d", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] get tts audio format, pid(%d), rate(%d), channel(%d), audio_type(%d)", pid, *rate, *channel, *audio_type); + SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] get tts audio format, pid(%d), rate(%d), channel(%d), audio_type(%d)", pid, *rate, *channel, *audio_type); } return ret; @@ -2873,7 +2873,7 @@ int vcd_server_widget_initialize(int pid) return VCD_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Initialize widget : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[Server Success] Initialize widget : pid(%d)", pid); return VCD_ERROR_NONE; } @@ -2939,7 +2939,7 @@ int vcd_server_widget_start_recording(int pid, bool widget_command) if (true == widget_command) { vcd_client_widget_set_command(pid); - SLOG(LOG_DEBUG, TAG_VCD, "[Server] widget command is available"); + SLOG(LOG_INFO, TAG_VCD, "[Server] widget command is available"); } else { vcd_client_widget_unset_command(pid); SLOG(LOG_WARN, TAG_VCD, "[Server] widget command is NOT available"); @@ -2969,7 +2969,7 @@ int vcd_server_widget_start(int pid, bool stop_by_silence) /* Service state should be ready */ if (VCD_STATE_READY != state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Current state is not Ready : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "[Server] Current state is not Ready : pid(%d)", pid); return VCD_ERROR_INVALID_STATE; } @@ -2996,13 +2996,13 @@ int vcd_server_widget_stop(int pid) /* Service state should be recording */ if (VCD_STATE_RECORDING != state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Current service state is not Recording : pid(%d)", pid); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Current service state is not Recording : pid(%d)", pid); return VCD_ERROR_INVALID_STATE; } ret = vcd_server_mgr_stop(); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Fail to start recognition"); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Fail to start recognition"); return VCD_ERROR_OPERATION_FAILED; } @@ -3024,13 +3024,13 @@ int vcd_server_widget_cancel(int pid) /* Service state should be recording or processing */ if (VCD_STATE_RECORDING != state && VCD_STATE_PROCESSING != state) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Current state is not Recording or Processing : pid(%d)", pid); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Current state is not Recording or Processing : pid(%d)", pid); return VCD_ERROR_INVALID_STATE; } ret = vcd_server_mgr_cancel(); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Fail to cancel recognition : %d", ret); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Fail to cancel recognition : %d", ret); return ret; } @@ -3042,7 +3042,7 @@ int vcd_server_widget_enable_asr_result(int pid, bool enable) int ret; ret = vcd_client_widget_set_asr_result_enabled(pid, enable); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Fail to enable asr result : %d", ret); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Fail to enable asr result : %d", ret); } return ret; @@ -3054,13 +3054,13 @@ int vcd_server_set_language(const char* language) ret = vcd_config_set_default_language(language); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Fail to set language : %d", ret); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Fail to set language : %d", ret); return ret; } ret = vcd_engine_set_current_language(language); if (0 != ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Fail to set language : %d", ret); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Fail to set language : %d", ret); return ret; } @@ -3071,7 +3071,7 @@ int vcd_server_set_language(const char* language) */ int vcd_get_foreach_command(vce_cmd_h vce_command, vce_command_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Get foreach command"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Get foreach command"); if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] input parameter is NULL"); @@ -3089,7 +3089,7 @@ int vcd_get_foreach_command(vce_cmd_h vce_command, vce_command_cb callback, void int vcd_get_command_count(vce_cmd_h vce_command, int* count) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Get command count"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Get command count"); int ret = 0; ret = vcd_engine_agent_get_command_count(vce_command, count); @@ -3102,7 +3102,7 @@ int vcd_get_command_count(vce_cmd_h vce_command, int* count) int vcd_get_audio_type(char** audio_type) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Get audio type"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Get audio type"); int ret = 0; ret = vcd_engine_agent_get_audio_type(audio_type); @@ -3126,7 +3126,7 @@ int vcd_set_private_data(const char* key, const char* data) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to set private data to the manager client : ret(%d)", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set private data to the manager client, key(%s), data(%s)", key, data); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set private data to the manager client, key(%s), data(%s)", key, data); } return ret; @@ -3145,7 +3145,7 @@ int vcd_get_private_data(const char* key, char** data) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to get private data from the manager client : ret(%d)", ret); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Get private data from the manager client, key(%s), data(%s)", key, *data); + SLOG(LOG_INFO, TAG_VCD, "[Server] Get private data from the manager client, key(%s), data(%s)", key, *data); } return ret; @@ -3153,7 +3153,7 @@ int vcd_get_private_data(const char* key, char** data) int vcd_start_recording() { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Start recording"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Start recording"); int ret = 0; ret = vcd_engine_agent_start_recording(); @@ -3166,7 +3166,7 @@ int vcd_start_recording() int vcd_stop_recording() { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Stop recording"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Stop recording"); int ret = 0; ret = vcd_engine_agent_stop_recording(); @@ -3179,7 +3179,7 @@ int vcd_stop_recording() int vcd_send_update_status(vce_update_event_e update_event, const char* msg) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] update status, update event(%d), msg(%s)", update_event, msg); + SLOG(LOG_INFO, TAG_VCD, "[Server] update status, update event(%d), msg(%s)", update_event, msg); int ret = 0; if (VCE_UPDATE_EVENT_START == update_event) { @@ -3206,7 +3206,7 @@ int vcd_send_update_status(vce_update_event_e update_event, const char* msg) int vcd_set_private_data_set_cb(vce_private_data_set_cb callback_func) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set private data set cb"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set private data set cb"); int ret = 0; ret = vcd_engine_agent_set_private_data_set_cb(callback_func); @@ -3219,7 +3219,7 @@ int vcd_set_private_data_set_cb(vce_private_data_set_cb callback_func) int vcd_set_private_data_requested_cb(vce_private_data_requested_cb callback_func) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set private data requested cb"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set private data requested cb"); int ret = 0; ret = vcd_engine_agent_set_private_data_requested_cb(callback_func); @@ -3232,7 +3232,7 @@ int vcd_set_private_data_requested_cb(vce_private_data_requested_cb callback_fun int vcd_set_nlu_base_info_requested_cb(vce_nlu_base_info_requested_cb callback_func) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set nlu base info requested cb"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set nlu base info requested cb"); int ret = 0; ret = vcd_engine_agent_set_nlu_base_info_requested_cb(callback_func); @@ -3245,7 +3245,7 @@ int vcd_set_nlu_base_info_requested_cb(vce_nlu_base_info_requested_cb callback_f int vcd_set_specific_engine_request_cb(vce_specific_engine_request_cb callback_func) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set specific engine request cb"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set specific engine request cb"); int ret = 0; ret = vcd_engine_agent_set_specific_engine_request_cb(callback_func); if (0 != ret) { @@ -3257,7 +3257,7 @@ int vcd_set_specific_engine_request_cb(vce_specific_engine_request_cb callback_f int vcd_set_request_tts_cb(vce_request_tts_cb callback_func, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set request tts cb"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set request tts cb"); int ret = 0; ret = vcd_engine_agent_set_request_tts_cb(callback_func, user_data); if (0 != ret) { @@ -3269,7 +3269,7 @@ int vcd_set_request_tts_cb(vce_request_tts_cb callback_func, void* user_data) int vcd_set_cancel_tts_cb(vce_cancel_tts_cb callback_func, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set cancel tts cb"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set cancel tts cb"); int ret = 0; ret = vcd_engine_agent_set_cancel_tts_cb(callback_func, user_data); if (0 != ret) { @@ -3281,7 +3281,7 @@ int vcd_set_cancel_tts_cb(vce_cancel_tts_cb callback_func, void* user_data) int vcd_set_tts_audio_format_request_cb(vce_tts_audio_format_request_cb callback_func, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Set tts audio format request cb"); + SLOG(LOG_INFO, TAG_VCD, "[Server] Set tts audio format request cb"); int ret = 0; ret = vcd_engine_agent_set_get_tts_audio_format_cb(callback_func, user_data); if (0 != ret) { diff --git a/server/vcd_server_data.cpp b/server/vcd_server_data.cpp index 2b636a9..8100709 100644 --- a/server/vcd_server_data.cpp +++ b/server/vcd_server_data.cpp @@ -112,7 +112,7 @@ int vcd_data_clear_tts_text_data(vc_tts_text_data_s** tts_text_data) int vcd_data_get_tts_text_data(int uid, vc_tts_text_data_s** data) { - SLOG(LOG_DEBUG, TAG_VCD, "[DATA] Get tts text data : uid(%d)", uid); + SLOG(LOG_INFO, TAG_VCD, "[DATA] Get tts text data : uid(%d)", uid); /* mutex is locked */ pthread_mutex_lock(&g_tts_text_data_mutex); @@ -143,7 +143,7 @@ int vcd_data_get_tts_text_data(int uid, vc_tts_text_data_s** data) int vcd_data_get_first_tts_text_data(vc_tts_text_data_s** data) { - SLOG(LOG_DEBUG, TAG_VCD, "[DATA] Get first tts text data"); + SLOG(LOG_INFO, TAG_VCD, "[DATA] Get first tts text data"); #ifdef DATA_DEBUG __data_show_text_list(); @@ -178,7 +178,7 @@ int vcd_data_get_tts_text_data_size(void) pthread_mutex_lock(&g_tts_text_data_mutex); int size = g_tts_text_data.size(); - SLOG(LOG_DEBUG, TAG_VCD, "[DATA] get feedback data size(%d)", size); + SLOG(LOG_INFO, TAG_VCD, "[DATA] get feedback data size(%d)", size); /* mutex is unlocked */ pthread_mutex_unlock(&g_tts_text_data_mutex); diff --git a/server/vce.c b/server/vce.c index 7a9bf97..023d72e 100644 --- a/server/vce.c +++ b/server/vce.c @@ -89,7 +89,7 @@ static int __check_privilege(const char* uid, const char * privilege) pid_t pid = getpid(); char *session = cynara_session_from_pid(pid); int ret = cynara_check(p_cynara, smack_label, session, uid, privilege); - SLOG(LOG_DEBUG, TAG_VCD, "[Client]cynara_check returned %d(%s)", ret, (CYNARA_API_ACCESS_ALLOWED == ret) ? "Allowed" : "Denied"); + SLOG(LOG_INFO, TAG_VCD, "[Client]cynara_check returned %d(%s)", ret, (CYNARA_API_ACCESS_ALLOWED == ret) ? "Allowed" : "Denied"); if (session) free(session); @@ -142,7 +142,7 @@ int vce_main(int argc, char** argv, vce_request_callback_s *callback) SLOG(LOG_DEBUG, TAG_VCD, " "); SLOG(LOG_DEBUG, TAG_VCD, " "); - SLOG(LOG_DEBUG, TAG_VCD, "===== VC Engine Service Initialize"); + SLOG(LOG_INFO, TAG_VCD, "===== VC Engine Service Initialize"); int ret = VCE_ERROR_NONE; @@ -164,7 +164,7 @@ int vce_main(int argc, char** argv, vce_request_callback_s *callback) return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "[Main] VC Engine Service start..."); + SLOG(LOG_INFO, TAG_VCD, "[Main] VC Engine Service start..."); SLOG(LOG_DEBUG, TAG_VCD, "====="); SLOG(LOG_DEBUG, TAG_VCD, " "); -- 2.7.4 From db123f9e51f42ca3d54f4f01d6a4e52dfe286660 Mon Sep 17 00:00:00 2001 From: "wn.jang" Date: Fri, 6 Dec 2019 17:07:35 +0900 Subject: [PATCH 07/16] Fix url link properly Change-Id: I54d102c77bc52b535e3c77bc07d50e23032147af --- doc/uix_vc_doc.h | 2 +- doc/uix_vc_engine_main_doc.h | 2 +- doc/uix_vc_mgr_doc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/uix_vc_doc.h b/doc/uix_vc_doc.h index d9c6fc9..4d33096 100644 --- a/doc/uix_vc_doc.h +++ b/doc/uix_vc_doc.h @@ -202,7 +202,7 @@ * It is recommended to design feature related codes in your application for reliability.
* You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.
* To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.
- * More details on featuring your application can be found from Feature Element. + * More details on featuring your application can be found from Feature Element. */ diff --git a/doc/uix_vc_engine_main_doc.h b/doc/uix_vc_engine_main_doc.h index e81a1fd..6610f0d 100644 --- a/doc/uix_vc_engine_main_doc.h +++ b/doc/uix_vc_engine_main_doc.h @@ -212,7 +212,7 @@ * It is recommended to design feature related codes in your application for reliability.
* You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.
* To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.
- * More details on featuring your application can be found from Feature Element. + * More details on featuring your application can be found from Feature Element. */ #endif /* __TIZEN_UIX_VOICE_CONTROL_ENGINE_DOC_H__ */ diff --git a/doc/uix_vc_mgr_doc.h b/doc/uix_vc_mgr_doc.h index 08c30cf..3ed28ce 100644 --- a/doc/uix_vc_mgr_doc.h +++ b/doc/uix_vc_mgr_doc.h @@ -280,7 +280,7 @@ * It is recommended to design feature related codes in your application for reliability.
* You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.
* To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.
- * More details on featuring your application can be found from Feature Element. + * More details on featuring your application can be found from Feature Element. */ -- 2.7.4 From 92c8ee0174a785c9c16badbe5a5e53ac3b9515be Mon Sep 17 00:00:00 2001 From: "wn.jang" Date: Fri, 13 Dec 2019 08:44:41 +0900 Subject: [PATCH 08/16] Add logs when successing on Dbus_no_reply Change-Id: Id9ce61de7510cf5a2fbd461a68be25cbd75fab3f --- client/vc_dbus.c | 8 ++++---- client/vc_mgr_dbus.c | 30 ++++++++++++++++++------------ client/vc_widget_dbus.c | 6 ++++-- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/client/vc_dbus.c b/client/vc_dbus.c index c78d5db..e41b7ef 100644 --- a/client/vc_dbus.c +++ b/client/vc_dbus.c @@ -929,12 +929,12 @@ int vc_dbus_set_foreground(int pid, bool value) SLOG(LOG_ERROR, TAG_VCC, "[Dbus ERROR] Fail to Send"); //LCOV_EXCL_LINE dbus_message_unref(msg); return VC_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_INFO, TAG_VCC, "[Dbus DEBUG] Success to Send"); + dbus_connection_flush(g_conn_sender); } - dbus_connection_flush(g_conn_sender); - dbus_message_unref(msg); - return 0; } @@ -1050,7 +1050,7 @@ int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, dbus_message_unref(msg); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, "[Dbus DEBUG] Success to Send"); + SLOG(LOG_INFO, TAG_VCC, "[Dbus DEBUG] Success to Send"); dbus_connection_flush(g_conn_sender); } diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c index ab64df0..1750069 100644 --- a/client/vc_mgr_dbus.c +++ b/client/vc_mgr_dbus.c @@ -1832,16 +1832,17 @@ int vc_mgr_dbus_request_do_action(int pid, vc_send_event_type_e type, char* send dbus_message_set_no_reply(msg, TRUE); + /* send the message and flush the connection */ if (1 != dbus_connection_send(g_m_conn_sender, msg, NULL)) { SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to Send"); dbus_message_unref(msg); - return -1; + return VC_ERROR_OPERATION_FAILED; } else { SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } - dbus_message_unref(msg); + dbus_message_unref(msg); return 0; } @@ -2320,16 +2321,16 @@ int vc_mgr_dbus_send_result(int pid, int cmd_type, int result_id) dbus_message_set_no_reply(msg, TRUE); /* send the message and flush the connection */ - if (!dbus_connection_send(g_m_conn_sender, msg, NULL)) { - SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to send result message"); + if (1 != dbus_connection_send(g_m_conn_sender, msg, NULL)) { + SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to Send"); + dbus_message_unref(msg); + return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_INFO, TAG_VCM, "[Dbus] Success to send result"); - + SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } dbus_message_unref(msg); - return 0; } @@ -2361,14 +2362,17 @@ int vc_mgr_dbus_send_result_selection(int pid) dbus_message_set_no_reply(msg, TRUE); + /* send the message and flush the connection */ if (1 != dbus_connection_send(g_m_conn_sender, msg, NULL)) { SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to Send"); - return -1; + dbus_message_unref(msg); + return VC_ERROR_OPERATION_FAILED; } else { SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } + dbus_message_unref(msg); return 0; } @@ -2403,16 +2407,17 @@ int vc_mgr_dbus_send_specific_engine_request(int pid, const char* engine_app_id, dbus_message_set_no_reply(msg, TRUE); + /* send the message and flush the connection */ if (1 != dbus_connection_send(g_m_conn_sender, msg, NULL)) { SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to Send"); dbus_message_unref(msg); - return -1; + return VC_ERROR_OPERATION_FAILED; } else { SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } - dbus_message_unref(msg); + dbus_message_unref(msg); return 0; } @@ -2439,16 +2444,17 @@ int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, int utt_status) dbus_message_set_no_reply(msg, TRUE); + /* send the message and flush the connection */ if (1 != dbus_connection_send(g_m_conn_sender, msg, NULL)) { SLOG(LOG_ERROR, TAG_VCM, "[Dbus ERROR] Fail to Send"); dbus_message_unref(msg); - return -1; + return VC_ERROR_OPERATION_FAILED; } else { SLOG(LOG_INFO, TAG_VCM, "[Dbus] SUCCESS Send"); dbus_connection_flush(g_m_conn_sender); } - dbus_message_unref(msg); + dbus_message_unref(msg); return 0; } diff --git a/client/vc_widget_dbus.c b/client/vc_widget_dbus.c index eddeb77..0ddb340 100644 --- a/client/vc_widget_dbus.c +++ b/client/vc_widget_dbus.c @@ -825,14 +825,16 @@ int vc_widget_dbus_set_foreground(int pid, bool value) dbus_message_set_no_reply(msg, TRUE); + /* send the message and flush the connection */ if (1 != dbus_connection_send(g_w_conn_sender, msg, NULL)) { SLOG(LOG_ERROR, TAG_VCW, "[Dbus ERROR] Fail to Send"); dbus_message_unref(msg); return VC_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_INFO, TAG_VCW, "[Dbus] SUCCESS Send"); + dbus_connection_flush(g_w_conn_sender); } - dbus_connection_flush(g_w_conn_sender); - dbus_message_unref(msg); return 0; -- 2.7.4 From 487ec2abf0dd64b332887d169a2c51e0d8febfaf Mon Sep 17 00:00:00 2001 From: sungrae jo Date: Fri, 13 Dec 2019 14:19:26 +0900 Subject: [PATCH 09/16] Fixed cynara code. Change-Id: I003147805de8550c63f68df7100a147bf3ea7311 Signed-off-by: sungrae jo --- client/vc.c | 37 +++++++++++++++---------------- client/vc_mgr.c | 63 +++++++++++++++++++++++------------------------------ common/vc_command.c | 36 +++++++++++++++--------------- server/vce.c | 35 ++++++++++++++--------------- 4 files changed, 81 insertions(+), 90 deletions(-) diff --git a/client/vc.c b/client/vc.c index ebd15ba..467120a 100644 --- a/client/vc.c +++ b/client/vc.c @@ -56,7 +56,7 @@ static int g_daemon_pid = 0; static int g_feature_enabled = -1; static bool g_backup = false; -static int g_privilege_allowed = -1; +static pthread_mutex_t g_cynara_mutex = PTHREAD_MUTEX_INITIALIZER; static cynara *p_cynara = NULL; static void __vc_notify_state_changed(void *data); @@ -142,29 +142,28 @@ static void __check_privilege_deinitialize() static int __vc_check_privilege() { - char uid[16]; + pthread_mutex_lock(&g_cynara_mutex); - if (0 == g_privilege_allowed) { - //LCOV_EXCL_START + bool ret = true; + ret = __check_privilege_initialize(); + if (false == ret) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] privilege initialize is failed"); //LCOV_EXCL_LINE + pthread_mutex_unlock(&g_cynara_mutex); + return VC_ERROR_PERMISSION_DENIED; + } + + char uid[16]; + snprintf(uid, 16, "%d", getuid()); + ret = true; + ret = __check_privilege(uid, VC_PRIVILEGE); + __check_privilege_deinitialize(); + if (false == ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Permission is denied"); + pthread_mutex_unlock(&g_cynara_mutex); return VC_ERROR_PERMISSION_DENIED; - //LCOV_EXCL_STOP - } else if (-1 == g_privilege_allowed) { - if (false == __check_privilege_initialize()) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] privilege initialize is failed"); //LCOV_EXCL_LINE - return VC_ERROR_PERMISSION_DENIED; - } - snprintf(uid, 16, "%d", getuid()); - if (false == __check_privilege(uid, VC_PRIVILEGE)) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Permission is denied"); - g_privilege_allowed = 0; - __check_privilege_deinitialize(); - return VC_ERROR_PERMISSION_DENIED; - } - __check_privilege_deinitialize(); } - g_privilege_allowed = 1; + pthread_mutex_unlock(&g_cynara_mutex); return VC_ERROR_NONE; } diff --git a/client/vc_mgr.c b/client/vc_mgr.c index e6111d8..b5f1b3c 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -63,7 +63,6 @@ static int g_daemon_pid = 0; static int g_feature_enabled = -1; -static int g_privilege_allowed = -1; static cynara *p_cynara = NULL; static pthread_mutex_t g_cynara_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -154,31 +153,24 @@ static int __vc_mgr_get_feature_enabled() static int __check_privilege_initialize() { - pthread_mutex_lock(&g_cynara_mutex); - int ret = cynara_initialize(&p_cynara, NULL); if (NULL == p_cynara || CYNARA_API_SUCCESS != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] fail to initialize(%d)", ret); - pthread_mutex_unlock(&g_cynara_mutex); return ret; } SLOG(LOG_ERROR, TAG_VCM, "[DEBUG] success to initialize cynara"); - pthread_mutex_unlock(&g_cynara_mutex); - return ret == CYNARA_API_SUCCESS; } static int __check_privilege(const char* uid, const char * privilege) { - pthread_mutex_lock(&g_cynara_mutex); FILE *fp = NULL; char label_path[1024] = "/proc/self/attr/current"; char smack_label[1024] = {'\0',}; if (!p_cynara) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] p_cynara is NULL"); - pthread_mutex_unlock(&g_cynara_mutex); return false; } @@ -198,56 +190,55 @@ static int __check_privilege(const char* uid, const char * privilege) free(session); if (ret != CYNARA_API_ACCESS_ALLOWED) { - pthread_mutex_unlock(&g_cynara_mutex); return false; } - pthread_mutex_unlock(&g_cynara_mutex); return true; } static void __check_privilege_deinitialize() { - pthread_mutex_lock(&g_cynara_mutex); if (p_cynara) { SLOG(LOG_ERROR, TAG_VCM, "[DEBUG] cynara finish"); cynara_finish(p_cynara); } p_cynara = NULL; - pthread_mutex_unlock(&g_cynara_mutex); } static int __vc_mgr_check_privilege() { - char uid[16]; + pthread_mutex_lock(&g_cynara_mutex); + + bool ret = true; + ret = __check_privilege_initialize(); + if (false == ret) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] privilege initialize is failed"); + pthread_mutex_unlock(&g_cynara_mutex); + return VC_ERROR_PERMISSION_DENIED; + } - if (0 == g_privilege_allowed) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied"); + char uid[16]; + snprintf(uid, 16, "%d", getuid()); + ret = true; + ret = __check_privilege(uid, VC_PRIVILEGE); + if (false == ret) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE, uid); + __check_privilege_deinitialize(); + pthread_mutex_unlock(&g_cynara_mutex); return VC_ERROR_PERMISSION_DENIED; - } else if (-1 == g_privilege_allowed) { - if (false == __check_privilege_initialize()) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] privilege initialize is failed"); - return VC_ERROR_PERMISSION_DENIED; - } - snprintf(uid, 16, "%d", getuid()); - /* check 'recorder' privilege */ - if (false == __check_privilege(uid, VC_PRIVILEGE)) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied(%s)(%s)", VC_PRIVILEGE, uid); - g_privilege_allowed = 0; - __check_privilege_deinitialize(); - return VC_ERROR_PERMISSION_DENIED; - } - /* check 'voicecontrol.manager' privilege */ - if (false == __check_privilege(uid, VC_MGR_PRIVILEGE)) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied(%s)(%s)", VC_MGR_PRIVILEGE, uid); - g_privilege_allowed = 0; - __check_privilege_deinitialize(); - return VC_ERROR_PERMISSION_DENIED; - } + } + + ret = true; + ret = __check_privilege(uid, VC_MGR_PRIVILEGE); + if (false == ret) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Permission is denied(%s)(%s)", VC_MGR_PRIVILEGE, uid); __check_privilege_deinitialize(); + pthread_mutex_unlock(&g_cynara_mutex); + return VC_ERROR_PERMISSION_DENIED; } - g_privilege_allowed = 1; + __check_privilege_deinitialize(); + pthread_mutex_unlock(&g_cynara_mutex); return VC_ERROR_NONE; } diff --git a/common/vc_command.c b/common/vc_command.c index d1ca79b..93ff07d 100644 --- a/common/vc_command.c +++ b/common/vc_command.c @@ -35,7 +35,7 @@ static int g_feature_enabled = -1; -static int g_privilege_allowed = 1; /* Always True */ +static pthread_mutex_t g_cynara_mutex = PTHREAD_MUTEX_INITIALIZER; static cynara *p_cynara = NULL; static GList *g_cmd_list = NULL; static GList *g_cmdlist_list = NULL; @@ -130,28 +130,28 @@ static void __check_privilege_deinitialize() static int __vc_cmd_check_privilege() { - char uid[16]; + pthread_mutex_lock(&g_cynara_mutex); - if (0 == g_privilege_allowed) { - SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Permission is denied"); + bool ret = true; + ret = __check_privilege_initialize(); + if (false == ret) { + SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] privilege initialize is failed"); + pthread_mutex_unlock(&g_cynara_mutex); return VC_ERROR_PERMISSION_DENIED; - } else if (-1 == g_privilege_allowed) { - if (false == __check_privilege_initialize()) { - SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] privilege initialize is failed"); - return VC_ERROR_PERMISSION_DENIED; - } - snprintf(uid, 16, "%d", getuid()); - if (false == __check_privilege(uid, VC_PRIVILEGE)) { - SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Permission is denied"); - g_privilege_allowed = 0; - __check_privilege_deinitialize(); - return VC_ERROR_PERMISSION_DENIED; - } - __check_privilege_deinitialize(); } - g_privilege_allowed = 1; + char uid[16]; + snprintf(uid, 16, "%d", getuid()); + ret = true; + ret = __check_privilege(uid, VC_PRIVILEGE); + __check_privilege_deinitialize(); + if (false == ret) { + SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Permission is denied"); + pthread_mutex_unlock(&g_cynara_mutex); + return VC_ERROR_PERMISSION_DENIED; + } + pthread_mutex_unlock(&g_cynara_mutex); return VC_ERROR_NONE; } diff --git a/server/vce.c b/server/vce.c index 023d72e..7825c9a 100644 --- a/server/vce.c +++ b/server/vce.c @@ -26,7 +26,7 @@ #include "vce.h" static int g_feature_enabled = -1; -static int g_privilege_allowed = -1; +static pthread_mutex_t g_cynara_mutex = PTHREAD_MUTEX_INITIALIZER; static cynara *p_cynara = NULL; static int __vce_get_feature_enabled() @@ -107,27 +107,28 @@ static void __check_privilege_deinitialize() static int __vce_check_privilege() { - char uid[16]; + pthread_mutex_lock(&g_cynara_mutex); + + bool ret = true; + ret = __check_privilege_initialize(); + if (false == ret) { + SLOG(LOG_ERROR, TAG_VCD, "[ERROR] privilege initialize is failed"); + pthread_mutex_unlock(&g_cynara_mutex); + return VCE_ERROR_PERMISSION_DENIED; + } - if (0 == g_privilege_allowed) { + char uid[16]; + snprintf(uid, 16, "%d", getuid()); + ret = true; + ret = __check_privilege(uid, VC_PRIVILEGE); + __check_privilege_deinitialize(); + if (false == ret) { SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Permission is denied"); + pthread_mutex_unlock(&g_cynara_mutex); return VCE_ERROR_PERMISSION_DENIED; - } else if (-1 == g_privilege_allowed) { - if (false == __check_privilege_initialize()) { - SLOG(LOG_ERROR, TAG_VCD, "[ERROR] privilege initialize is failed"); - return VCE_ERROR_PERMISSION_DENIED; - } - snprintf(uid, 16, "%d", getuid()); - if (false == __check_privilege(uid, VC_PRIVILEGE)) { - SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Permission is denied"); - g_privilege_allowed = 0; - __check_privilege_deinitialize(); - return VCE_ERROR_PERMISSION_DENIED; - } - __check_privilege_deinitialize(); } - g_privilege_allowed = 1; + pthread_mutex_unlock(&g_cynara_mutex); return VCE_ERROR_NONE; } -- 2.7.4 From f102e26fb6dafd45552b6b7d07647cc4e74e062b Mon Sep 17 00:00:00 2001 From: sungrae jo Date: Tue, 24 Dec 2019 16:15:29 +0900 Subject: [PATCH 10/16] Fixed cynara log Change-Id: Iab3c41a9c23beb9294ad7f5e3b93573f47775a45 Signed-off-by: sungrae jo --- client/vc_mgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index b5f1b3c..c092045 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -159,7 +159,6 @@ static int __check_privilege_initialize() return ret; } - SLOG(LOG_ERROR, TAG_VCM, "[DEBUG] success to initialize cynara"); return ret == CYNARA_API_SUCCESS; } @@ -185,11 +184,12 @@ static int __check_privilege(const char* uid, const char * privilege) pid_t pid = getpid(); char *session = cynara_session_from_pid(pid); int ret = cynara_check(p_cynara, smack_label, session, uid, privilege); - SLOG(LOG_INFO, TAG_VCM, "[Client]cynara_check returned %d(%s), p_cynara(%p), label(%s), session(%s), uid(%s), priv(%s)", ret, (CYNARA_API_ACCESS_ALLOWED == ret) ? "Allowed" : "Denied", p_cynara, smack_label, session, uid, privilege); if (session) free(session); + session = NULL; if (ret != CYNARA_API_ACCESS_ALLOWED) { + SLOG(LOG_INFO, TAG_VCM, "[Client]cynara_check returned %d(Denied), p_cynara(%p), label(%s), session(%s), uid(%s), priv(%s)", ret, p_cynara, smack_label, session, uid, privilege); return false; } -- 2.7.4 From 9d39902cf86b7fee84a4415d03ef5c0e732051bd Mon Sep 17 00:00:00 2001 From: "wn.jang" Date: Thu, 9 Jan 2020 09:19:00 +0900 Subject: [PATCH 11/16] Ignore empty string as audio_id Change-Id: Ifa0640d08c8547697fa83d71fe6eaa90097e6e32 --- client/vc_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index c092045..9f397e7 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -1329,7 +1329,7 @@ int vc_mgr_set_audio_type(const char* audio_id) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == audio_id) { + if (NULL == audio_id || !strncmp(audio_id, "", strlen(audio_id))) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); return VC_ERROR_INVALID_PARAMETER; } -- 2.7.4 From 78c914251efae3c9a34ba81251756b4090387221 Mon Sep 17 00:00:00 2001 From: "wn.jang" Date: Mon, 30 Dec 2019 14:12:03 +0900 Subject: [PATCH 12/16] Update codes for gcc 9.2 compiler Change-Id: Ibc0e249fe887830978f3b001d70a84a0b794c032 (cherry picked from commit fe2387cfc75548de1aedc15bf5015fa35fee4610) --- client/vc_mgr_dbus.c | 2 +- common/vc_cmd_db.c | 10 +++++----- server/vcd_server.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c index 1750069..a95852c 100644 --- a/client/vc_mgr_dbus.c +++ b/client/vc_mgr_dbus.c @@ -294,7 +294,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (NULL != err_msg && strcmp("#NULL", err_msg)) { temp_msg = strdup(err_msg); } - SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr Get Error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, temp_msg); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr Get Error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, (temp_msg) ? temp_msg : "NULL"); __vc_mgr_cb_error(reason, daemon_pid, temp_msg); if (NULL != temp_msg) { free(temp_msg); diff --git a/common/vc_cmd_db.c b/common/vc_cmd_db.c index ad72839..62edb6c 100644 --- a/common/vc_cmd_db.c +++ b/common/vc_cmd_db.c @@ -789,11 +789,10 @@ static int __vc_db_remove_invocation_name(char* org_cmd, const char* invocation_ SLOG(LOG_WARN, vc_db_tag(), "[WARNING] No need to remove invocation name, org_cmd(%s) invocation(%s)", org_cmd, invocation_name); return VC_DB_ERROR_INVALID_PARAMETER; } - if (0 == strncasecmp(org_cmd, invocation_name, strlen(invocation_name))) { *new_cmd = strdup(org_cmd + strlen(invocation_name) + 1); } - SLOG(LOG_DEBUG, vc_db_tag(), "Original cmd[%s], New cmd[%s], Invocation name[%s]", org_cmd, *new_cmd, invocation_name); + SLOG(LOG_INFO, vc_db_tag(), "Original cmd[%s], New cmd[%s], Invocation name[%s]", org_cmd, (*new_cmd) ? *new_cmd : "NULL", invocation_name); return VC_DB_ERROR_NONE; } @@ -822,8 +821,9 @@ static int __vc_db_extract_unfixed_command(char* command, char* fixed, char** te if (0 == strncasecmp(command, fixed, strlen(fixed))) { strncpy(temp, command + strlen(fixed) + 1, strlen(command) - strlen(fixed) - 1); SLOG(LOG_WARN, vc_db_tag(), "@@@"); - } else if (0 == strncasecmp(command + strlen(command) - strlen(fixed), fixed, strlen(fixed))) { - strncpy(temp, command, strlen(command) - strlen(fixed) - 1); + } else if (0 == strncasecmp(command + strlen(command) - strlen(fixed), fixed, strlen(fixed))) { + command[strlen(command) - strlen(fixed) - 1] = '\0'; + snprintf(temp, 256, "%s", command); SLOG(LOG_WARN, vc_db_tag(), "@@@"); } @@ -1553,7 +1553,7 @@ int __vc_db_open_db_for_daemon(char** path, sqlite3** db_handle) if (*db_handle) { char* err_msg = NULL; - static const const char* sql = "PRAGMA journal_mode = WAL"; + static const char* sql = "PRAGMA journal_mode = WAL"; int ret = sqlite3_exec(*db_handle, sql, NULL, NULL, &err_msg); if (ret != SQLITE_OK) { SLOG(LOG_ERROR, vc_db_tag(), "sqlite3_exec returned %d: %s", ret, err_msg); diff --git a/server/vcd_server.c b/server/vcd_server.c index 77e0ff8..5a54f55 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -1191,14 +1191,14 @@ static void __vcd_file_clean_up() return; } - char remove_path[256] = {0, }; + char remove_path[257] = {0, }; do { dirp = readdir(dp); if (NULL != dirp) { if (!strncmp("vc_", dirp->d_name, strlen("vc_"))) { - memset(remove_path, 0, 256); - snprintf(remove_path, 256, "%s/%s", VC_RUNTIME_INFO_ROOT, dirp->d_name); + memset(remove_path, 0, 257); + snprintf(remove_path, 257, "%s/%s", VC_RUNTIME_INFO_ROOT, dirp->d_name); /* Clean up code */ if (0 != remove(remove_path)) { -- 2.7.4 From 247e3f3fe3b2ec90c58bfeff8b4a50c6d0b3a7c3 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Mon, 16 Dec 2019 17:19:46 +0900 Subject: [PATCH 13/16] Change mgr dbus by sending disabled cmd types when vc_mgr_start is requested Change-Id: I9818af52c1fcfea901443fc75b7e9a362e751587 Signed-off-by: sooyeon.kim (cherry picked from commit 0a6b707b5c99d96d26e768c1159e466d58fa8071) --- client/vc_mgr.c | 57 ++++++---------- client/vc_mgr_client.c | 50 ++++++++++++++ client/vc_mgr_client.h | 6 ++ client/vc_mgr_dbus.c | 173 ++--------------------------------------------- client/vc_mgr_dbus.h | 6 +- server/vcd_config.c | 32 ++------- server/vcd_config.h | 4 +- server/vcd_dbus.c | 6 -- server/vcd_dbus_server.c | 120 ++++---------------------------- server/vcd_dbus_server.h | 4 -- server/vcd_server.c | 33 ++------- server/vcd_server.h | 4 +- 12 files changed, 107 insertions(+), 388 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 9f397e7..f8a4b78 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -944,24 +944,13 @@ int vc_mgr_enable_command_type(int cmd_type) } int ret; - int count = 0; - do { - ret = vc_mgr_dbus_request_enable_command_type(g_vc_m->handle, cmd_type); - if (0 != ret) { - if (VC_ERROR_TIMED_OUT != ret) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to request enable command type : %s", __vc_mgr_get_error_code(ret)); - break; - } else { - SLOG(LOG_WARN, TAG_VCM, "[WARNING] retry request enable command type : %s", __vc_mgr_get_error_code(ret)); - usleep(10000); - count++; - if (VC_RETRY_COUNT == count) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to request"); - break; - } - } - } - } while (0 != ret); + + ret = vc_mgr_client_enable_command_type(g_vc_m, (vc_cmd_type_e)cmd_type); // enable the cmd type + if (0 != ret) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to enable the command type(%d). ret(%d)", cmd_type, ret); + } else { + SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Success to enable the command type(%d)", cmd_type); + } SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); @@ -1010,24 +999,13 @@ int vc_mgr_disable_command_type(int cmd_type) } int ret; - int count = 0; - do { - ret = vc_mgr_dbus_request_disable_command_type(g_vc_m->handle, cmd_type); - if (0 != ret) { - if (VC_ERROR_TIMED_OUT != ret) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to request disable command type : %s", __vc_mgr_get_error_code(ret)); - break; - } else { - SLOG(LOG_WARN, TAG_VCM, "[WARNING] retry request disable command type : %s", __vc_mgr_get_error_code(ret)); - usleep(10000); - count++; - if (VC_RETRY_COUNT == count) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to request"); - break; - } - } - } - } while (0 != ret); + + ret = vc_mgr_client_disable_command_type(g_vc_m, (vc_cmd_type_e)cmd_type); // enable the cmd type + if (0 != ret) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to disable the command type(%d). ret(%d)", cmd_type, ret); + } else { + SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Success to disable the command type(%d)", cmd_type); + } SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); @@ -2120,6 +2098,11 @@ int vc_mgr_start(bool exclusive_command_option) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to get start by client"); } + int disabled_cmd_type = 0; + if (0 != vc_mgr_client_get_disabled_command_type(g_vc_m, &disabled_cmd_type)) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to get disabled command type"); + } + int ret; int count = 0; vc_recognition_mode_e recognition_mode = VC_RECOGNITION_MODE_STOP_BY_SILENCE; @@ -2132,7 +2115,7 @@ int vc_mgr_start(bool exclusive_command_option) count = 0; while (0 != ret) { vc_mgr_client_set_internal_state(g_vc_m, VC_INTERNAL_STATE_STARTING); - ret = vc_mgr_dbus_request_start(g_vc_m->handle, (int)recognition_mode, exclusive_command_option, start_by_client); + ret = vc_mgr_dbus_request_start(g_vc_m->handle, (int)recognition_mode, exclusive_command_option, start_by_client, disabled_cmd_type); if (0 != ret) { if (VC_ERROR_TIMED_OUT != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to start request start : %s", __vc_mgr_get_error_code(ret)); diff --git a/client/vc_mgr_client.c b/client/vc_mgr_client.c index 2317c43..4ccb0c3 100644 --- a/client/vc_mgr_client.c +++ b/client/vc_mgr_client.c @@ -85,6 +85,9 @@ typedef struct { /* audio type */ char* audio_id; + /* disabled command type */ + int disabled_cmd_type; + /* recognition mode */ vc_recognition_mode_e recognition_mode; @@ -223,6 +226,8 @@ int vc_mgr_client_create(vc_h* vc) client->cb_ref_count = 0; + client->disabled_cmd_type = 0x00; + /* Authority */ client->authorized_client_list = NULL; client->valid_authorized_pid = -1; @@ -935,6 +940,51 @@ int vc_mgr_client_get_error_message(vc_h vc, char** err_msg) return 0; } +int vc_mgr_client_enable_command_type(vc_h vc, vc_cmd_type_e cmd_type) +{ + SLOG(LOG_INFO, TAG_VCM, "[Manager INFO] enable command type (%d)", cmd_type); + + vc_mgr_client_s* client = __mgr_client_get(vc); + + /* check handle */ + if (NULL == client) + return VC_ERROR_INVALID_PARAMETER; + + client->disabled_cmd_type &= ~(1 << cmd_type); + + return 0; +} + +int vc_mgr_client_disable_command_type(vc_h vc, vc_cmd_type_e cmd_type) +{ + SLOG(LOG_INFO, TAG_VCM, "[Manager INFO] disable command type (%d)", cmd_type); + + vc_mgr_client_s* client = __mgr_client_get(vc); + + /* check handle */ + if (NULL == client) + return VC_ERROR_INVALID_PARAMETER; + + client->disabled_cmd_type |= (1 << cmd_type); + + return 0; +} + +int vc_mgr_client_get_disabled_command_type(vc_h vc, int* disabled_cmd_type) +{ + SLOG(LOG_INFO, TAG_VCM, "[Manager INFO] get disabled command type"); + + vc_mgr_client_s* client = __mgr_client_get(vc); + + /* check handle */ + if (NULL == client) + return VC_ERROR_INVALID_PARAMETER; + + *disabled_cmd_type = client->disabled_cmd_type; + + return 0; +} + int vc_mgr_client_set_exclusive_command(vc_h vc, bool value) { vc_mgr_client_s* client = __mgr_client_get(vc); diff --git a/client/vc_mgr_client.h b/client/vc_mgr_client.h index 3ee6512..800ba0f 100644 --- a/client/vc_mgr_client.h +++ b/client/vc_mgr_client.h @@ -139,6 +139,12 @@ int vc_mgr_client_set_error_message(vc_h vc, const char* err_msg); int vc_mgr_client_get_error_message(vc_h vc, char** err_msg); +int vc_mgr_client_enable_command_type(vc_h vc, vc_cmd_type_e cmd_type); + +int vc_mgr_client_disable_command_type(vc_h vc, vc_cmd_type_e cmd_type); + +int vc_mgr_client_get_disabled_command_type(vc_h vc, int* disabled_cmd_type); + int vc_mgr_client_set_exclusive_command(vc_h vc, bool value); bool vc_mgr_client_get_exclusive_command(vc_h vc); diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c index a95852c..be34e3f 100644 --- a/client/vc_mgr_dbus.c +++ b/client/vc_mgr_dbus.c @@ -1846,7 +1846,7 @@ int vc_mgr_dbus_request_do_action(int pid, vc_send_event_type_e type, char* send return 0; } -int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_command_option, bool start_by_client) +int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_command_option, bool start_by_client, int disabled_cmd_type) { if (0 != __dbus_check()) { return VC_ERROR_OPERATION_FAILED; @@ -1884,8 +1884,8 @@ int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_comm SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr start : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr start : pid(%d), recognition_mode(%d) exclusive(%d) start by client(%d)", - pid, recognition_mode, exclusive_command_option, start_by_client); + SLOG(LOG_INFO, TAG_VCM, "@@ vc mgr start : pid(%d), recognition_mode(%d) exclusive(%d) start by client(%d) disabled cmd type(%d)", + pid, recognition_mode, exclusive_command_option, start_by_client, disabled_cmd_type); } int exclusive = (int)exclusive_command_option; @@ -1896,6 +1896,7 @@ int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_comm DBUS_TYPE_INT32, &(recognition_mode), DBUS_TYPE_INT32, &(exclusive), DBUS_TYPE_INT32, &(by), + DBUS_TYPE_INT32, &(disabled_cmd_type), DBUS_TYPE_INVALID); DBusMessage* result_msg; @@ -2099,172 +2100,6 @@ int vc_mgr_dbus_request_cancel(int pid) return result; } -int vc_mgr_dbus_request_enable_command_type(int pid, int cmd_type) -{ - if (0 != __dbus_check()) { - return VC_ERROR_OPERATION_FAILED; - } - - DBusError err; - dbus_error_init(&err); - - bool exist = dbus_bus_name_has_owner(g_m_conn_sender, VC_SERVER_SERVICE_NAME, &err); - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Dbus Error (%s)", err.message); - dbus_error_free(&err); - } - - int ret; - if (false == exist) { - ret = __dbus_restore_daemon(); - if (VC_ERROR_NONE != ret) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to restore daemon"); - return VC_ERROR_TIMED_OUT; - } - return VC_ERROR_OPERATION_FAILED; - } - - DBusMessage* msg; - - /* create a signal & check for errors */ - msg = dbus_message_new_method_call( - VC_SERVER_SERVICE_NAME, - VC_SERVER_SERVICE_OBJECT_PATH, /* object name of the signal */ - VC_SERVER_SERVICE_INTERFACE, /* interface name of the signal */ - VC_MANAGER_METHOD_ENABLE_COMMAND_TYPE); /* name of the signal */ - - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, "@@ vc enable command type : Fail to make message "); - return VC_ERROR_OPERATION_FAILED; - } else { - SLOG(LOG_INFO, TAG_VCM, "@@ vc enable command type : pid(%d) type(%d)", pid, cmd_type); - } - - dbus_message_append_args(msg, - DBUS_TYPE_INT32, &pid, - DBUS_TYPE_INT32, &cmd_type, - DBUS_TYPE_INVALID); - - DBusMessage* result_msg; - int result = VC_ERROR_OPERATION_FAILED; - - result_msg = dbus_connection_send_with_reply_and_block(g_m_conn_sender, msg, g_m_waiting_time, &err); - dbus_message_unref(msg); - - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Dbus Error (%s)", err.message); - dbus_error_free(&err); - } - - if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, - DBUS_TYPE_INT32, &result, - DBUS_TYPE_INVALID); - - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "@@ Get arguments error (%s)", err.message); - dbus_error_free(&err); - result = VC_ERROR_OPERATION_FAILED; - } - dbus_message_unref(result_msg); - - if (0 == result) { - SLOG(LOG_INFO, TAG_VCM, "@@ vc enable command type : result = %d", result); - } else { - SLOG(LOG_ERROR, TAG_VCM, "@@ vc enable command type : result = %d", result); - } - } else { - SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); - vc_mgr_dbus_reconnect(); - result = VC_ERROR_TIMED_OUT; - } - - return result; -} - -int vc_mgr_dbus_request_disable_command_type(int pid, int cmd_type) -{ - if (0 != __dbus_check()) { - return VC_ERROR_OPERATION_FAILED; - } - - DBusError err; - dbus_error_init(&err); - - bool exist = dbus_bus_name_has_owner(g_m_conn_sender, VC_SERVER_SERVICE_NAME, &err); - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Dbus Error (%s)", err.message); - dbus_error_free(&err); - } - - int ret; - if (false == exist) { - ret = __dbus_restore_daemon(); - if (VC_ERROR_NONE != ret) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to restore daemon"); - return VC_ERROR_TIMED_OUT; - } - return VC_ERROR_OPERATION_FAILED; - } - - DBusMessage* msg; - - /* create a signal & check for errors */ - msg = dbus_message_new_method_call( - VC_SERVER_SERVICE_NAME, - VC_SERVER_SERVICE_OBJECT_PATH, /* object name of the signal */ - VC_SERVER_SERVICE_INTERFACE, /* interface name of the signal */ - VC_MANAGER_METHOD_DISABLE_COMMAND_TYPE); /* name of the signal */ - - if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, "@@ vc disable command type : Fail to make message "); - return VC_ERROR_OPERATION_FAILED; - } else { - SLOG(LOG_INFO, TAG_VCM, "@@ vc disable command type : pid(%d) type(%d)", pid, cmd_type); - } - - dbus_message_append_args(msg, - DBUS_TYPE_INT32, &pid, - DBUS_TYPE_INT32, &cmd_type, - DBUS_TYPE_INVALID); - - DBusMessage* result_msg; - int result = VC_ERROR_OPERATION_FAILED; - - result_msg = dbus_connection_send_with_reply_and_block(g_m_conn_sender, msg, g_m_waiting_time, &err); - dbus_message_unref(msg); - - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Dbus Error (%s)", err.message); - dbus_error_free(&err); - } - - if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, - DBUS_TYPE_INT32, &result, - DBUS_TYPE_INVALID); - - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "@@ Get arguments error (%s)", err.message); - dbus_error_free(&err); - result = VC_ERROR_OPERATION_FAILED; - } - dbus_message_unref(result_msg); - - if (0 == result) { - SLOG(LOG_INFO, TAG_VCM, "@@ vc disable command type : result = %d", result); - } else { - SLOG(LOG_ERROR, TAG_VCM, "@@ vc disable command type : result = %d", result); - } - } else { - SLOG(LOG_ERROR, TAG_VCM, "@@ Result Message is NULL"); - vc_mgr_dbus_reconnect(); - result = VC_ERROR_TIMED_OUT; - } - - return result; -} - static DBusMessage* __get_message(int pid, const char* method, int type) { char service_name[64]; diff --git a/client/vc_mgr_dbus.h b/client/vc_mgr_dbus.h index a6202ea..e0f5942 100644 --- a/client/vc_mgr_dbus.h +++ b/client/vc_mgr_dbus.h @@ -56,7 +56,7 @@ int vc_mgr_dbus_request_set_domain(int pid, const char* domain); int vc_mgr_dbus_request_do_action(int pid, vc_send_event_type_e type, char* send_event); -int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_command_option, bool start_by_client); +int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_command_option, bool start_by_client, int disabled_cmd_type); int vc_mgr_dbus_request_stop(int pid); @@ -68,10 +68,6 @@ int vc_mgr_dbus_send_result_selection(int pid); int vc_mgr_dbus_send_specific_engine_request(int pid, const char* engine_app_id, const char* event, const char* request); -int vc_mgr_dbus_request_enable_command_type(int pid, int cmd_type); - -int vc_mgr_dbus_request_disable_command_type(int pid, int cmd_type); - int vc_mgr_dbus_request_start_feedback(int pid); int vc_mgr_dbus_request_stop_feedback(int pid); diff --git a/server/vcd_config.c b/server/vcd_config.c index ce97815..b7108b3 100644 --- a/server/vcd_config.c +++ b/server/vcd_config.c @@ -30,15 +30,8 @@ static int g_foreground_pid; static int g_audio_streaming_mode; #define COMMAND_TYPE_MAX 7 -static int g_enabled_command_type[COMMAND_TYPE_MAX] = { - 0, /* NONE */ - 1, /* FOREGROUND */ - 1, /* BACKGROUND */ - 1, /* WIDGET */ - 1, /* SYSTEM */ - 1, /* SYSTEM_BACKGROUND */ - 1 /* EXCLUSIVE */ -}; + +static int g_disabled_command_type = 0x00; void __vcd_config_lang_changed_cb(const char* before_lang, const char* current_lang) { @@ -145,25 +138,12 @@ int vcd_config_set_foreground(int pid, bool value) return 0; } -int vcd_config_enable_command_type(int cmd_type) +int vcd_config_set_disabled_command_type(int disabled_cmd_type) { - if (cmd_type <= 0 || cmd_type >= COMMAND_TYPE_MAX) { - SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Invalid command type"); - return -1; - } + SLOG(LOG_INFO, TAG_VCD, "[INFO] Set disabled command type"); - g_enabled_command_type[cmd_type] = 1; - return 0; -} - -int vcd_config_disable_command_type(int cmd_type) -{ - if (cmd_type <= 0 || cmd_type >= COMMAND_TYPE_MAX) { - SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Invalid command type"); - return -1; - } + g_disabled_command_type = disabled_cmd_type; - g_enabled_command_type[cmd_type] = 0; return 0; } @@ -174,7 +154,7 @@ int vcd_config_get_command_type_enabled(int cmd_type) return 0; } - return g_enabled_command_type[cmd_type]; + return ~(g_disabled_command_type) & (1 << cmd_type); } int vcd_config_get_audio_streaming_mode(vcd_audio_streaming_mode_e* streaming_mode) diff --git a/server/vcd_config.h b/server/vcd_config.h index 68db934..404b636 100644 --- a/server/vcd_config.h +++ b/server/vcd_config.h @@ -45,9 +45,7 @@ int vcd_config_get_foreground(int* pid); int vcd_config_set_foreground(int pid, bool value); -int vcd_config_enable_command_type(int cmd_type); - -int vcd_config_disable_command_type(int cmd_type); +int vcd_config_set_disabled_command_type(int disabled_cmd_type); int vcd_config_get_command_type_enabled(int cmd_type); diff --git a/server/vcd_dbus.c b/server/vcd_dbus.c index 834c951..1ca143e 100644 --- a/server/vcd_dbus.c +++ b/server/vcd_dbus.c @@ -1139,12 +1139,6 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle else if (dbus_message_is_method_call(msg, VC_SERVER_SERVICE_INTERFACE, VC_MANAGER_METHOD_SPECIFIC_ENGINE_REQUEST)) vcd_dbus_server_mgr_send_specific_engine_request(g_conn_listener, msg); - else if (dbus_message_is_method_call(msg, VC_SERVER_SERVICE_INTERFACE, VC_MANAGER_METHOD_ENABLE_COMMAND_TYPE)) - vcd_dbus_server_mgr_enable_command_type(g_conn_listener, msg); - - else if (dbus_message_is_method_call(msg, VC_SERVER_SERVICE_INTERFACE, VC_MANAGER_METHOD_DISABLE_COMMAND_TYPE)) - vcd_dbus_server_mgr_disable_command_type(g_conn_listener, msg); - else if (dbus_message_is_method_call(msg, VC_SERVER_SERVICE_INTERFACE, VC_MANAGER_METHOD_START_FEEDBACK)) vcd_dbus_server_mgr_start_feedback(g_conn_listener, msg); diff --git a/server/vcd_dbus_server.c b/server/vcd_dbus_server.c index 77a666f..46bacac 100644 --- a/server/vcd_dbus_server.c +++ b/server/vcd_dbus_server.c @@ -22,6 +22,15 @@ #include "vcd_server.h" #include "vcd_config.h" +vc_cmd_type_e vc_command_types[7] = {VC_COMMAND_TYPE_NONE, + VC_COMMAND_TYPE_FOREGROUND, + VC_COMMAND_TYPE_BACKGROUND, + VC_COMMAND_TYPE_WIDGET, + VC_COMMAND_TYPE_SYSTEM, + VC_COMMAND_TYPE_SYSTEM_BACKGROUND, + VC_COMMAND_TYPE_EXCLUSIVE}; + + int __dbus_error_return(DBusConnection* conn, DBusMessage* msg, int ret) { DBusMessage* reply; @@ -741,112 +750,6 @@ int vcd_dbus_server_mgr_do_action(DBusConnection* conn, DBusMessage* msg) return 0; } -int vcd_dbus_server_mgr_enable_command_type(DBusConnection* conn, DBusMessage* msg) -{ - DBusError err; - dbus_error_init(&err); - - int pid = 0; - int cmd_type = 0; - - int ret = VCD_ERROR_OPERATION_FAILED; - - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager enable command type"); - - dbus_message_get_args(msg, &err, - DBUS_TYPE_INT32, &pid, - DBUS_TYPE_INT32, &cmd_type, - DBUS_TYPE_INVALID); - - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr enable command type : get arguments error (%s)", err.message); - dbus_error_free(&err); - ret = VCD_ERROR_OPERATION_FAILED; - } else { - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr enable command type : pid(%d), cmd_type(%d)", pid, cmd_type); - ret = vcd_server_mgr_enable_command_type(pid, cmd_type); - } - - DBusMessage* reply; - reply = dbus_message_new_method_return(msg); - - if (NULL != reply) { - dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - - if (0 == ret) { - SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); - } else { - SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); - } - - if (!dbus_connection_send(conn, reply, NULL)) { - SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Out Of Memory!"); - } - - dbus_connection_flush(conn); - dbus_message_unref(reply); - } else { - SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); - } - - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); - - return 0; -} - -int vcd_dbus_server_mgr_disable_command_type(DBusConnection* conn, DBusMessage* msg) -{ - DBusError err; - dbus_error_init(&err); - - int pid = 0; - int cmd_type = 0; - - int ret = VCD_ERROR_OPERATION_FAILED; - - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager disable command type"); - - dbus_message_get_args(msg, &err, - DBUS_TYPE_INT32, &pid, - DBUS_TYPE_INT32, &cmd_type, - DBUS_TYPE_INVALID); - - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr disable command type : get arguments error (%s)", err.message); - dbus_error_free(&err); - ret = VCD_ERROR_OPERATION_FAILED; - } else { - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr disable command type : pid(%d), cmd_type(%d)", pid, cmd_type); - ret = vcd_server_mgr_disable_command_type(pid, cmd_type); - } - - DBusMessage* reply; - reply = dbus_message_new_method_return(msg); - - if (NULL != reply) { - dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); - - if (0 == ret) { - SLOG(LOG_INFO, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); - } else { - SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); - } - - if (!dbus_connection_send(conn, reply, NULL)) { - SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Out Of Memory!"); - } - - dbus_connection_flush(conn); - dbus_message_unref(reply); - } else { - SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); - } - - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); - - return 0; -} - int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg) { DBusError err; @@ -856,6 +759,7 @@ int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg) int recognition_mode = 0; int exclusive = 0; int start_by_client = 0; + int disabled_cmd_type = 0; int ret = VCD_ERROR_OPERATION_FAILED; @@ -866,6 +770,7 @@ int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INT32, &recognition_mode, DBUS_TYPE_INT32, &exclusive, DBUS_TYPE_INT32, &start_by_client, + DBUS_TYPE_INT32, &disabled_cmd_type, DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { @@ -873,6 +778,9 @@ int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg) dbus_error_free(&err); ret = VCD_ERROR_OPERATION_FAILED; } else { + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd check enabled or disabled command types. disabled cmd type(%d)", disabled_cmd_type); + vcd_server_mgr_set_disabled_command_type(pid, disabled_cmd_type); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr start : pid(%d) recognition_mode(%d) exclusive(%d) start by client(%d)", pid, recognition_mode, exclusive, start_by_client); ret = vcd_server_mgr_start((vcd_recognition_mode_e)recognition_mode, (bool)exclusive, (bool)start_by_client); } diff --git a/server/vcd_dbus_server.h b/server/vcd_dbus_server.h index 6182697..7890502 100644 --- a/server/vcd_dbus_server.h +++ b/server/vcd_dbus_server.h @@ -63,10 +63,6 @@ int vcd_dbus_server_mgr_cancel(DBusConnection* conn, DBusMessage* msg); int vcd_dbus_server_mgr_result_selection(DBusConnection* conn, DBusMessage* msg); -int vcd_dbus_server_mgr_enable_command_type(DBusConnection* conn, DBusMessage* msg); - -int vcd_dbus_server_mgr_disable_command_type(DBusConnection* conn, DBusMessage* msg); - int vcd_dbus_server_mgr_send_specific_engine_request(DBusConnection* conn, DBusMessage* msg); int vcd_dbus_server_mgr_change_system_volume(DBusConnection* conn, DBusMessage* msg); diff --git a/server/vcd_server.c b/server/vcd_server.c index 5a54f55..7385ffb 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -2198,7 +2198,7 @@ int vcd_server_mgr_do_action(int pid, int type, const char* action) return ret; } -int vcd_server_mgr_enable_command_type(int pid, int cmd_type) +int vcd_server_mgr_set_disabled_command_type(int pid, int disabled_cmd_type) { int ret = -1; @@ -2214,41 +2214,16 @@ int vcd_server_mgr_enable_command_type(int pid, int cmd_type) return VCD_ERROR_INVALID_STATE; } - ret = vcd_config_enable_command_type(cmd_type); + ret = vcd_config_set_disabled_command_type(disabled_cmd_type); if (0 != ret) { - SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to enable command type"); + SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to set command type"); } else { - SLOG(LOG_ERROR, TAG_VCD, "[Server] Enable command type(%d)", cmd_type); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Set command type(%d)", disabled_cmd_type); } return ret; } -int vcd_server_mgr_disable_command_type(int pid, int cmd_type) -{ - int ret = -1; - - /* check if pid is valid */ - if (false == vcd_client_manager_is_valid(pid)) { - SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] The manager pid(%d) is NOT valid", pid); - return VCD_ERROR_INVALID_PARAMETER; - } - - vcd_state_e state = vcd_config_get_service_state(); - if (VCD_STATE_READY != state) { - SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Current state is not ready"); - return VCD_ERROR_INVALID_STATE; - } - - ret = vcd_config_disable_command_type(cmd_type); - if (0 != ret) { - SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to disable command type"); - } else { - SLOG(LOG_ERROR, TAG_VCD, "[Server] Disable command type(%d)", cmd_type); - } - - return ret; -} /* for TTS feedback */ int vcd_server_mgr_start_feedback(void) diff --git a/server/vcd_server.h b/server/vcd_server.h index 7979e4a..23ec32a 100644 --- a/server/vcd_server.h +++ b/server/vcd_server.h @@ -77,9 +77,7 @@ int vcd_server_mgr_get_private_data(int pid, const char* key, char** data); int vcd_server_mgr_do_action(int pid, int type, const char* action); -int vcd_server_mgr_enable_command_type(int pid, int cmd_type); - -int vcd_server_mgr_disable_command_type(int pid, int cmd_type); +int vcd_server_mgr_set_disabled_command_type(int pid, int disabled_cmd_type); int vcd_server_mgr_change_system_volume(int pid, vcd_system_volume_event_e system_volume_event); -- 2.7.4 From 73b75f09c26fd9c428bb487679d4c454ad3ba568 Mon Sep 17 00:00:00 2001 From: "wn.jang" Date: Fri, 13 Dec 2019 07:54:48 +0900 Subject: [PATCH 14/16] Fix unsafety issue on config_mgr Change-Id: I7e2cc810d0fbddbbf874e7469699ef903dfdfb4b (cherry picked from commit 8c484a46c8f27348ac92aec42afdd61cb89e6c30) --- common/vc_config_mgr.c | 176 ++++++++++++++++++++++++++++++++++++++++------ common/vc_config_parser.c | 15 +++- 2 files changed, 166 insertions(+), 25 deletions(-) diff --git a/common/vc_config_mgr.c b/common/vc_config_mgr.c index 4edf45b..ca4895e 100644 --- a/common/vc_config_mgr.c +++ b/common/vc_config_mgr.c @@ -336,10 +336,14 @@ int __vc_config_mgr_get_engine_info() int filesize; vc_engine_info_s* info = NULL; + SLOG(LOG_DEBUG, vc_config_tag(), "[CONFIG] Release engine and Unregister engine config"); + __vc_config_release_engine(); g_engine_list = NULL; __vc_config_mgr_unregister_engine_config_updated_event(); + SLOG(LOG_DEBUG, vc_config_tag(), "[CONFIG] default directory : %s", VC_DEFAULT_ENGINE_INFO); + /* Copy default info directory to download directory */ dp = opendir(VC_DEFAULT_ENGINE_INFO); if (NULL == dp) { @@ -425,6 +429,8 @@ int __vc_config_mgr_get_engine_info() static Eina_Bool __vc_config_mgr_engine_config_inotify_event_callback(void* data, Ecore_Fd_Handler *fd_handler) { SLOG(LOG_DEBUG, vc_config_tag(), "@@@ Engine config updated callback event"); + ecore_thread_main_loop_begin(); + pthread_mutex_lock(&vc_config_mgr_mutex); vc_engine_inotify_s *ino = (vc_engine_inotify_s *)data; int dir_fd = ino->dir_fd; @@ -437,6 +443,8 @@ static Eina_Bool __vc_config_mgr_engine_config_inotify_event_callback(void* data if (0 > length) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Empty Inotify event"); SLOG(LOG_DEBUG, vc_config_tag(), "@@@"); + pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return ECORE_CALLBACK_DONE; } @@ -472,6 +480,8 @@ static Eina_Bool __vc_config_mgr_engine_config_inotify_event_callback(void* data SLOG(LOG_DEBUG, vc_config_tag(), "@@@"); + pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return ECORE_CALLBACK_PASS_ON; } @@ -557,10 +567,6 @@ static int __vc_config_mgr_unregister_engine_config_updated_event() return 0; } - - - - Eina_Bool vc_config_mgr_inotify_event_cb(void* data, Ecore_Fd_Handler *fd_handler) { SLOG(LOG_DEBUG, vc_config_tag(), "@@@ Config changed callback event"); @@ -802,11 +808,13 @@ int __vc_config_set_auto_language() void __vc_config_language_changed_cb(keynode_t *key, void *data) { - if (true == g_config_info->auto_lang) { + pthread_mutex_lock(&vc_config_mgr_mutex); + if (g_config_info && true == g_config_info->auto_lang) { /* Get voice input vconf key */ __vc_config_set_auto_language(); } + pthread_mutex_unlock(&vc_config_mgr_mutex); return; } @@ -816,11 +824,8 @@ int vc_config_mgr_initialize(int uid) int* get_uid; vc_config_client_s* temp_client = NULL; - if (0 != pthread_mutex_init(&vc_config_mgr_mutex, NULL)) { - SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to initialize vc_config_mgr_mutex."); - } - SLOG(LOG_INFO, vc_config_tag(), "[WARNING] Enter critical section"); + ecore_thread_main_loop_begin(); pthread_mutex_lock(&vc_config_mgr_mutex); if (0 < g_slist_length(g_config_client_list)) { @@ -833,6 +838,7 @@ int vc_config_mgr_initialize(int uid) if (uid == *get_uid) { SLOG(LOG_WARN, vc_config_tag(), "[CONFIG] uid(%d) has already registered", uid); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); SLOG(LOG_DEBUG, vc_config_tag(), "[WARNING] Leave critical section"); return 0; } @@ -844,6 +850,7 @@ int vc_config_mgr_initialize(int uid) if (NULL == temp_client) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to allocate memory"); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return VC_ERROR_OUT_OF_MEMORY; } @@ -859,6 +866,7 @@ int vc_config_mgr_initialize(int uid) __vc_config_mgr_print_client_info(); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); SLOG(LOG_DEBUG, vc_config_tag(), "[WARNING] Leave critical section"); return 0; } @@ -871,6 +879,7 @@ int vc_config_mgr_initialize(int uid) SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to make directory : %s", VC_CONFIG_BASE); __vc_config_release_client(uid); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return -1; } else { SLOG(LOG_DEBUG, vc_config_tag(), "Success to make directory : %s", VC_CONFIG_BASE); @@ -881,6 +890,7 @@ int vc_config_mgr_initialize(int uid) SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to make directory : %s", VC_RUNTIME_INFO_ROOT); __vc_config_release_client(uid); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return -1; } else { SLOG(LOG_DEBUG, vc_config_tag(), "Success to make directory : %s", VC_RUNTIME_INFO_ROOT); @@ -892,6 +902,7 @@ int vc_config_mgr_initialize(int uid) SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to make directory : %s", VC_DOWNLOAD_BASE); __vc_config_release_client(uid); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return -1; } else { SLOG(LOG_DEBUG, vc_config_tag(), "Success to make directory : %s", VC_DOWNLOAD_BASE); @@ -902,6 +913,7 @@ int vc_config_mgr_initialize(int uid) SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to make directory : %s", VC_DOWNLOAD_ENGINE_INFO); __vc_config_release_client(uid); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return -1; } else { SLOG(LOG_DEBUG, vc_config_tag(), "Success to make directory : %s", VC_DOWNLOAD_ENGINE_INFO); @@ -913,6 +925,7 @@ int vc_config_mgr_initialize(int uid) __vc_config_release_client(uid); __vc_config_release_engine(); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return VC_CONFIG_ERROR_ENGINE_NOT_FOUND; } @@ -923,6 +936,7 @@ int vc_config_mgr_initialize(int uid) __vc_config_release_client(uid); __vc_config_release_engine(); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return -1; } @@ -931,7 +945,9 @@ int vc_config_mgr_initialize(int uid) __vc_config_release_client(uid); __vc_config_release_engine(); vc_parser_unload_config(g_config_info); + g_config_info = NULL; pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return VC_CONFIG_ERROR_ENGINE_NOT_FOUND; } @@ -947,7 +963,9 @@ int vc_config_mgr_initialize(int uid) __vc_config_release_client(uid); __vc_config_release_engine(); vc_parser_unload_config(g_config_info); + g_config_info = NULL; pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return -1; } @@ -963,7 +981,9 @@ int vc_config_mgr_initialize(int uid) __vc_config_release_client(uid); __vc_config_release_engine(); vc_parser_unload_config(g_config_info); + g_config_info = NULL; pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return -1; } @@ -990,7 +1010,9 @@ int vc_config_mgr_initialize(int uid) __vc_config_release_client(uid); __vc_config_release_engine(); vc_parser_unload_config(g_config_info); + g_config_info = NULL; pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return VC_ERROR_OUT_OF_MEMORY; } @@ -1007,6 +1029,7 @@ int vc_config_mgr_initialize(int uid) __vc_config_mgr_print_client_info(); pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); SLOG(LOG_DEBUG, vc_config_tag(), "[WARNING] Leave critical section"); return 0; } @@ -1020,28 +1043,21 @@ int vc_config_mgr_finalize(int uid) if (0 < __vc_config_release_client(uid)) { pthread_mutex_unlock(&vc_config_mgr_mutex); SLOG(LOG_DEBUG, vc_config_tag(), "[WARNING] Leave critical section"); - - if (0 != pthread_mutex_destroy(&vc_config_mgr_mutex)) { - SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to destroy vc_config_mgr_mutex."); - } + return 0; } __vc_config_release_engine(); - + vconf_ignore_key_changed(VCONFKEY_LANGSET, __vc_config_language_changed_cb); vc_parser_unload_config(g_config_info); + g_config_info = NULL; pthread_mutex_unlock(&vc_config_mgr_mutex); SLOG(LOG_DEBUG, vc_config_tag(), "[WARNING] Leave critical section"); - if (0 != pthread_mutex_destroy(&vc_config_mgr_mutex)) { - SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to destroy vc_config_mgr_mutex."); - } - SLOG(LOG_DEBUG, vc_config_tag(), "[Success] Finalize config"); - return 0; } @@ -1108,6 +1124,9 @@ int vc_config_mgr_set_engine_cb(int uid, vc_config_engine_changed_cb engine_cb) GSList *iter = NULL; vc_config_client_s* temp_client = NULL; + ecore_thread_main_loop_begin(); + pthread_mutex_lock(&vc_config_mgr_mutex); + /* Call all callbacks of client*/ iter = g_slist_nth(g_config_client_list, 0); @@ -1119,6 +1138,7 @@ int vc_config_mgr_set_engine_cb(int uid, vc_config_engine_changed_cb engine_cb) temp_client->engine_cb = engine_cb; if (0 != __vc_config_mgr_register_lang_event()) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to register config event"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_OPERATION_FAILED; } } @@ -1126,6 +1146,8 @@ int vc_config_mgr_set_engine_cb(int uid, vc_config_engine_changed_cb engine_cb) iter = g_slist_next(iter); } + pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return 0; } @@ -1134,6 +1156,9 @@ int vc_config_mgr_unset_engine_cb(int uid) GSList *iter = NULL; vc_config_client_s* temp_client = NULL; + ecore_thread_main_loop_begin(); + pthread_mutex_lock(&vc_config_mgr_mutex); + /* Call all callbacks of client*/ iter = g_slist_nth(g_config_client_list, 0); @@ -1149,6 +1174,8 @@ int vc_config_mgr_unset_engine_cb(int uid) iter = g_slist_next(iter); } + pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return 0; } @@ -1158,6 +1185,9 @@ int vc_config_mgr_set_lang_cb(int uid, vc_config_lang_changed_cb lang_cb) GSList *iter = NULL; vc_config_client_s* temp_client = NULL; + ecore_thread_main_loop_begin(); + pthread_mutex_lock(&vc_config_mgr_mutex); + /* Call all callbacks of client*/ iter = g_slist_nth(g_config_client_list, 0); @@ -1169,6 +1199,7 @@ int vc_config_mgr_set_lang_cb(int uid, vc_config_lang_changed_cb lang_cb) temp_client->lang_cb = lang_cb; if (0 != __vc_config_mgr_register_lang_event()) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to register config event"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_OPERATION_FAILED; } } @@ -1176,6 +1207,8 @@ int vc_config_mgr_set_lang_cb(int uid, vc_config_lang_changed_cb lang_cb) iter = g_slist_next(iter); } + pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return 0; } @@ -1184,6 +1217,9 @@ int vc_config_mgr_unset_lang_cb(int uid) GSList *iter = NULL; vc_config_client_s* temp_client = NULL; + ecore_thread_main_loop_begin(); + pthread_mutex_lock(&vc_config_mgr_mutex); + /* Call all callbacks of client*/ iter = g_slist_nth(g_config_client_list, 0); @@ -1199,6 +1235,8 @@ int vc_config_mgr_unset_lang_cb(int uid) iter = g_slist_next(iter); } + pthread_mutex_unlock(&vc_config_mgr_mutex); + ecore_thread_main_loop_end(); return 0; } @@ -1212,6 +1250,8 @@ int vc_config_mgr_set_enabled_cb(int uid, vc_config_enabled_cb enabled_cb) GSList *iter = NULL; vc_config_client_s* temp_client = NULL; + pthread_mutex_lock(&vc_config_mgr_mutex); + /* Call all callbacks of client*/ iter = g_slist_nth(g_config_client_list, 0); @@ -1221,12 +1261,14 @@ int vc_config_mgr_set_enabled_cb(int uid, vc_config_enabled_cb enabled_cb) if (NULL != temp_client) { if (uid == temp_client->uid) { temp_client->enabled_cb = enabled_cb; + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_NONE; } } iter = g_slist_next(iter); } + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_PARAMETER; } @@ -1235,6 +1277,8 @@ int vc_config_mgr_unset_enabled_cb(int uid) GSList *iter = NULL; vc_config_client_s* temp_client = NULL; + pthread_mutex_lock(&vc_config_mgr_mutex); + /* Call all callbacks of client*/ iter = g_slist_nth(g_config_client_list, 0); @@ -1244,35 +1288,45 @@ int vc_config_mgr_unset_enabled_cb(int uid) if (NULL != temp_client) { if (uid == temp_client->uid) { temp_client->enabled_cb = NULL; + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } } iter = g_slist_next(iter); } + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_PARAMETER; } int vc_config_mgr_get_auto_language(bool* value) { + pthread_mutex_lock(&vc_config_mgr_mutex); + if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (NULL == value) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } *value = g_config_info->auto_lang; + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } int vc_config_mgr_set_auto_language(bool value) { + pthread_mutex_lock(&vc_config_mgr_mutex); + if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } @@ -1280,8 +1334,10 @@ int vc_config_mgr_set_auto_language(bool value) /* Check language is valid */ if (0 != vc_parser_set_auto_lang(value)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to save engine id"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } + g_config_info->auto_lang = value; if (true == g_config_info->auto_lang) { @@ -1289,17 +1345,23 @@ int vc_config_mgr_set_auto_language(bool value) } } + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } int vc_config_mgr_get_engine_list(vc_config_supported_engine_cb callback, void* user_data) { + pthread_mutex_lock(&vc_config_mgr_mutex); + if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_STATE; } if (NULL == callback) { + SLOG(LOG_ERROR, vc_config_tag(), " callback is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_PARAMETER; } @@ -1308,6 +1370,7 @@ int vc_config_mgr_get_engine_list(vc_config_supported_engine_cb callback, void* if (0 >= g_slist_length(g_engine_list)) { SLOG(LOG_WARN, vc_config_tag(), "[ERROR] Engine list is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_ENGINE_NOT_FOUND; } @@ -1319,6 +1382,7 @@ int vc_config_mgr_get_engine_list(vc_config_supported_engine_cb callback, void* if (NULL == engine_info) { SLOG(LOG_ERROR, vc_config_tag(), " Engine info is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_OPERATION_FAILED; } @@ -1328,18 +1392,23 @@ int vc_config_mgr_get_engine_list(vc_config_supported_engine_cb callback, void* iter = g_slist_next(iter); } + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_NONE; } int vc_config_mgr_get_engine(char** engine) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "Not initialized"); //LCOV_EXCL_LINE + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_STATE; } if (NULL == engine) { + SLOG(LOG_ERROR, vc_config_tag(), "Parameter is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_PARAMETER; } @@ -1347,9 +1416,11 @@ int vc_config_mgr_get_engine(char** engine) *engine = strdup(g_config_info->engine_id); } else { SLOG(LOG_ERROR, vc_config_tag(), " Engine id is NULL"); //LCOV_EXCL_LINE + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_ENGINE_NOT_FOUND; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_NONE; } @@ -1411,21 +1482,26 @@ int __vc_config_set_buxtonkey(const char* engine) int vc_config_mgr_set_engine(const char* engine) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_STATE; } if (NULL == g_config_info) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_OPERATION_FAILED; } if (NULL == engine || NULL == g_config_info->engine_id) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_PARAMETER; } /* Check current engine id with new engine id */ if (0 == strncmp(g_config_info->engine_id, engine, strlen(g_config_info->engine_id))) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } @@ -1434,6 +1510,7 @@ int vc_config_mgr_set_engine(const char* engine) int ret = __vc_config_set_buxtonkey(engine); if (0 != ret) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] set buxtonkey Failed!!!"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return ret; } @@ -1521,25 +1598,31 @@ int vc_config_mgr_set_engine(const char* engine) if (0 != vc_parser_set_engine(g_config_info->engine_id)) { SLOG(LOG_ERROR, vc_config_tag(), " Fail to save config"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_OPERATION_FAILED; } } else { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Engine id is not valid"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_INVALID_PARAMETER; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return VC_CONFIG_ERROR_NONE; } int vc_config_mgr_get_language_list(vc_supported_language_cb callback, void* user_data) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (0 >= g_slist_length(g_engine_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] There is no engine"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } @@ -1554,6 +1637,7 @@ int vc_config_mgr_get_language_list(vc_supported_language_cb callback, void* use if (NULL == engine_info) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] engine info is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } @@ -1584,17 +1668,21 @@ int vc_config_mgr_get_language_list(vc_supported_language_cb callback, void* use break; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } int vc_config_mgr_get_default_language(char** language) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (NULL == language) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } @@ -1602,20 +1690,25 @@ int vc_config_mgr_get_default_language(char** language) *language = strdup(g_config_info->language); } else { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] language is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } int vc_config_mgr_set_default_language(const char* language) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (NULL == language) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } @@ -1623,65 +1716,80 @@ int vc_config_mgr_set_default_language(const char* language) if (NULL != g_config_info->language) { if (0 != vc_parser_set_language(language)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to save engine id"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } free(g_config_info->language); g_config_info->language = strdup(language); } else { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] language is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } int vc_config_mgr_get_enabled(bool* value) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (NULL == value) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } *value = g_config_info->enabled; + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } int vc_config_mgr_set_enabled(bool value) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (0 != vc_parser_set_enabled(value)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to set enabled"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } g_config_info->enabled = value; + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } int vc_config_mgr_get_nonfixed_support(bool* value) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (NULL == value) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Input parameter is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (0 >= g_slist_length(g_engine_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] There is no engine"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } @@ -1696,6 +1804,7 @@ int vc_config_mgr_get_nonfixed_support(bool* value) if (NULL == engine_info) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] engine info is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } @@ -1709,22 +1818,28 @@ int vc_config_mgr_get_nonfixed_support(bool* value) break; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return 0; } bool vc_config_check_default_engine_is_valid(const char* engine) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (NULL == engine) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return false; } - if (0 >= g_slist_length(g_engine_list)) + if (0 >= g_slist_length(g_engine_list)) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return false; + } GSList *iter = NULL; vc_engine_info_s *engine_info = NULL; @@ -1737,33 +1852,41 @@ bool vc_config_check_default_engine_is_valid(const char* engine) if (NULL != engine_info) { if (0 == strcmp(engine, engine_info->uuid)) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return true; } } iter = g_slist_next(iter); } + pthread_mutex_unlock(&vc_config_mgr_mutex); return false; } bool vc_config_check_default_language_is_valid(const char* language) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } if (NULL == language) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return false; } if (NULL == g_config_info->engine_id) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Default engine id is NULL"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return false; } - if (0 >= g_slist_length(g_engine_list)) + if (0 >= g_slist_length(g_engine_list)) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return false; + } GSList *iter = NULL; vc_engine_info_s *engine_info = NULL; @@ -1794,8 +1917,10 @@ bool vc_config_check_default_language_is_valid(const char* language) while (NULL != iter_lang) { lang = iter_lang->data; - if (0 == strcmp(language, lang)) + if (0 == strcmp(language, lang)) { + pthread_mutex_unlock(&vc_config_mgr_mutex); return true; + } /*Get next item*/ iter_lang = g_slist_next(iter_lang); @@ -1803,26 +1928,33 @@ bool vc_config_check_default_language_is_valid(const char* language) break; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return false; } int vc_config_mgr_set_foreground(int pid, bool value) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return vc_parser_set_foreground(pid, value); } int vc_config_mgr_get_foreground(int* pid) { + pthread_mutex_lock(&vc_config_mgr_mutex); if (0 >= g_slist_length(g_config_client_list)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Not initialized"); + pthread_mutex_unlock(&vc_config_mgr_mutex); return -1; } + pthread_mutex_unlock(&vc_config_mgr_mutex); return vc_parser_get_foreground(pid); } diff --git a/common/vc_config_parser.c b/common/vc_config_parser.c index c2149a5..e2be6d8 100644 --- a/common/vc_config_parser.c +++ b/common/vc_config_parser.c @@ -474,11 +474,20 @@ int vc_parser_load_config(vc_config_s** config_info) int vc_parser_unload_config(vc_config_s* config_info) { - if (NULL != g_config_doc) xmlFreeDoc(g_config_doc); + if (NULL != g_config_doc) { + xmlFreeDoc(g_config_doc); + g_config_doc = NULL; + } if (NULL != config_info) { - if (NULL != config_info->engine_id) free(config_info->engine_id); - if (NULL != config_info->language) free(config_info->language); + if (NULL != config_info->engine_id) { + free(config_info->engine_id); + config_info->engine_id = NULL; + } + if (NULL != config_info->language) { + free(config_info->language); + config_info->language = NULL; + } free(config_info); } -- 2.7.4 From bcd77dc707d084430b34d4b043d6b8b7fe13346f Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Thu, 26 Dec 2019 16:35:59 +0900 Subject: [PATCH 15/16] Add get_volume_decibel in vc_mgr_send_audio_streaming Change-Id: I733e21ae281f230ab790bfe227a29cb3c7f07906 Signed-off-by: sooyeon.kim (cherry picked from commit c88dd1938805c7bedb3c97d56ad48fac628cac7b) --- client/vc_mgr.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 9f397e7..5112750 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "vc_cmd_db.h" #include "vc_config_mgr.h" @@ -2326,7 +2327,7 @@ int vc_mgr_cancel(void) } static int g_cnt = 0; -static Eina_Bool __vc_mgr_set_volume(void* data) +static Eina_Bool __vc_mgr_set_volume_timer_cb(void* data) { g_cnt++; g_volume_db = g_prev_volume_db + (g_cur_volume_db - g_prev_volume_db) / 5 * g_cnt; @@ -2341,6 +2342,7 @@ static Eina_Bool __vc_mgr_set_volume(void* data) int __vc_mgr_cb_set_volume(float volume) { + // called in vc_mgr_dbus g_prev_volume_db = g_volume_db; g_cur_volume_db = volume; @@ -2351,7 +2353,15 @@ int __vc_mgr_cb_set_volume(float volume) } g_cnt = 1; - g_m_set_volume_timer = ecore_timer_add(0.05, __vc_mgr_set_volume, NULL); + g_m_set_volume_timer = ecore_timer_add(0.05, __vc_mgr_set_volume_timer_cb, NULL); + + return 0; +} + +int __vc_mgr_set_volume(float volume) +{ + // called by app directly + g_volume_db = volume; return 0; } @@ -4367,6 +4377,38 @@ int vc_mgr_send_utterance_status(int pid, int utt_id, int utt_status) return 0; } +static float __get_volume_decibel(char* data, int size) +{ +#define MAX_AMPLITUDE_MEAN_16 32768 + + int i, depthByte; + int count = 0; + + float db = 0.0; + float rms = 0.0; + unsigned long long square_sum = 0; + short pcm16 = 0; + + depthByte = 2; + + for (i = 0; i < size; i += (depthByte<<1)) { + pcm16 = 0; + memcpy(&pcm16, data + i, sizeof(short)); + square_sum += pcm16 * pcm16; + count++; + } + + if (0 == count || 0 == square_sum) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] No data"); + rms = 1.0; + } else { + rms = sqrt((float)square_sum/count); + } + + db = 20 * log10(rms/MAX_AMPLITUDE_MEAN_16); + return db; +} + int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* buffer, unsigned int len) { SLOG(LOG_INFO, TAG_VCM, "[Manager] Send audio streaming to the engine service"); @@ -4410,6 +4452,10 @@ int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* return VC_ERROR_INVALID_STATE; } + /* set volume */ + float volume = __get_volume_decibel((char*)buffer, len); + __vc_mgr_set_volume(volume); + /* send audio streaming */ int ret = vc_mgr_dbus_send_audio_streaming(g_vc_m->handle, event, buffer, len); if (0 != ret) { -- 2.7.4 From 9524bb2370870b7c44933a78ddcbb004b27dbc41 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Mon, 11 Feb 2019 10:00:17 +0900 Subject: [PATCH 16/16] Add service state changing in vcd_send_result Change-Id: I727f963f043bc4f518bad07bc1d0b7f0f6e03ec6 Signed-off-by: sooyeon.kim --- server/vcd_server.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/vcd_server.c b/server/vcd_server.c index 7385ffb..b1d5717 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -762,6 +762,10 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c } } + /* set service state ready */ + vcd_config_set_service_state(VCD_STATE_READY); + vcdc_send_service_state(VCD_STATE_READY); + vcd_client_manager_set_exclusive(false); vc_cmd_list_destroy(vc_cmd_list, true); vc_cmd_list = NULL; -- 2.7.4