From: Wonnam Jang Date: Tue, 16 Jan 2018 05:50:41 +0000 (+0900) Subject: Add log for debugging X-Git-Tag: accepted/tizen/unified/20180228.071746~8^2~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b68b96409cbe2e0929f693b555079a40c694573;p=platform%2Fcore%2Fuifw%2Fvoice-control.git Add log for debugging Change-Id: I80ffb9f2238c273119373f39b0b054f8c3ce253d Signed-off-by: Wonnam Jang --- diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 5e33f6a..2ed9ab5 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -123,7 +123,7 @@ static int __vc_mgr_get_feature_enabled() int vc_mgr_initialize() { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Initialize"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Initialize"); if (0 != __vc_mgr_get_feature_enabled()) { @@ -170,7 +170,7 @@ int vc_mgr_initialize() return ret; } - SLOG(LOG_DEBUG, TAG_VCM, "[Success] pid(%d)", g_vc_m->handle); + SLOG(LOG_ERROR, TAG_VCM, "[Success] pid(%d)", g_vc_m->handle); SLOG(LOG_DEBUG, TAG_VCM, "@@@"); @@ -190,7 +190,7 @@ static void __vc_mgr_internal_unprepare() int vc_mgr_deinitialize() { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Deinitialize"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Deinitialize"); if (false == vc_mgr_client_is_valid(g_vc_m)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] NOT initialized"); @@ -242,7 +242,7 @@ int vc_mgr_deinitialize() SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to close connection"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@"); return VC_ERROR_NONE; } @@ -280,7 +280,7 @@ static Eina_Bool __vc_mgr_connect_daemon(void *data) /* Set foreground */ vc_mgr_client_set_foreground(g_vc_m, foreground, true); - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Connected daemon"); + SLOG(LOG_ERROR, TAG_VCM, "[SUCCESS] Connected daemon"); vc_mgr_client_set_client_state(g_vc_m, VC_STATE_READY); @@ -354,7 +354,7 @@ static void __end_prepare_thread(void *data, Ecore_Thread *thread) int vc_mgr_prepare() { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Prepare"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Prepare"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -379,7 +379,7 @@ int vc_mgr_prepare() int vc_mgr_unprepare() { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Unprepare"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Unprepare"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -453,7 +453,7 @@ int vc_mgr_get_current_language(char** language) ret = vc_config_convert_error_code((vc_config_error_e)ret); SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to get current languages : %s", __vc_mgr_get_error_code(ret)); } else { - SLOG(LOG_DEBUG, TAG_VCM, "[Get current language] language : %s", *language); + SLOG(LOG_ERROR, TAG_VCM, "[Get current language] language : %s", *language); } return ret; @@ -597,7 +597,7 @@ int vc_mgr_unset_demandable_client_rule() int vc_mgr_is_command_format_supported(vc_cmd_format_e format, bool* support) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Is command type supported"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Is command type supported"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -630,7 +630,7 @@ int vc_mgr_is_command_format_supported(vc_cmd_format_e format, bool* support) int vc_mgr_enable_command_type(int cmd_type) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Enable Command Type"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Enable Command Type, cmd_type(%d)", cmd_type); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -675,14 +675,14 @@ int vc_mgr_enable_command_type(int cmd_type) } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); return ret; } int vc_mgr_disable_command_type(int cmd_type) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Disable Command Type"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Disable Command Type, cmd_type(%d)", cmd_type); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -727,14 +727,14 @@ int vc_mgr_disable_command_type(int cmd_type) } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); return ret; } int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set Command list"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Set Command list"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -814,14 +814,14 @@ int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list) } while (0 != ret); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); return ret; } int vc_mgr_unset_command_list() { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Unset Command list"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Unset Command list"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -862,14 +862,14 @@ int vc_mgr_unset_command_list() SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to delete file, type(%d), ret(%d)", i, ret); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@"); return 0; } int vc_mgr_set_command_list_from_file(const char* file_path, int type) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set Command list from file"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Set Command list from file, type(%d)", type); if (NULL == file_path) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter!!"); @@ -933,14 +933,14 @@ int vc_mgr_set_command_list_from_file(const char* file_path, int type) } while (0 != ret); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); return ret; } int vc_mgr_set_preloaded_commands_from_file(const char* file_path) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set preloaded command list"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Set preloaded command list"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -967,13 +967,13 @@ int vc_mgr_set_preloaded_commands_from_file(const char* file_path) if (0 != ret) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to insert preloaded commands into db"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); return ret; } int vc_mgr_set_audio_type(const char* audio_id) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set audio type"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Set audio type, audio_id(%s)", audio_id); if (NULL == audio_id) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); @@ -1029,14 +1029,14 @@ int vc_mgr_set_audio_type(const char* audio_id) } } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); return ret; } int vc_mgr_get_audio_type(char** audio_id) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get audio type"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Get audio type"); if (NULL == audio_id) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); @@ -1090,7 +1090,7 @@ int vc_mgr_get_audio_type(char** audio_id) } } } else { - SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Get audio type : %s", temp); + SLOG(LOG_ERROR, TAG_VCM, "[SUCCESS] Get audio type : %s", temp); /* Save */ vc_mgr_client_set_audio_type(g_vc_m, temp); } @@ -1108,7 +1108,7 @@ int vc_mgr_get_audio_type(char** audio_id) int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Foreach current commands"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Foreach current commands"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1294,7 +1294,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) SLOG(LOG_DEBUG, TAG_VCM, "[Manager] No background commands"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@"); return 0; } @@ -1587,7 +1587,7 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) int vc_mgr_start(bool exclusive_command_option) { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request start"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Request start"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1665,14 +1665,14 @@ int vc_mgr_start(bool exclusive_command_option) g_prev_volume_db = 0; g_cur_volume_db = 0; - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); return ret; } int vc_mgr_stop() { - SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request stop"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Request stop"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { diff --git a/server/vcd_server.c b/server/vcd_server.c index 6cbc2b9..6b13ed0 100755 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -400,7 +400,7 @@ static Eina_Bool __vcd_send_selected_result(void *data) SLOG(LOG_WARN, TAG_VCD, "[Server WARNING] Fail to send result, ret(%d)", ret); break; } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Send result : pid(%d) type(%d)", temp_cmd->pid, temp_cmd->type); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Send result : pid(%d) type(%d)", temp_cmd->pid, temp_cmd->type); pre_pid = temp_cmd->pid; pre_type = temp_cmd->type; } @@ -440,6 +440,7 @@ int vcd_send_nlg_result(const char* nlg_result, void *user_data) return ret; } + SLOG(LOG_ERROR, TAG_VCD, "[Server] send dialog : mgr_pid(%d), nlg_result(%s)", vcd_client_manager_get_pid(), nlg_result); ret = vcdc_send_dialog(vcd_client_manager_get_pid(), -1, nlg_result, NULL, 0); //0: VC_DIALOG_END if (0 != ret) SECURE_SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send dialog : mgr_pid(%d), nlg_result(%s)", vcd_client_manager_get_pid(), nlg_result); @@ -469,6 +470,8 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c SECURE_SLOG(LOG_INFO, TAG_VCD, "[Server] Event(%d), Text(%s) Nonfixed(%s) Msg(%s) Result count(%d)", event, all_result, non_fixed_result, msg, count); + SLOG(LOG_ERROR, TAG_VCD, "[Server] NLU result(%s)", nlu_result); + if (VCD_RECOGNITION_MODE_RESTART_AFTER_REJECT == vcd_client_get_recognition_mode()) { if (VCE_RESULT_EVENT_REJECTED == event) { SLOG(LOG_DEBUG, TAG_VCD, "[Server] Restart by no or rejected result"); @@ -572,7 +575,7 @@ int vcd_send_result(vce_result_event_e event, int* result_id, int count, const c if (true == is_consumed) { if (NULL != user_info) { *user_info = 0x01; - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Send whether ASR result is consumed or not (%d)", *user_info); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Send whether ASR result is consumed or not (%d)", *user_info); } vcdc_send_show_tooltip(pid, false); if (-1 != vcd_client_manager_get_pid()) { @@ -1024,7 +1027,7 @@ int vcd_initialize(vce_request_callback_s *callback) vcd_config_set_service_state(VCD_STATE_READY); vcdc_send_service_state(VCD_STATE_READY); - SLOG(LOG_DEBUG, TAG_VCD, "[Server SUCCESS] initialize"); + SLOG(LOG_ERROR, TAG_VCD, "[Server SUCCESS] initialize"); return 0; } @@ -1069,7 +1072,7 @@ void vcd_finalize() vcd_config_set_service_state(VCD_STATE_NONE); vcdc_send_service_state(VCD_STATE_NONE); - SLOG(LOG_DEBUG, TAG_VCD, "[Server] mode finalize"); + SLOG(LOG_ERROR, TAG_VCD, "[Server] mode finalize"); return; } @@ -1325,7 +1328,7 @@ int vcd_server_mgr_initialize(int pid) if (0 != vcdc_send_manager_pid(pid)) SLOG(LOG_WARN, TAG_VCD, "[Server WARNING] Fail to send manager pid"); - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Manager initialize : pid(%d)", pid); + SLOG(LOG_ERROR, TAG_VCD, "[Server Success] Manager initialize : pid(%d)", pid); return VCD_ERROR_NONE; } @@ -1354,7 +1357,7 @@ int vcd_server_mgr_finalize(int pid) ecore_timer_add(0, __finalize_quit_ecore_loop, NULL); } - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Manager Finalize : pid(%d)", pid); + SLOG(LOG_ERROR, TAG_VCD, "[Server Success] Manager Finalize : pid(%d)", pid); return VCD_ERROR_NONE; } @@ -1486,7 +1489,7 @@ static int __start_internal_recognition() return VCD_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Set command"); + SLOG(LOG_ERROR, TAG_VCD, "[Server Success] Set command"); bool stop_by_silence = true; if (VCD_RECOGNITION_MODE_MANUAL == vcd_client_get_recognition_mode()) { @@ -1506,7 +1509,7 @@ static int __start_internal_recognition() return VCD_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Start engine"); + SLOG(LOG_ERROR, TAG_VCD, "[Server Success] Start engine"); #if 1 /* 5. recorder start */ @@ -1525,7 +1528,7 @@ static int __start_internal_recognition() vcd_config_set_service_state(VCD_STATE_RECORDING); vcdc_send_service_state(VCD_STATE_RECORDING); - SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Start recognition(%d)", stop_by_silence); + SLOG(LOG_ERROR, TAG_VCD, "[Server Success] Start recognition(%d)", stop_by_silence); return 0; } @@ -1534,7 +1537,7 @@ static Eina_Bool __vcd_request_show_tooltip(void *data) { int pid = vcd_client_widget_get_foreground_pid(); if (-1 != pid) { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Request tooltip show and widget command"); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Request tooltip show and widget command, show(%d)", (bool)data); vcdc_send_show_tooltip(pid, (bool)data); } @@ -1556,7 +1559,7 @@ int vcd_server_mgr_start(vcd_recognition_mode_e recognition_mode, bool exclusive } vcd_client_widget_set_waiting_for_recording(-1, false); - SLOG(LOG_DEBUG, TAG_VCD, "[Server] set recognition mode = %d", recognition_mode); + SLOG(LOG_ERROR, TAG_VCD, "[Server] set recognition mode = %d", recognition_mode); vcd_client_set_recognition_mode(recognition_mode); if (false == exclusive_cmd) { @@ -1565,7 +1568,7 @@ int vcd_server_mgr_start(vcd_recognition_mode_e recognition_mode, bool 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_INFO, TAG_VCD, "[Server] Request tooltip show and widget command"); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Request tooltip show and widget command"); ecore_timer_add(0, __vcd_request_show_tooltip, (void*)true); vcd_client_widget_set_waiting_for_recording(pid, true); return 0; @@ -1588,6 +1591,8 @@ int vcd_server_mgr_start(vcd_recognition_mode_e recognition_mode, bool exclusive } } + SLOG(LOG_ERROR, TAG_VCD, "[Server] start internal recognition"); + int ret = __start_internal_recognition(); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to start recongition : %d", ret); @@ -1598,6 +1603,7 @@ int vcd_server_mgr_start(vcd_recognition_mode_e recognition_mode, bool exclusive vcd_client_unset_exclusive_command(fg_pid); } + SLOG(LOG_ERROR, TAG_VCD, "[Server Success] start internal recognition"); return VCD_ERROR_NONE; } @@ -1612,6 +1618,7 @@ int vcd_server_mgr_stop() SLOG(LOG_DEBUG, TAG_VCD, "[Server] Manager is NOT available."); return VCD_ERROR_OPERATION_FAILED; } + SLOG(LOG_ERROR, TAG_VCD, "[Server] stop internal recognition"); #if 1 /* 2. Stop recorder */ @@ -1628,6 +1635,7 @@ int vcd_server_mgr_stop() vcd_config_set_service_state(VCD_STATE_PROCESSING); vcdc_send_service_state(VCD_STATE_PROCESSING); + SLOG(LOG_ERROR, TAG_VCD, "[Server Success] stop internal recognition"); return VCD_ERROR_NONE; } @@ -1663,6 +1671,7 @@ int vcd_server_mgr_cancel() vcdc_send_service_state(VCD_STATE_READY); return VCD_ERROR_NONE; } + SLOG(LOG_ERROR, TAG_VCD, "[Server] cancel internal recognition"); #if 1 /* 2. Stop recorder */ @@ -1691,6 +1700,7 @@ int vcd_server_mgr_cancel() vcd_config_set_service_state(VCD_STATE_READY); vcdc_send_service_state(VCD_STATE_READY); + SLOG(LOG_ERROR, TAG_VCD, "[Server Success] cancel internal recognition"); return VCD_ERROR_NONE; } @@ -1831,7 +1841,7 @@ int vcd_server_mgr_enable_command_type(int pid, int cmd_type) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to enable command type"); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Enable command type(%d)", cmd_type); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Enable command type(%d)", cmd_type); } return ret; @@ -1857,7 +1867,7 @@ int vcd_server_mgr_disable_command_type(int pid, int cmd_type) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to disable command type"); } else { - SLOG(LOG_DEBUG, TAG_VCD, "[Server] Disable command type(%d)", cmd_type); + SLOG(LOG_ERROR, TAG_VCD, "[Server] Disable command type(%d)", cmd_type); } return ret; @@ -2250,6 +2260,7 @@ int vcd_server_widget_start_recording(int pid, bool widget_command) SLOG(LOG_WARN, TAG_VCD, "[Server] widget command is NOT available"); } + SLOG(LOG_ERROR, TAG_VCD, "[Server] start internal recongition : %d", widget_command); int ret = __start_internal_recognition(); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to start recongition : %d", ret);