From: sooyeon Date: Wed, 6 Jul 2022 06:10:13 +0000 (+0900) Subject: Remove unnecessary logs X-Git-Tag: submit/tizen/20220801.042437~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F76%2F278976%2F1;p=platform%2Fcore%2Fuifw%2Fvoice-control.git Remove unnecessary logs Change-Id: I7f4316fba8a62061cbe819465f2520e10e187fcb Signed-off-by: sooyeon --- diff --git a/client/vc.c b/client/vc.c index 1b6d87a..07234ba 100644 --- a/client/vc.c +++ b/client/vc.c @@ -341,7 +341,7 @@ static Eina_Bool __focus_changed_cb(void *data, int type, void *event) SLOG(LOG_DEBUG, TAG_VCC, "@@@ type(%d) is NOT valid", type); } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Focus changed DONE"); return ECORE_CALLBACK_RENEW; } @@ -451,7 +451,6 @@ int vc_deinitialize(void) if (false == vc_client_is_valid(g_vc)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NOT initialized"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -499,7 +498,7 @@ int vc_deinitialize(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to close connection"); //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Deinitialize DONE"); return VC_ERROR_NONE; } @@ -621,7 +620,7 @@ static Eina_Bool __vc_connect_daemon(void *data) return EINA_FALSE; } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Connect daemon DONE"); return EINA_FALSE; } @@ -684,7 +683,6 @@ int vc_prepare(void) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -712,7 +710,6 @@ int vc_prepare_sync(void) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -774,7 +771,6 @@ int vc_foreach_supported_languages(vc_supported_language_cb callback, void* user vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -808,7 +804,6 @@ int vc_get_current_language(char** language) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -841,7 +836,6 @@ int vc_get_state(vc_state_e* state) vc_state_e temp; if (0 != vc_client_get_client_state(g_vc, &temp)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1039,7 +1033,6 @@ int vc_is_command_format_supported(vc_cmd_format_e format, bool* support) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1173,7 +1166,6 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1298,7 +1290,6 @@ int vc_set_command_list_from_file(const char* file_path, int type) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1308,7 +1299,6 @@ int vc_set_command_list_from_file(const char* file_path, int type) /* check type */ if ((VC_COMMAND_TYPE_FOREGROUND != type) && (VC_COMMAND_TYPE_BACKGROUND != type)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid command type: input type is %d", type); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -1760,7 +1750,6 @@ int vc_get_result(vc_result_cb callback, void* user_data) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2105,7 +2094,6 @@ int vc_set_invocation_name(const char* name) int ret = vc_client_get_client_state(g_vc, &state); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -2494,7 +2482,6 @@ int vc_auth_start(void) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2551,7 +2538,7 @@ int vc_auth_start(void) } } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request start DONE"); return ret; } @@ -2563,7 +2550,6 @@ int vc_auth_stop(void) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2620,7 +2606,7 @@ int vc_auth_stop(void) } } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request stop DONE"); return ret; } @@ -2632,7 +2618,6 @@ int vc_auth_cancel(void) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2644,7 +2629,6 @@ int vc_auth_cancel(void) vc_client_get_service_state(g_vc, &service_state); if (service_state != VC_SERVICE_STATE_RECORDING && service_state != VC_SERVICE_STATE_PROCESSING) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'RECORDING' or 'PROCESSING'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2692,7 +2676,7 @@ int vc_auth_cancel(void) } } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request cancel DONE"); return ret; } @@ -2822,7 +2806,6 @@ int vc_tts_request(const char* text, const char* language, bool to_vc_manager, i if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2862,7 +2845,7 @@ int vc_tts_request(const char* text, const char* language, bool to_vc_manager, i } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Request tts DONE"); return ret; } @@ -2884,7 +2867,6 @@ int vc_tts_cancel(int utt_id) if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2929,7 +2911,7 @@ int vc_tts_cancel(int utt_id) } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Cancel tts DONE"); return ret; } @@ -2951,7 +2933,6 @@ int vc_tts_get_synthesized_audio_details(int* rate, vc_audio_channel_e* channel, if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2991,7 +2972,7 @@ int vc_tts_get_synthesized_audio_details(int* rate, vc_audio_channel_e* channel, } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Get tts audio format DONE"); return ret; } diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 061f0be..813ee44 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -334,7 +334,7 @@ int vc_mgr_initialize(void) */ SLOG(LOG_ERROR, TAG_VCM, "[Success] pid(%d)", g_vc_m->handle); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Initialize DONE"); return VC_ERROR_NONE; } @@ -365,7 +365,6 @@ int vc_mgr_deinitialize(void) if (false == vc_mgr_client_is_valid(g_vc_m)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] NOT initialized"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -425,7 +424,7 @@ int vc_mgr_deinitialize(void) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to close connection"); } - SLOG(LOG_ERROR, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Deinitialize DONE"); return VC_ERROR_NONE; } @@ -578,7 +577,6 @@ int vc_mgr_prepare(void) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -595,7 +593,7 @@ int vc_mgr_prepare(void) SLOG(LOG_INFO, TAG_VCM, "[INFO] timer handle is already created"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Calling Prepare DONE"); return VC_ERROR_NONE; } @@ -616,7 +614,6 @@ int vc_mgr_unprepare(void) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -628,7 +625,7 @@ int vc_mgr_unprepare(void) vc_mgr_client_set_client_state(g_vc_m, VC_STATE_INITIALIZED); ecore_timer_add(0, __vc_mgr_notify_state_changed, g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Unprepare DONE"); return VC_ERROR_NONE; } @@ -651,7 +648,6 @@ int vc_mgr_foreach_supported_languages(vc_supported_language_cb callback, void* vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -662,7 +658,7 @@ int vc_mgr_foreach_supported_languages(vc_supported_language_cb callback, void* SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to get languages : %s", __vc_mgr_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Foreach Supported Language DONE"); return VC_ERROR_NONE; } @@ -718,7 +714,6 @@ int vc_mgr_get_state(vc_state_e* state) temp = VC_STATE_NONE; } else if (0 != vc_mgr_client_get_client_state(g_vc_m, &temp)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -731,7 +726,7 @@ int vc_mgr_get_state(vc_state_e* state) default: SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid state"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get State DONE"); return VC_ERROR_NONE; } @@ -758,10 +753,7 @@ int vc_mgr_get_service_state(vc_service_state_e* state) } /* check state */ - if (client_state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Current state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(client_state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Current state is not 'READY'"); /* get service state */ vc_service_state_e service_state; @@ -780,7 +772,7 @@ int vc_mgr_get_service_state(vc_service_state_e* state) default: SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid state"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get Service State DONE"); return VC_ERROR_NONE; } @@ -801,7 +793,6 @@ int vc_mgr_set_demandable_client_rule(const char* rule) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -821,7 +812,7 @@ int vc_mgr_set_demandable_client_rule(const char* rule) return VC_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set Demandable client rule(%s) DONE", rule); return VC_ERROR_NONE; } @@ -868,7 +859,6 @@ int vc_mgr_is_command_format_supported(int format, bool* support) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -889,7 +879,7 @@ int vc_mgr_is_command_format_supported(int format, bool* support) SLOG(LOG_ERROR, TAG_VCM, "[DEBUG] Format(%d) support(%s)", format, *support ? "true" : "false"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Is command type supported DONE"); return VC_ERROR_NONE; } @@ -915,7 +905,6 @@ int vc_mgr_enable_command_type(int cmd_type) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -936,7 +925,7 @@ int vc_mgr_enable_command_type(int cmd_type) SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Success to enable the command type(%d)", cmd_type); } - SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Enable Command Type DONE, ret(%d)", ret); return ret; } @@ -962,7 +951,6 @@ int vc_mgr_disable_command_type(int cmd_type) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -983,7 +971,7 @@ int vc_mgr_disable_command_type(int cmd_type) SLOG(LOG_DEBUG, TAG_VCM, "[DEBUG] Success to disable the command type(%d)", cmd_type); } - SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Disable Command Type DONE, ret(%d)", ret); return ret; } @@ -1004,7 +992,6 @@ int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1051,7 +1038,7 @@ int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list) } } - SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Set Command list DONE, ret(%d)", ret); return ret; } @@ -1092,7 +1079,7 @@ int vc_mgr_unset_command_list(void) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to delete file, type(%d), ret(%d)", i, ret); } - SLOG(LOG_ERROR, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Unset Command list DONE"); // TODO: check return value correct or not return VC_ERROR_NONE; @@ -1117,7 +1104,6 @@ int vc_mgr_set_command_list_from_file(const char* file_path, int type) /* check type */ if (VC_COMMAND_TYPE_FOREGROUND > type || VC_COMMAND_TYPE_EXCLUSIVE < type) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid command type: input type is %d", type); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -1149,7 +1135,7 @@ int vc_mgr_set_command_list_from_file(const char* file_path, int type) } } - SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Set Command list from file DONE, ret(%d)", ret); return ret; } @@ -1189,7 +1175,7 @@ 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_ERROR, TAG_VCM, "@@@, ret(%d)", ret); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Set preloaded command list DONE, ret(%d)", ret); return ret; } @@ -1214,7 +1200,6 @@ int vc_mgr_set_audio_type(const char* audio_id) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1237,7 +1222,7 @@ int vc_mgr_set_audio_type(const char* audio_id) vc_mgr_client_set_audio_type(g_vc_m, audio_id); } - SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Set audio type DONE, ret(%d)", ret); return ret; } @@ -1260,7 +1245,6 @@ int vc_mgr_get_audio_type(char** audio_id) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1435,7 +1419,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) iter = g_slist_nth(client_info_list, 0); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Foreach current commands DONE"); return VC_ERROR_NONE; } @@ -1469,7 +1453,7 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) SLOG(LOG_INFO, TAG_VCM, "[Manager] No background commands"); } - SLOG(LOG_ERROR, TAG_VCM, "@@@"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Foreach current commands DONE"); // TODO: check return value correct or not return VC_ERROR_NONE; @@ -1497,7 +1481,6 @@ int vc_mgr_set_recognition_mode(vc_recognition_mode_e mode) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1531,7 +1514,6 @@ int vc_mgr_get_recognition_mode(vc_recognition_mode_e* mode) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1563,7 +1545,6 @@ int vc_mgr_set_private_data(const char* key, const char* data) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1584,7 +1565,7 @@ int vc_mgr_set_private_data(const char* key, const char* data) SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set private data"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set private data DONE"); return VC_ERROR_NONE; } @@ -1610,7 +1591,6 @@ int vc_mgr_get_private_data(const char* key, char** data) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1640,7 +1620,7 @@ int vc_mgr_get_private_data(const char* key, char** data) temp = NULL; } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get private data DONE"); // TODO: check return value correct or not return VC_ERROR_NONE; @@ -1664,7 +1644,6 @@ int vc_mgr_set_domain(const char* domain) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1685,7 +1664,7 @@ int vc_mgr_set_domain(const char* domain) SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Set domain"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set domain DONE"); return VC_ERROR_NONE; } @@ -1713,7 +1692,6 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1733,7 +1711,7 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) } else { SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] do action"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] do action DONE"); return VC_ERROR_NONE; } @@ -1765,7 +1743,6 @@ int vc_mgr_send_specific_engine_request(const char* engine_app_id, const char* e vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1785,7 +1762,7 @@ int vc_mgr_send_specific_engine_request(const char* engine_app_id, const char* e } else { SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] specific engine request"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] send specific engine request DONE"); return VC_ERROR_NONE; } @@ -1806,7 +1783,6 @@ int vc_mgr_start(bool exclusive_command_option) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1859,7 +1835,7 @@ int vc_mgr_start(bool exclusive_command_option) g_prev_volume_db = 0; g_cur_volume_db = 0; - SLOG(LOG_ERROR, TAG_VCM, "@@@, ret(%d)", ret); + SLOG(LOG_ERROR, TAG_VCM, "@@@ [Manager] Request start DONE, ret(%d)", ret); return ret; } @@ -1880,7 +1856,6 @@ int vc_mgr_stop(void) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1917,7 +1892,7 @@ int vc_mgr_stop(void) SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Stop recognition"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request stop DONE"); return ret; } @@ -1938,7 +1913,6 @@ int vc_mgr_cancel(void) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1975,7 +1949,7 @@ int vc_mgr_cancel(void) vc_mgr_client_set_exclusive_command(g_vc_m, false); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request cancel DONE"); return ret; } @@ -2105,7 +2079,6 @@ int vc_mgr_set_selected_results(vc_cmd_list_h vc_cmd_list) if (VC_RECOGNITION_MODE_RESTART_CONTINUOUSLY != recognition_mode) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'PROCESSING' and mode is not 'Restart continuously'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } } @@ -2136,7 +2109,7 @@ int vc_mgr_set_selected_results(vc_cmd_list_h vc_cmd_list) vc_mgr_client_unset_all_result(g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Select result DONE"); return VC_ERROR_NONE; } @@ -2537,7 +2510,7 @@ int vc_mgr_get_error_message(char** err_msg) SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to get error message"); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get error message DONE"); return ret; } @@ -3917,7 +3890,6 @@ int vc_mgr_send_utterance_status(int pid, int utt_id, vc_tts_utterance_status_e vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -3935,7 +3907,7 @@ int vc_mgr_send_utterance_status(int pid, int utt_id, vc_tts_utterance_status_e else SLOG(LOG_INFO, TAG_VCM, "[SUCCESS] Send utterance status"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] send utterance status DONE"); return ret; } @@ -3995,7 +3967,6 @@ int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* int ret = vc_mgr_client_get_client_state(g_vc_m, &state); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -4005,13 +3976,11 @@ int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* ret = vc_mgr_client_get_service_state(g_vc_m, &service_state); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } if (VC_SERVICE_STATE_READY != service_state && VC_SERVICE_STATE_RECORDING != service_state) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY' and 'RECORDING', state(%d)", service_state); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -4048,7 +4017,6 @@ int vc_mgr_set_audio_streaming_mode(vc_audio_streaming_mode_e mode) int ret = vc_mgr_client_get_client_state(g_vc_m, &state); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -4056,7 +4024,6 @@ int vc_mgr_set_audio_streaming_mode(vc_audio_streaming_mode_e mode) ret = vc_mgr_client_get_service_state(g_vc_m, &service_state); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -4087,7 +4054,6 @@ int vc_mgr_set_audio_streaming_mode(vc_audio_streaming_mode_e mode) } else { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'INITIALIZED', state(%d)", state); SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current service state is not 'READY', service_state(%d)", service_state); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -4225,13 +4191,11 @@ int vc_mgr_change_system_volume(vc_system_volume_event_e event) int ret = vc_mgr_client_get_client_state(g_vc_m, &state); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } if (state != VC_STATE_READY && state != VC_STATE_INITIALIZED) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY' and not 'INITIALIZED', state(%d)", state); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -4260,13 +4224,11 @@ int vc_mgr_recover_system_volume(void) int ret = vc_mgr_client_get_client_state(g_vc_m, &state); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } if (state != VC_STATE_READY && state != VC_STATE_INITIALIZED) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY' and not 'INITIALIZED', state(%d)", state); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } diff --git a/client/vc_mgr_tidl.c b/client/vc_mgr_tidl.c index eaa5ddf..18b7ac8 100644 --- a/client/vc_mgr_tidl.c +++ b/client/vc_mgr_tidl.c @@ -132,8 +132,6 @@ static void __notify_cb(void *user_data, bundle *msg) SLOG(LOG_INFO, TAG_VCM, "@@@ Get Speech detected"); __vc_mgr_cb_speech_detected(); - - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_SPEECH_DETECTED */ else if (0 == strncmp(VCD_MANAGER_METHOD_ALL_RESULT, method, strlen(VCD_MANAGER_METHOD_ALL_RESULT))) { @@ -144,8 +142,6 @@ static void __notify_cb(void *user_data, bundle *msg) if (val) { __vc_mgr_cb_all_result((vc_result_type_e)atoi(val)); } - - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_ALL_RESULT */ else if (0 == strncmp(VCD_MANAGER_METHOD_PRE_RESULT, method, strlen(VCD_MANAGER_METHOD_PRE_RESULT))) { @@ -159,8 +155,6 @@ static void __notify_cb(void *user_data, bundle *msg) if (NULL != pre_result) { __vc_mgr_cb_pre_result((vc_pre_result_event_e)atoi(event), pre_result); } - - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_PRE_RESULT */ else if (0 == strncmp(VCD_MANAGER_METHOD_SPECIFIC_ENGINE_RESULT, method, strlen(VCD_MANAGER_METHOD_SPECIFIC_ENGINE_RESULT))) { @@ -189,9 +183,6 @@ static void __notify_cb(void *user_data, bundle *msg) SLOG(LOG_INFO, TAG_VCM, "@@@ Get System Result"); __vc_mgr_cb_system_result(); - - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - } /* VCD_MANAGER_METHOD_RESULT */ else if (0 == strncmp(VCD_MANAGER_METHOD_DIALOG, method, strlen(VCD_MANAGER_METHOD_DIALOG))) { @@ -212,8 +203,6 @@ static void __notify_cb(void *user_data, bundle *msg) utt_text = NULL; __vc_mgr_cb_dialog(atoi(pid), disp_text, utt_text, (bool)atoi(continous)); - - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_DIALOG */ else if (0 == strncmp(VCD_MANAGER_METHOD_ERROR, method, strlen(VCD_MANAGER_METHOD_ERROR))) { @@ -236,8 +225,6 @@ static void __notify_cb(void *user_data, bundle *msg) free(temp_msg); temp_msg = NULL; } - - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_ERROR */ else if (0 == strncmp(VCD_MANAGER_METHOD_SET_PRIVATE_DATA, method, strlen(VCD_MANAGER_METHOD_SET_PRIVATE_DATA))) { @@ -256,8 +243,6 @@ static void __notify_cb(void *user_data, bundle *msg) } else { SLOG(LOG_ERROR, TAG_VCM, "@@ got invalid pid(%d)", atoi(pid)); } - - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_SET_PRIVATE_DATA */ else if (0 == strncmp(VCD_MANAGER_METHOD_FEEDBACK_AUDIO_FORMAT, method, strlen(VCD_MANAGER_METHOD_FEEDBACK_AUDIO_FORMAT))) { @@ -271,8 +256,6 @@ static void __notify_cb(void *user_data, bundle *msg) bundle_get_str(msg, VC_BUNDLE_AUDIO_RATE, &rate); __vc_mgr_cb_feedback_audio_format(atoi(rate), (vc_audio_channel_e)atoi(channel), (vc_audio_type_e)atoi(audio_type)); - - SLOG(LOG_INFO, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_FEEDBACK_AUDIO_FORMAT */ // TODO: uncomment this line after vcc done @@ -292,13 +275,13 @@ static void __notify_cb(void *user_data, bundle *msg) // 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 { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid msg"); } + SLOG(LOG_DEBUG, TAG_VCM, "@@@ __notify_cb DONE"); } static void __send_buffer_cb(void *user_data, rpc_port_proxy_vc_mgr_proxy_array_char_h data_in, bundle *msg) @@ -324,7 +307,7 @@ static void __send_buffer_cb(void *user_data, rpc_port_proxy_vc_mgr_proxy_array_ __vc_mgr_cb_feedback_streaming(atoi(val), atoi(utt_id), atoi(event), buffer, len); free(buffer); - SLOG(LOG_INFO, TAG_VCM, "@@@"); + SLOG(LOG_INFO, TAG_VCM, "@@@ __send_buffer_cb DONE"); } /* VCD_MANAGER_METHOD_FEEDBACK_STREAMING */ else { @@ -423,7 +406,7 @@ static void __vcd_mgr_set_foreground_cb(rpc_port_stub_vc_mgr_stub_vcd_mgr_contex __vc_mgr_cb_set_foreground(pid, (bool)value); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Set foreground DONE"); } static int __vcd_mgr_get_private_data_cb(rpc_port_stub_vc_mgr_stub_vcd_mgr_context_h context, int pid, const char *key, char **data, void *user_data) @@ -444,7 +427,7 @@ static int __vcd_mgr_get_private_data_cb(rpc_port_stub_vc_mgr_stub_vcd_mgr_conte temp_data = strdup("#NULL"); } *data = temp_data; - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request get private data DONE"); return ret; } @@ -461,7 +444,7 @@ static int __vcd_mgr_auth_enable_cb(rpc_port_stub_vc_mgr_stub_vcd_mgr_context_h SLOG(LOG_ERROR, TAG_VCM, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth enable DONE"); return ret; } @@ -478,7 +461,7 @@ static int __vcd_mgr_auth_disable_cb(rpc_port_stub_vc_mgr_stub_vcd_mgr_context_h SLOG(LOG_ERROR, TAG_VCM, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth disable DONE"); return ret; } @@ -495,7 +478,7 @@ static int __vcd_mgr_auth_start_cb(rpc_port_stub_vc_mgr_stub_vcd_mgr_context_h c SLOG(LOG_ERROR, TAG_VCM, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth start DONE"); return ret; } @@ -512,7 +495,7 @@ static int __vcd_mgr_auth_stop_cb(rpc_port_stub_vc_mgr_stub_vcd_mgr_context_h co SLOG(LOG_ERROR, TAG_VCM, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth stop DONE"); return ret; } @@ -529,7 +512,7 @@ static int __vcd_mgr_auth_cancel_cb(rpc_port_stub_vc_mgr_stub_vcd_mgr_context_h SLOG(LOG_ERROR, TAG_VCM, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get request auth cancel DONE"); return ret; } diff --git a/client/vc_setting.c b/client/vc_setting.c index 5f26cbe..aabd0b8 100644 --- a/client/vc_setting.c +++ b/client/vc_setting.c @@ -87,23 +87,17 @@ int vc_setting_initialize(void) { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Initialize VC Setting"); - if (VC_SETTING_STATE_READY == g_state) { - SLOG(LOG_WARN, TAG_VCS, "[WARNING] VC Setting has already been initialized."); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_NONE; - } + RETVM_IF(VC_SETTING_STATE_READY == g_state, VC_ERROR_NONE, TAG_VCS, "[WARNING] VC Setting has already been initialized."); int ret = vc_config_mgr_initialize(getpid() + VC_SETTING_CONFIG_HANDLE); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Fail to initialize config manager"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_OPERATION_FAILED; } ret = vc_config_mgr_set_lang_cb(getpid() + VC_SETTING_CONFIG_HANDLE, __config_lang_changed_cb); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Fail to initialize config manager"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); vc_config_mgr_finalize(getpid() + VC_SETTING_CONFIG_HANDLE); return VC_ERROR_OPERATION_FAILED; } @@ -113,7 +107,7 @@ int vc_setting_initialize(void) g_state = VC_SETTING_STATE_READY; - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Initialize VC Setting DONE"); return VC_ERROR_NONE; } @@ -122,11 +116,7 @@ int vc_setting_deinitialize() { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Deinitialize VC Setting"); - if (VC_SETTING_STATE_READY != g_state) { - SLOG(LOG_WARN, TAG_VCS, "[WARNING] VC Setting is not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_READY != g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[WARNING] VC Setting is not initialized"); vc_config_mgr_unset_lang_cb(getpid() + VC_SETTING_CONFIG_HANDLE); vc_config_mgr_unset_engine_cb(getpid() + VC_SETTING_CONFIG_HANDLE); @@ -134,7 +124,7 @@ int vc_setting_deinitialize() g_state = VC_SETTING_STATE_NONE; - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Deinitialize VC Setting DONE"); return VC_ERROR_NONE; } @@ -148,19 +138,9 @@ int vc_setting_foreach_supported_engines(vc_setting_supported_engine_cb callback { SLOG(LOG_DEBUG, TAG_VCS, "===== Foreach supported engines"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Callback is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); SLOG(LOG_DEBUG, TAG_VCS, "===== Foreach supported engines 11"); g_engine_cb = callback; @@ -173,8 +153,6 @@ int vc_setting_foreach_supported_engines(vc_setting_supported_engine_cb callback SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Foreach supported engines"); } - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); return ret; } @@ -183,19 +161,9 @@ int vc_setting_get_engine(char** engine_id) { SLOG(LOG_DEBUG, TAG_VCS, "===== Get current engine"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == engine_id) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Engine id is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == engine_id, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Engine id is NULL"); int ret = vc_config_mgr_get_engine(engine_id); if (0 != ret) { @@ -204,8 +172,6 @@ int vc_setting_get_engine(char** engine_id) SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get current engine"); } - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); return ret; } @@ -214,19 +180,9 @@ int vc_setting_set_engine(const char* engine_appid) { SLOG(LOG_DEBUG, TAG_VCS, "===== Set current engine"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == engine_appid) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Engine appid is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == engine_appid, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Engine appid is NULL"); SECURE_SLOG(LOG_DEBUG, TAG_VCS, "New engine appid : %s", engine_appid); @@ -237,8 +193,6 @@ int vc_setting_set_engine(const char* engine_appid) SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Set current engine"); } - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); return ret; } @@ -247,17 +201,9 @@ int vc_setting_foreach_supported_languages(vc_setting_supported_language_cb call { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Foreach supported languages"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); int ret = vc_config_mgr_get_language_list((vc_supported_language_cb)callback, user_data); if (0 != ret) { @@ -266,7 +212,7 @@ int vc_setting_foreach_supported_languages(vc_setting_supported_language_cb call SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Foreach supported languages"); } - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Foreach supported languages DONE"); return ret; } @@ -275,17 +221,9 @@ int vc_setting_get_language(char** language) { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get default language"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == language) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == language, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); int ret = vc_config_mgr_get_default_language(language); if (0 != ret) { @@ -294,7 +232,7 @@ int vc_setting_get_language(char** language) SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get default language"); } - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get default language DONE"); return ret; } @@ -303,17 +241,9 @@ int vc_setting_set_language(const char* language) { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set default language"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == language) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == language, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); int ret = vc_config_mgr_set_default_language(language); if (0 != ret) { @@ -338,7 +268,7 @@ int vc_setting_set_language(const char* language) } } - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set default language DONE"); return ret; } @@ -347,15 +277,10 @@ int vc_setting_set_auto_language(bool value) { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set auto voice"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); if (value != true && value != false) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Invalid value"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -366,7 +291,7 @@ int vc_setting_set_auto_language(bool value) SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Set auto language (%s)", value ? "on" : "off"); } - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set auto voice DONE"); return ret; } @@ -375,17 +300,9 @@ int vc_setting_get_auto_language(bool* value) { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get auto language"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == value) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == value, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); int ret = vc_config_mgr_get_auto_language(value); if (0 != ret) { @@ -394,7 +311,7 @@ int vc_setting_get_auto_language(bool* value) SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get auto language (%s)", *value ? "true" : "false"); } - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get auto language DONE"); return VC_ERROR_NONE; } @@ -403,15 +320,10 @@ int vc_setting_set_enabled(bool value) { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set service enabled"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); if (value != true && value != false) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Invalid value"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -422,7 +334,7 @@ int vc_setting_set_enabled(bool value) SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Set service enabled (%s)", value ? "on" : "off"); } - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set service enabled DONE"); return ret; } @@ -431,17 +343,9 @@ int vc_setting_get_enabled(bool* value) { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get service enabled"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == value) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == value, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); int ret = vc_config_mgr_get_enabled(value); if (0 != ret) { @@ -451,7 +355,7 @@ int vc_setting_get_enabled(bool* value) SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Get service enabled (%s)", *value ? "on" : "off"); } - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Get service enabled DONE"); return ret; } @@ -460,22 +364,14 @@ int vc_setting_set_enabled_changed_cb(vc_setting_enabled_changed_cb callback, vo { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set service enabled callback"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); g_enabled_changed_cb = callback; g_enabled_changed_user_data = user_data; - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set service enabled callback DONE"); return VC_ERROR_NONE; } @@ -484,16 +380,12 @@ int vc_setting_unset_enabled_changed_cb() { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset service enabled callback"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); g_enabled_changed_cb = NULL; g_enabled_changed_user_data = NULL; - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset service enabled callback DONE"); return VC_ERROR_NONE; } @@ -502,22 +394,14 @@ int vc_setting_set_current_language_changed_cb(vc_setting_current_language_chang { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set current language changed callback"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); g_current_language_changed_cb = callback; g_current_language_changed_user_data = user_data; - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set current language changed callback DONE"); return VC_ERROR_NONE; } @@ -526,16 +410,12 @@ int vc_setting_unset_current_language_changed_cb() { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset current language changed callback"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); g_current_language_changed_cb = NULL; g_current_language_changed_user_data = NULL; - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset current language changed callback"); return VC_ERROR_NONE; } @@ -544,15 +424,12 @@ int vc_setting_set_engine_changed_cb(vc_setting_engine_changed_cb callback, void { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set engine changed callback"); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Input param is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCS, "[ERROR] Invalid parameter"); g_engine_changed_cb = callback; g_engine_changed_user_data = user_data; - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Set engine changed callback DONE"); return VC_ERROR_NONE; } @@ -560,15 +437,11 @@ int vc_setting_unset_engine_changed_cb() { SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset engine changed callback"); - if (VC_SETTING_STATE_NONE == g_state) { - SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Not initialized"); - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SETTING_STATE_NONE == g_state, VC_ERROR_INVALID_STATE, TAG_VCS, "[ERROR] Not initialized"); g_engine_changed_cb = NULL; g_engine_changed_user_data = NULL; - SLOG(LOG_DEBUG, TAG_VCS, "@@@"); + SLOG(LOG_DEBUG, TAG_VCS, "@@@ Unset engine changed callback DONE"); return VC_ERROR_NONE; } diff --git a/client/vc_widget_tidl.c b/client/vc_widget_tidl.c index 091a57c..dbe49de 100644 --- a/client/vc_widget_tidl.c +++ b/client/vc_widget_tidl.c @@ -71,7 +71,6 @@ static void __notify_cb(void *user_data, bundle *msg) } else { SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget get hello : invalid pid "); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_METHOD_HELLO */ else if (0 == strncmp(VCD_WIDGET_METHOD_SET_SERVICE_STATE, method, strlen(VCD_WIDGET_METHOD_SET_SERVICE_STATE))) { @@ -105,15 +104,12 @@ static void __notify_cb(void *user_data, bundle *msg) } else { SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget show tooltip : invalid pid"); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_WIDGET_METHOD_SHOW_TOOLTIP */ else if (0 == strncmp(VCD_WIDGET_METHOD_RESULT, method, strlen(VCD_WIDGET_METHOD_RESULT))) { SLOG(LOG_DEBUG, TAG_VCW, "@@@ Get widget result"); __vc_widget_cb_result(); - - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_WIDGET_METHOD_RESULT */ else if (0 == strncmp(VCD_WIDGET_METHOD_ERROR, method, strlen(VCD_WIDGET_METHOD_ERROR))) { @@ -137,13 +133,13 @@ static void __notify_cb(void *user_data, bundle *msg) SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget get error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, err_msg); __vc_widget_cb_error(reason, daemon_pid, err_msg); - - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_WIDGET_METHOD_ERROR */ else { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid msg"); } + + SLOG(LOG_DEBUG, TAG_VCW, "@@@ __notify_cb DONE"); } static void __on_connected(rpc_port_proxy_vc_widget_proxy_vc_widget_h h, void *user_data) diff --git a/server/vcd_server.c b/server/vcd_server.c index 3939f9c..8a21bcd 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -74,7 +74,7 @@ static Eina_Bool __stop_by_silence(void *data) vcd_server_mgr_stop(); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Silence Detected DONE"); return EINA_FALSE; } @@ -84,7 +84,7 @@ static Eina_Bool __cancel_by_interrupt(void *data) vcd_server_mgr_cancel(); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Cancel by interrupt DONE"); return EINA_FALSE; } @@ -94,7 +94,7 @@ static void __cancel_by_error(void *data) vcd_server_mgr_cancel(); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Cancel by error DONE"); return; } @@ -121,7 +121,6 @@ static Eina_Bool __restart_engine(void *data) SLOG(LOG_INFO, TAG_VCD, "[Server Success] Restart recognition"); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return EINA_FALSE; } @@ -191,7 +190,7 @@ void __server_recorder_interrupt_callback() ecore_timer_add(0, __cancel_by_interrupt, NULL); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Cancel by sound interrupt DONE"); } static void __config_lang_changed_cb(const char* current_lang, void* user_data) @@ -211,7 +210,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_INFO, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "@@@ Change language DONE"); return; } @@ -231,7 +230,7 @@ static void __config_foreground_changed_cb(int previous, int current, void* user } } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Change foreground DONE"); return; } diff --git a/server/vcd_tidl.c b/server/vcd_tidl.c index ac18b4b..967ad20 100644 --- a/server/vcd_tidl.c +++ b/server/vcd_tidl.c @@ -351,7 +351,7 @@ static void __vc_terminate_cb(rpc_port_stub_vcd_stub_vc_context_h context, void } tidl_info = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VC FINALIZE DONE"); pthread_mutex_unlock(&g_client_tidl_info_mutex); @@ -870,8 +870,6 @@ static void __vc_mgr_terminate_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h co } mgr_tidl_info = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); - pthread_mutex_unlock(&g_mgr_tidl_info_mutex); @@ -942,12 +940,12 @@ static void __vc_mgr_register_cb_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h __request_tidl_connect(VCD_CLIENT_TYPE_MANAGER, pid); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VC MANAGER REGISTER CALLBACK DONE"); } static int __vc_mgr_initialize_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, int audio_streaming_mode, int *service_state, int *foreground, int *daemon_pid, void *user_data) { - SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager Initialize"); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager Initialize : pid(%d) service state(%d) foreground(%d) daemon_pid(%d)", pid, *service_state, *foreground, *daemon_pid); int ret = -1; @@ -962,14 +960,12 @@ static int __vc_mgr_initialize_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h c *daemon_pid = getpid(); 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); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return ret; } static int __vc_mgr_finalize_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager Finalize"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr finalize : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager Finalize : pid(%d)", pid); int ret = -1; @@ -978,15 +974,14 @@ static int __vc_mgr_finalize_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h con SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr finalize : pid(%d)", pid); return ret; } static int __vc_mgr_set_command_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager Set command"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set command : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager Set command : pid(%d)", pid); int ret = -1; @@ -996,15 +991,14 @@ static int __vc_mgr_set_command_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set command : pid(%d)", pid); return ret; } static int __vc_mgr_unset_command_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager unset command"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr unset command : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager unset command : pid(%d)", pid); int ret = -1; @@ -1014,15 +1008,14 @@ static int __vc_mgr_unset_command_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_ return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr unset command : pid(%d)", pid); return ret; } static int __vc_mgr_set_demandable_client_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager Set demandable client"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set demandable client : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager Set demandable client : pid(%d)", pid); int ret = -1; @@ -1032,15 +1025,14 @@ static int __vc_mgr_set_demandable_client_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_ return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set demandable client : pid(%d)", pid); return ret; } static int __vc_mgr_set_audio_type_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, const char *audio_type, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set audio type"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set audio type : pid(%d), audio type(%s)", pid, audio_type); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager set audio type : pid(%d), audio type(%s)", pid, audio_type); int ret = -1; @@ -1050,15 +1042,14 @@ static int __vc_mgr_set_audio_type_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set audio type : pid(%d), audio type(%s)", pid, audio_type); return ret; } static int __vc_mgr_get_audio_type_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, char **audio_type, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager get audio type"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set audio type : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager get audio type : pid(%d)", pid); int ret = -1; char* tmp_audio_type = NULL; @@ -1073,15 +1064,14 @@ static int __vc_mgr_get_audio_type_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context *audio_type = strdup(tmp_audio_type); free(tmp_audio_type); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set audio type : pid(%d)", pid); return ret; } static void __vc_mgr_set_private_data_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, const char *key, const char *data, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set private data"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set domain : pid(%d), key(%s), data(%s)", pid, key, data); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager set private data : pid(%d), key(%s), data(%s)", pid, key, data); int ret = -1; @@ -1091,13 +1081,12 @@ static void __vc_mgr_set_private_data_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_cont SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set private data : pid(%d), key(%s), data(%s)", pid, key, data); } static int __vc_mgr_get_private_data_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, const char *key, char **data, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager get private data"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr get private data : pid(%d), key(%s)", pid, key); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager get private data : pid(%d), key(%s)", pid, key); int ret = -1; char *temp_data = NULL; @@ -1115,15 +1104,14 @@ static int __vc_mgr_get_private_data_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_conte *data = strdup(temp_data); free(temp_data); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr get private data : pid(%d), key(%s)", pid, key); return ret; } static int __vc_mgr_set_client_info_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set client info"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set client info : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager set client info : pid(%d)", pid); int ret = -1; @@ -1133,15 +1121,14 @@ static int __vc_mgr_set_client_info_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_contex return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set client info : pid(%d)", pid); return ret; } static int __vc_mgr_set_domain_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, const char *domain, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set domain type"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set domain : pid(%d), domain(%s)", pid, domain); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager set domain type : pid(%d), domain(%s)", pid, domain); int ret = -1; @@ -1151,15 +1138,14 @@ static int __vc_mgr_set_domain_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h c return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set domain : pid(%d), domain(%s)", pid, domain); return ret; } static void __vc_mgr_do_action_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, int type, const char *send_event, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager request to do action"); - SLOG(LOG_INFO, 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, "@@@ VCD Manager request to do action : pid(%d), type(%d) send_event(%s)", pid, type, send_event); int ret = -1; @@ -1168,7 +1154,7 @@ static void __vc_mgr_do_action_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h c SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr request to do action : pid(%d), type(%d) send_event(%s)", pid, type, send_event); } static int __vc_mgr_start_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, int recognition_mode, bool exclusive_command_option, bool start_by_client, int disabled_cmd_type, void *user_data) @@ -1187,15 +1173,14 @@ static int __vc_mgr_start_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h contex return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager start DONE"); return ret; } static int __vc_mgr_stop_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager stop"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr stop : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager stop : pid(%d)", pid); int ret = -1; @@ -1206,15 +1191,14 @@ static int __vc_mgr_stop_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr stop : pid(%d)", pid); return ret; } static int __vc_mgr_cancel_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager cancel"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr cancel : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager cancel : pid(%d)", pid); int ret = -1; @@ -1224,24 +1208,23 @@ static int __vc_mgr_cancel_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h conte return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr cancel : pid(%d)", pid); return ret; } static void __vc_mgr_set_audio_streaming_mode_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, int mode, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set audio streaming mode"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set audio streaming mode : pid(%d) mode(%d)", pid, mode); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager set audio streaming mode : pid(%d) mode(%d)", pid, mode); vcd_config_set_audio_streaming_mode((vcd_audio_streaming_mode_e)mode); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr set audio streaming mode : pid(%d) mode(%d)", pid, mode); } static void __vc_mgr_send_specific_engine_request_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, const char *engine_app_id, const char *event, const char *request, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager specific engine request"); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager specific engine request"); int ret = -1; gsize decodingSize = 0; @@ -1257,23 +1240,21 @@ static void __vc_mgr_send_specific_engine_request_cb(rpc_port_stub_vcd_mgr_stub g_free(gDecodedRequest); } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager specific engine request DONE"); } static void __vc_mgr_send_result_selection_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager result selection"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr result selection : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager result selection : pid(%d)", pid); vcd_server_mgr_result_select(); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr result selection : pid(%d)", pid); } static void __vc_mgr_send_utterance_status_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, int utt_id, int utt_status, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager send utterance status"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr send utterance status : pid(%d), utt_id(%d), utt_status(%d)", pid, utt_id, utt_status); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager send utterance status : pid(%d), utt_id(%d), utt_status(%d)", pid, utt_id, utt_status); pthread_mutex_lock(&g_client_tidl_info_mutex); @@ -1321,12 +1302,12 @@ static void __vc_mgr_send_utterance_status_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr bundle_free(msg); pthread_mutex_unlock(&g_client_tidl_info_mutex); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd mgr send utterance status : pid(%d), utt_id(%d), utt_status(%d)", pid, utt_id, utt_status); } static void __vc_mgr_send_audio_streaming_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_context_h context, int pid, int event, rpc_port_stub_vcd_mgr_stub_array_char_h data, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager send audio streaming"); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager send audio streaming"); char* buffer = NULL; int len = 0; @@ -1340,7 +1321,7 @@ static void __vc_mgr_send_audio_streaming_cb(rpc_port_stub_vcd_mgr_stub_vc_mgr_ SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Manager send audio streaming DONE"); } int __mgr_tidl_open_connection() @@ -1485,8 +1466,6 @@ static void __vc_widget_terminate_cb(rpc_port_stub_vcd_widget_stub_vc_widget_con } widget_tidl_info = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); - pthread_mutex_unlock(&g_widget_tidl_info_mutex); char *sender = NULL; @@ -1551,7 +1530,7 @@ static void __vc_widget_register_cb_cb(rpc_port_stub_vcd_widget_stub_vc_widget_ __request_tidl_connect(VCD_CLIENT_TYPE_WIDGET, pid); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VC WIDGET REGISTER CALLBACK DONE"); } static int __vc_widget_initialize_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h context, int pid, int *service_state, int *daemon_pid, void *user_data) @@ -1572,14 +1551,12 @@ static int __vc_widget_initialize_cb(rpc_port_stub_vcd_widget_stub_vc_widget_co *daemon_pid = getpid(); SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget initialize : pid(%d) service state(%d) daemon_pid(%d)", pid, *service_state, *daemon_pid); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return ret; } static int __vc_widget_finalize_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Finalize"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget finalize : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Widget Finalize : pid(%d)", pid); int ret = -1; @@ -1589,15 +1566,14 @@ static int __vc_widget_finalize_cb(rpc_port_stub_vcd_widget_stub_vc_widget_cont return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget finalize : pid(%d)", pid); return ret; } static int __vc_widget_start_recording_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h context, int pid, int command, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Start Recording"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget start recording : pid(%d) command(%d)", pid, command); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Widget Start Recording : pid(%d) command(%d)", pid, command); int ret = -1; @@ -1607,15 +1583,14 @@ static int __vc_widget_start_recording_cb(rpc_port_stub_vcd_widget_stub_vc_widge return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget start recording : pid(%d) command(%d)", pid, command); return ret; } static int __vc_widget_start_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h context, int pid, int silence, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Start"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget start : pid(%d) silence(%d)", pid, silence); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Widget Start : pid(%d) silence(%d)", pid, silence); int ret = -1; @@ -1625,15 +1600,14 @@ static int __vc_widget_start_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_ return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget start : pid(%d) silence(%d)", pid, silence); return ret; } static int __vc_widget_stop_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Stop"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget stop : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Widget Stop : pid(%d)", pid); int ret = -1; @@ -1643,15 +1617,14 @@ static int __vc_widget_stop_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget stop : pid(%d)", pid); return ret; } static int __vc_widget_cancel_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h context, int pid, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Cancel"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget cancel : pid(%d)", pid); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Widget Cancel : pid(%d)", pid); int ret = -1; @@ -1661,15 +1634,14 @@ static int __vc_widget_cancel_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget cancel : pid(%d)", pid); return ret; } static int __vc_widget_enable_asr_result_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h context, int pid, int enable, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Enable Asr Result"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget enable asr result : pid(%d) enable(%d)", pid, enable); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Widget Enable Asr Result : pid(%d) enable(%d)", pid, enable); int ret = -1; @@ -1679,15 +1651,14 @@ static int __vc_widget_enable_asr_result_cb(rpc_port_stub_vcd_widget_stub_vc_wid return ret; } - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget enable asr result : pid(%d) enable(%d)", pid, enable); return ret; } static void __vc_widget_set_foreground_cb(rpc_port_stub_vcd_widget_stub_vc_widget_context_h context, int pid, int value, void *user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Set Foreground"); - SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget set foreground : pid(%d) value(%d)", pid, value); + SLOG(LOG_INFO, TAG_VCD, "@@@ VCD Widget Set Foreground : pid(%d) value(%d)", pid, value); int ret = -1; @@ -1700,7 +1671,7 @@ static void __vc_widget_set_foreground_cb(rpc_port_stub_vcd_widget_stub_vc_widge SLOG(LOG_DEBUG, TAG_VCD, "@@@ send request set foreground to manager"); vcdc_send_request_set_foreground(pid, value); - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); + SLOG(LOG_INFO, TAG_VCD, "[IN] vcd widget set foreground : pid(%d) value(%d)", pid, value); return; } @@ -1791,8 +1762,6 @@ static void __vc_setting_terminate_cb(rpc_port_stub_vcd_setting_stub_vc_setting_ } setting_tidl_info = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "@@@"); - pthread_mutex_unlock(&g_setting_tidl_info_mutex); } rpc_port_stub_vcd_setting_stub_vc_setting_context_set_tag(context, NULL);