From ad52a9427db528819c096faf7d247fbd04d79bc0 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Wed, 21 Jun 2017 20:12:11 +0900 Subject: [PATCH 01/16] Fix dangling pointer issue with command list Change-Id: I028c2f9972c587b2143d1dc0e225eb80dd1f5af5 Signed-off-by: Wonnam Jang --- common/vc_command.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/common/vc_command.c b/common/vc_command.c index 1478fcd..5ae5859 100644 --- a/common/vc_command.c +++ b/common/vc_command.c @@ -37,6 +37,8 @@ static int g_feature_enabled = -1; static int g_privilege_allowed = 1; /* Always True */ static cynara *p_cynara = NULL; +static GList *g_cmdlist_list = NULL; + // For getting timestamp using regular expression static regex_t reg[MAX_NUM_REGEX]; @@ -178,6 +180,8 @@ int vc_cmd_list_create(vc_cmd_list_h* vc_cmd_list) *vc_cmd_list = (vc_cmd_list_h)list; + g_cmdlist_list = g_list_append(g_cmdlist_list, list); + SLOG(LOG_DEBUG, TAG_VCCMD, "[List] list(%p)", *vc_cmd_list); return VC_ERROR_NONE; @@ -204,12 +208,34 @@ int vc_cmd_list_destroy(vc_cmd_list_h vc_cmd_list, bool release_command) SLOG(LOG_DEBUG, TAG_VCCMD, "[List] list(%p)", list); - if (NULL != list) { - free(list); - list = NULL; + GList *iter = NULL; + vc_cmd_list_s *data = NULL; + + /* if list have item */ + if (g_list_length(g_cmdlist_list) > 0) { + /* Get a first item */ + iter = g_list_first(g_cmdlist_list); + + while (NULL != iter) { + data = iter->data; + if (data && list == data) { + g_cmdlist_list = g_list_remove_link(g_cmdlist_list, iter); + + free(data); + data = NULL; + + SLOG(LOG_DEBUG, TAG_VCCMD, "Client destroy"); + g_list_free(iter); + + return VC_ERROR_NONE; + } + /* Next item */ + iter = g_list_next(iter); + } } + SLOG(LOG_ERROR, TAG_VCCMD, "Fail to destroy client : handle is not valid"); - return VC_ERROR_NONE; + return VC_ERROR_INVALID_PARAMETER; } int vc_cmd_list_get_count(vc_cmd_list_h vc_cmd_list, int* count) -- 2.7.4 From 66d9a872ca038f71a0855ae79c5cefd420a30411 Mon Sep 17 00:00:00 2001 From: Kwangyoun Kim Date: Tue, 13 Jun 2017 10:33:52 +0900 Subject: [PATCH 02/16] Apply sound manager to fix recorder issue Change-Id: I0069a8b618551e98f805deecd5274ae768233991 --- client/vc_mgr.c | 3 - server/vcd_recorder.c | 212 +++++++++++++++++++++++++++++++++++++++++++------- server/vcd_server.c | 6 +- 3 files changed, 187 insertions(+), 34 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index b64bdaa..62c4333 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -1889,10 +1889,7 @@ int __vc_mgr_cb_set_volume(float volume) g_volume_db = g_prev_volume_db + (g_cur_volume_db - g_prev_volume_db) / 5; - SLOG(LOG_DEBUG, TAG_VCM, "Set volume (%f)(%f)", g_volume_db, g_cur_volume_db); - if (NULL != g_m_set_volume_timer) { - SLOG(LOG_DEBUG, TAG_VCM, "Connect Timer is deleted"); ecore_timer_del(g_m_set_volume_timer); } diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index 324b2bf..e315f78 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -22,6 +22,7 @@ #include #include #include +#include #ifdef TV_PRODUCT #ifdef TV_BT_MODE #include @@ -42,6 +43,8 @@ #define FRAME_LENGTH 160 #define BUFFER_LENGTH FRAME_LENGTH * 2 +#define FOCUS_SERVER_READY "/tmp/.focus_server_ready" + #define VCP_AUDIO_ID_NONE "VC_AUDIO_ID_NONE" /**< None audio id */ static vcd_recorder_state_e g_recorder_state = VCD_RECORDER_STATE_READY; @@ -52,13 +55,13 @@ static vcd_recorder_interrupt_cb g_interrupt_cb = NULL; static audio_in_h g_audio_h; -#if 0 +#if 1 static sound_stream_info_h g_stream_info_h; #endif static vcp_audio_type_e g_audio_type; -static unsigned int g_audio_rate; +static int g_audio_rate; static int g_audio_channel; @@ -91,7 +94,6 @@ static void __msf_wifi_audio_data_receive_cb(msf_wifi_voice_data_s *voice_data, if (0 != strncmp(g_current_audio_type, VCP_AUDIO_ID_MSF, sizeof(VCP_AUDIO_ID_MSF))) { vcd_state_e state = vcd_config_get_service_state(); if (VCD_STATE_READY == state) { - vcd_engine_set_audio_type(VCP_AUDIO_ID_MSF); vcd_recorder_set(VCP_AUDIO_ID_MSF, VCP_AUDIO_TYPE_PCM_S16_LE, 16000, 1); } else { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] current audio type is (%s)", g_current_audio_type); @@ -101,6 +103,7 @@ static void __msf_wifi_audio_data_receive_cb(msf_wifi_voice_data_s *voice_data, if (VCD_RECORDER_STATE_RECORDING != g_recorder_state) { SLOG(LOG_WARN, TAG_VCD, "[Recorder] Not start yet, but send audio data vi MSF"); + vcd_recorder_start(); } if (NULL != g_audio_cb) { @@ -154,7 +157,6 @@ static void _bt_hid_audio_data_receive_cb(bt_hid_voice_data_s *voice_data, void if (0 != strncmp(g_current_audio_type, VCP_AUDIO_ID_BLUETOOTH, sizeof(VCP_AUDIO_ID_BLUETOOTH))) { vcd_state_e state = vcd_config_get_service_state(); if (VCD_STATE_READY == state) { - vcd_engine_set_audio_type(VCP_AUDIO_ID_BLUETOOTH); vcd_recorder_set(VCP_AUDIO_ID_BLUETOOTH, VCP_AUDIO_TYPE_PCM_S16_LE, 16000, 1); } else { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] current audio type is (%s)", g_current_audio_type); @@ -164,6 +166,7 @@ static void _bt_hid_audio_data_receive_cb(bt_hid_voice_data_s *voice_data, void if (VCD_RECORDER_STATE_RECORDING != g_recorder_state) { SLOG(LOG_WARN, TAG_VCD, "[Recorder] Not start yet, but send audio data vi Bluetooth"); + vcd_recorder_start(); } if (NULL != g_audio_cb) { @@ -210,7 +213,7 @@ static void _bt_hid_audio_data_receive_cb(bt_hid_voice_data_s *voice_data, void #endif -#if 0 +#if 1 static const char* __get_focus_changed_reason_code(sound_stream_focus_change_reason_e reason) { switch (reason) { @@ -229,7 +232,8 @@ 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_change_reason_e reason, const char *extra_info, void *user_data) +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"); @@ -238,17 +242,9 @@ static void __recorder_focus_state_cb(sound_stream_info_h stream_info, sound_str return; } - int ret; - sound_stream_focus_state_e state_for_recording; - ret = sound_manager_get_focus_state(g_stream_info_h, NULL, &state_for_recording); - if (SOUND_MANAGER_ERROR_NONE != ret) { - SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to get focus state"); - return; - } - - SLOG(LOG_WARN, TAG_VCD, "[Recorder] focus state chagned to (%d) with reason (%s)", (int)state_for_recording, __get_focus_changed_reason_code(reason)); + SLOG(LOG_WARN, TAG_VCD, "[Recorder] focus state chagned to (%d) with reason (%s)", (int)focus_state, __get_focus_changed_reason_code(reason)); - if (VCD_RECORDER_STATE_RECORDING == g_recorder_state && SOUND_STREAM_FOCUS_STATE_RELEASED == state_for_recording) { + if (VCD_RECORDER_STATE_RECORDING == g_recorder_state && SOUND_STREAM_FOCUS_STATE_RELEASED == focus_state) { SLOG(LOG_WARN, TAG_VCD, "[Recorder] Focus released as interrupt"); if (NULL != g_interrupt_cb) { g_interrupt_cb(); @@ -257,6 +253,46 @@ static void __recorder_focus_state_cb(sound_stream_info_h stream_info, sound_str } #endif +static int __apply_device_for_stream_routing() +{ + sound_device_list_h device_list = NULL; + sound_device_h device = NULL; + sound_device_type_e type; + sound_device_io_direction_e io_direction; + + if (0 != sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &device_list)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to get current device list"); + return -1; + } + + int ret = 0; + while (0 == (ret = sound_manager_get_next_device(device_list, &device))) { + if (0 != sound_manager_get_device_type(device, &type)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to get device tyep"); + continue; + } + if (0 != sound_manager_get_device_io_direction(device, &io_direction)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to get device io direction"); + continue; + } + if (SOUND_DEVICE_USB_AUDIO == type && SOUND_DEVICE_IO_DIRECTION_IN == io_direction) { + if (0 != sound_manager_add_device_for_stream_routing(g_stream_info_h, device)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to add device"); + continue; + } + if (0 != sound_manager_apply_stream_routing(g_stream_info_h)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR} Fail to apply stream routing"); + continue; + } + SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Apply device for stream routing"); + return 0; + } + } + + SLOG(LOG_WARN, TAG_VCD, "[Recorder] No device"); + return -1; +} + int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb interrupt_cb) { if (NULL == audio_cb || NULL == interrupt_cb) { @@ -264,6 +300,19 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb return VCD_ERROR_INVALID_PARAMETER; } + /* check focus server */ + int cnt = 0; + while (1) { + if (0 == access(FOCUS_SERVER_READY, F_OK)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder SUCCESS] focus server is available"); + break; + } else { + if (0 == cnt++ % 10) + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] focus server is not available"); + usleep(50000); + } + } + int ret = 0; /* set init value */ @@ -278,6 +327,8 @@ 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); + switch (g_audio_channel) { case 1: audio_ch = AUDIO_CHANNEL_MONO; break; case 2: audio_ch = AUDIO_CHANNEL_STEREO; break; @@ -305,9 +356,15 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb g_is_valid_audio_in = false; } -#if 0 - if (0 != sound_manager_create_stream_information(SOUND_STREAM_TYPE_VOICE_RECOGNITION, __recorder_focus_state_cb, NULL, &g_stream_info_h)) { +#if 1 + if (0 != sound_manager_create_stream_information_internal(SOUND_STREAM_TYPE_VOICE_RECOGNITION_SERVICE, __recorder_focus_state_cb, NULL, &g_stream_info_h)) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to create stream info"); + } else { + __apply_device_for_stream_routing(); + } + + if (0 != audio_in_set_sound_stream_info(g_audio_h, g_stream_info_h)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to set stream info"); } #endif @@ -341,10 +398,15 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb } #endif /* Select default audio type */ - if (true == g_is_valid_bt_in) { - g_current_audio_type = strdup(VCP_AUDIO_ID_BLUETOOTH); - } else { + if (true == g_is_valid_audio_in) { g_current_audio_type = strdup(VCP_AUDIO_ID_NONE); + } else { + if (true == g_is_valid_bt_in) { + g_current_audio_type = strdup(VCP_AUDIO_ID_BLUETOOTH); + } else { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] No valid audio"); + return -1; + } } SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Audio type : %s", g_current_audio_type); @@ -408,9 +470,23 @@ int vcd_recorder_set(const char* audio_type, vcp_audio_type_e type, int rate, in } } + SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] set audio type (%s)", audio_type); + vcd_engine_set_audio_type(audio_type); + if (VCD_RECORDER_STATE_READY != g_recorder_state) { - SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Recorder is NOT ready"); - return VCD_ERROR_INVALID_STATE; + if ((!strncmp(g_current_audio_type, VCP_AUDIO_ID_NONE, strlen(g_current_audio_type)) && + strncmp(audio_type, VCP_AUDIO_ID_BLUETOOTH, strlen(audio_type)) && + strncmp(audio_type, VCP_AUDIO_ID_MSF, strlen(audio_type))) || + (strncmp(g_current_audio_type, VCP_AUDIO_ID_BLUETOOTH, strlen(g_current_audio_type)) && + strncmp(g_current_audio_type, VCP_AUDIO_ID_MSF, strlen(g_current_audio_type)) && + strncmp(g_current_audio_type, VCP_AUDIO_ID_NONE, strlen(g_current_audio_type)) && + !strncmp(audio_type, VCP_AUDIO_ID_NONE, strlen(audio_type)))) { + SLOG(LOG_DEBUG, 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(); + //return VCD_ERROR_INVALID_STATE; + } } int ret = -1; @@ -441,6 +517,7 @@ int vcd_recorder_set(const char* audio_type, vcp_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); audio_in_destroy(g_audio_h); audio_channel_e audio_ch; @@ -471,6 +548,10 @@ int vcd_recorder_set(const char* audio_type, vcp_audio_type_e type, int rate, in return VCD_ERROR_OPERATION_FAILED; } + if (0 != audio_in_set_sound_stream_info(g_audio_h, g_stream_info_h)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to set stream info"); + } + g_audio_type = type; g_audio_rate = rate; g_audio_channel = channel; @@ -591,6 +672,69 @@ Eina_Bool __read_normal_func(void *data) return EINA_TRUE; } +static void __check_audio_format() +{ + vcp_audio_type_e type; + int rate; + int channel; + + int ret = vcd_engine_get_audio_format(VCP_AUDIO_ID_NONE, &type, &rate, &channel); + if (0 != ret) { + SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to get audio format : %d", ret); + return; + } + + if (false == g_is_valid_audio_in) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Audio-in is NOT valid"); + return; + } + + 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); + audio_in_destroy(g_audio_h); + + audio_channel_e audio_ch; + audio_sample_type_e audio_type; + + switch (channel) { + case 1: audio_ch = AUDIO_CHANNEL_MONO; break; + case 2: audio_ch = AUDIO_CHANNEL_STEREO; break; + default: + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Input channel is not supported"); + return; + break; + } + + switch (type) { + case VCP_AUDIO_TYPE_PCM_S16_LE: audio_type = AUDIO_SAMPLE_TYPE_S16_LE; break; + case VCP_AUDIO_TYPE_PCM_U8: audio_type = AUDIO_SAMPLE_TYPE_U8; break; + default: + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Invalid Audio Type"); + return; + break; + } + + ret = audio_in_create(rate, audio_ch, audio_type, &g_audio_h); + if (AUDIO_IO_ERROR_NONE != ret) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to create audio handle : %d", ret); + g_is_valid_audio_in = false; + return; + } + + if (0 != audio_in_set_sound_stream_info(g_audio_h, g_stream_info_h)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to set stream info"); + } + + g_audio_type = type; + 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); + } +} + + + int vcd_recorder_start() { int ret = -1; @@ -647,6 +791,8 @@ int vcd_recorder_start() SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] started = %d", started); if (false == started) { + /* check audio format */ + __check_audio_format(); #if 0 ret = sound_manager_acquire_focus(g_stream_info_h, SOUND_STREAM_FOCUS_FOR_RECORDING, NULL); if (SOUND_MANAGER_ERROR_NONE != ret) { @@ -726,6 +872,13 @@ int vcd_recorder_stop() break; } } + if (NULL != g_current_audio_type && + (!strncmp(g_current_audio_type, VCP_AUDIO_ID_BLUETOOTH, sizeof(VCP_AUDIO_ID_BLUETOOTH)) || + !strncmp(g_current_audio_type, VCP_AUDIO_ID_MSF, sizeof(VCP_AUDIO_ID_MSF)))) { + SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] Recorder reset to NONE"); + vcd_recorder_set(VCP_AUDIO_ID_NONE, g_audio_type, g_audio_rate, g_audio_channel); + } + if (false == stoped) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to stop bt audio"); return VCD_ERROR_OPERATION_FAILED; @@ -734,8 +887,16 @@ int vcd_recorder_stop() } else if (0 == strncmp(VCP_AUDIO_ID_MSF, g_current_audio_type, strlen(VCP_AUDIO_ID_MSF))) { #ifdef TV_MSF_WIFI_MODE UnRegisterMSFAudioCallback(); + if (NULL != g_current_audio_type && + (!strncmp(g_current_audio_type, VCP_AUDIO_ID_BLUETOOTH, sizeof(VCP_AUDIO_ID_BLUETOOTH)) || + !strncmp(g_current_audio_type, VCP_AUDIO_ID_MSF, sizeof(VCP_AUDIO_ID_MSF)))) { + SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] Recorder reset to NONE"); + vcd_recorder_set(VCP_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"); } } @@ -754,11 +915,6 @@ int vcd_recorder_stop() #endif } - if (NULL != g_current_audio_type && 0 != strncmp(g_current_audio_type, VCP_AUDIO_ID_NONE, sizeof(VCP_AUDIO_ID_NONE))) { - vcd_recorder_set(VCP_AUDIO_ID_NONE, VCP_AUDIO_TYPE_PCM_S16_LE, 16000, 1); - vcd_engine_set_audio_type(VCP_AUDIO_ID_NONE); - } - return 0; } diff --git a/server/vcd_server.c b/server/vcd_server.c index fdad45b..0b1ae73 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -1516,7 +1516,7 @@ static int __start_internal_recognition() SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Start engine"); -#if 0 +#if 1 /* 5. recorder start */ ret = vcd_recorder_start(); if (0 != ret) { @@ -1619,7 +1619,7 @@ int vcd_server_mgr_stop() return VCD_ERROR_OPERATION_FAILED; } -#if 0 +#if 1 /* 2. Stop recorder */ vcd_recorder_stop(); #endif @@ -1658,7 +1658,7 @@ int vcd_server_mgr_cancel() return VCD_ERROR_NONE; } -#if 0 +#if 1 /* 2. Stop recorder */ vcd_recorder_stop(); #endif -- 2.7.4 From f5bad5dfbdf2b672bdccb68500f90c8f9c2812a5 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Wed, 28 Jun 2017 16:59:41 +0900 Subject: [PATCH 03/16] Fix dlog format argument error Change-Id: I9cdb77a7a4faea05d6b6db6d690f14ad7c1adac5 Signed-off-by: Wonnam Jang --- common/vc_cmd_db.c | 2 +- common/vc_command.c | 2 +- common/vc_json_parser.c | 2 +- server/vcd_dbus_server.c | 2 +- server/vcd_recorder.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/vc_cmd_db.c b/common/vc_cmd_db.c index 2e35e84..ca87d8b 100644 --- a/common/vc_cmd_db.c +++ b/common/vc_cmd_db.c @@ -759,7 +759,7 @@ static int __vc_db_get_result(char** result_text, int* event, char** msg, int pi if (-1 == pid) SLOG(LOG_DEBUG, vc_db_tag(), "[SQL] %s", sql); else if (NULL != appid) - SLOG(LOG_DEBUG, vc_db_tag(), "[SQL] SELECT * FROM vc_result WHERE appid = %d;", appid); + SLOG(LOG_DEBUG, vc_db_tag(), "[SQL] SELECT * FROM vc_result WHERE appid = %s;", appid); else SLOG(LOG_DEBUG, vc_db_tag(), "[SQL] SELECT * FROM vc_result WHERE pid = %d;", pid); diff --git a/common/vc_command.c b/common/vc_command.c index 5ae5859..1263d48 100644 --- a/common/vc_command.c +++ b/common/vc_command.c @@ -2314,7 +2314,7 @@ int vc_cmd_get_datetime(const char *text, time_t *result, char **remain) if (g_time_flag > 0 || g_date_flag > 0) { *result = mktime(&td); - SLOG(LOG_DEBUG, TAG_VCCMD, "Timestamp in the text = %d", *result); + SLOG(LOG_DEBUG, TAG_VCCMD, "Timestamp in the text = %ld", *result); SLOG(LOG_DEBUG, TAG_VCCMD, "%d-%d-%d (%s), %d:%d:%d", td.tm_year + 1900, td.tm_mon + 1, td.tm_mday, day_name[td.tm_wday], td.tm_hour, td.tm_min, td.tm_sec, td.tm_yday); diff --git a/common/vc_json_parser.c b/common/vc_json_parser.c index 8ab0e4f..3f6a487 100755 --- a/common/vc_json_parser.c +++ b/common/vc_json_parser.c @@ -388,7 +388,7 @@ int vc_json_set_commands_from_file(const char* file_path, vc_cmd_type_e type, ch parser = json_parser_new(); json_parser_load_from_file(parser, file_path, &err_msg); if (err_msg) { - SLOG(LOG_ERROR, vc_json_tag(), "[ERROR] Fail to load json file, file_path(%s), err_msg(%s)", file_path, err_msg); + SLOG(LOG_ERROR, vc_json_tag(), "[ERROR] Fail to load json file, file_path(%s), err_msg(%s)", file_path, err_msg->message); g_error_free(err_msg); g_object_unref(parser); return VC_ERROR_OPERATION_FAILED; diff --git a/server/vcd_dbus_server.c b/server/vcd_dbus_server.c index 169e3f4..45c92ec 100644 --- a/server/vcd_dbus_server.c +++ b/server/vcd_dbus_server.c @@ -33,7 +33,7 @@ int __dbus_error_return(DBusConnection* conn, DBusMessage* msg, int ret) DBUS_TYPE_INVALID); if (0 == ret) { - SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)"); + SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index 324b2bf..a04f281 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -119,7 +119,7 @@ static void __msf_wifi_audio_data_receive_cb(msf_wifi_voice_data_s *voice_data, } if (0 == g_buffer_count || 0 == g_buffer_count % 50) { - SLOG(LOG_WARN, TAG_VCD, "[Recorder][%d] Recording... : read_size(%d)", g_buffer_count, voice_data->length); + SLOG(LOG_WARN, TAG_VCD, "[Recorder][%d] Recording... : read_size(%ld)", g_buffer_count, voice_data->length); if (100000 == g_buffer_count) g_buffer_count = 0; -- 2.7.4 From 8c428b6c9aed1d0bd44e75f110f004d3274b9047 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Fri, 7 Jul 2017 10:26:05 +0900 Subject: [PATCH 04/16] Add to check null Change-Id: I96929a3ed6b8b1fdc2fb59eb9e84c457c7d8b355 Signed-off-by: Wonnam Jang --- client/vc_widget.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/client/vc_widget.c b/client/vc_widget.c index 6dfb664..b5cf497 100644 --- a/client/vc_widget.c +++ b/client/vc_widget.c @@ -913,6 +913,10 @@ static Eina_Bool __vc_widget_notify_error(void *data) vc_error_cb callback = NULL; void* user_data; int reason; + if (NULL == vc_w) { + SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); + return VC_ERROR_INVALID_PARAMETER; + } vc_widget_client_get_error_cb(vc_w, &callback, &user_data); vc_widget_client_get_error(vc_w, &reason); @@ -1226,6 +1230,10 @@ bool __vc_widget_cb_asr_result() static Eina_Bool __vc_widget_notify_state_changed(void *data) { vc_h vc_w = (vc_h)data; + if (NULL == vc_w) { + SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); + return VC_ERROR_INVALID_PARAMETER; + } SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); -- 2.7.4 From 595a0e3dcb14164fc5a6f65c52508185d8ff64c8 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Thu, 13 Jul 2017 15:34:27 +0900 Subject: [PATCH 05/16] Fix dlog level Change-Id: I6383742cd97713cfdfe87ff59ac549ed0e5f6102 Signed-off-by: sooyeon.kim --- client/vc_widget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/vc_widget.c b/client/vc_widget.c index b5cf497..201be60 100644 --- a/client/vc_widget.c +++ b/client/vc_widget.c @@ -539,7 +539,7 @@ int vc_widget_get_state(vc_h vc_w, vc_state_e* state) vc_state_e temp; if (0 != vc_widget_client_get_state(vc_w, &temp)) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); + SLOG(LOG_DEBUG, TAG_VCW, "[ERROR] A handle is not available"); SLOG(LOG_DEBUG, TAG_VCW, "====="); SLOG(LOG_DEBUG, TAG_VCW, " "); return VC_ERROR_INVALID_STATE; -- 2.7.4 From 6a419e2de623e78283438fbadf4df1afd7adf386 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Tue, 11 Jul 2017 10:50:43 +0900 Subject: [PATCH 06/16] change ecore timer to async function Change-Id: Ie57bbd6c5ae9cdf28592ee5c5e11064ff6f2c1ac Signed-off-by: Wonnam Jang --- server/vcd_recorder.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index e2ac9c2..af4bb75 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -468,6 +468,9 @@ int vcd_recorder_set(const char* audio_type, vcp_audio_type_e type, int rate, in SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Current audio type is already set : %s", audio_type); return 0; } + } else { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Recorder is NOT created"); + return VCD_ERROR_INVALID_STATE; } SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] set audio type (%s)", audio_type); @@ -672,6 +675,13 @@ Eina_Bool __read_normal_func(void *data) return EINA_TRUE; } +static void __timer_read_normal_func(void *data) +{ + SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] before __read_normal_func"); + ecore_timer_add(0, __read_normal_func, NULL); + return; +} + static void __check_audio_format() { vcp_audio_type_e type; @@ -817,7 +827,7 @@ int vcd_recorder_start() } /* Add ecore timer to read audio data */ - ecore_timer_add(0, __read_normal_func, NULL); + ecore_main_loop_thread_safe_call_async(__timer_read_normal_func, NULL); SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Start audio in recorder"); } -- 2.7.4 From f6e03f4f94f0353e9ce35682bfe848b2fe18608d Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Mon, 17 Jul 2017 11:06:55 +0900 Subject: [PATCH 07/16] Update internal state when cancel is called in ready state Change-Id: I7f2816b1d931d6e31bd32759fa763670e6493530 Signed-off-by: Wonnam Jang --- client/vc_mgr.c | 12 ++++++------ server/vcd_server.c | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 62c4333..fa15f7d 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -2511,12 +2511,6 @@ 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); - if (current_state == before_state) { - SLOG(LOG_WARN, TAG_VCM, "Service State NOT changed : Before(%d) Current(%d)", - before_state, current_state); - return 0; - } - SLOG(LOG_DEBUG, TAG_VCM, "Service State changed : Before(%d) Current(%d)", before_state, current_state); @@ -2529,6 +2523,12 @@ int __vc_mgr_cb_service_state(int state) vc_mgr_client_set_internal_state(g_vc_m, VC_INTERNAL_STATE_NONE); } + if (current_state == before_state) { + SLOG(LOG_WARN, TAG_VCM, "Service State NOT changed : Before(%d) Current(%d)", + before_state, current_state); + return 0; + } + /* Save service state */ vc_mgr_client_set_service_state(g_vc_m, current_state); diff --git a/server/vcd_server.c b/server/vcd_server.c index 0b1ae73..a2aa150 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -558,6 +558,10 @@ static void __vcd_server_result_cb(vcp_result_event_e event, int* result_id, int /* system > exclusive > foreground = widget > system_background > background */ int i = 0; int* filtered_id = (int*)calloc(count, sizeof(int)); + if (!filtered_id) { + SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to allocate memory"); + return; + } int filtered_count = 0; int top_priority = VC_COMMAND_PRIORITY_BACKGROUND; for (i = 0; i < count; i++) { @@ -1655,6 +1659,7 @@ int vcd_server_mgr_cancel() if (VCD_STATE_READY == state) { SLOG(LOG_DEBUG, TAG_VCD, "[Server] Current state is READY"); vcd_recorder_stop(); + vcdc_send_service_state(VCD_STATE_READY); return VCD_ERROR_NONE; } -- 2.7.4 From 0b9f70791b87f8ba9b9949b18efdcfca43e1ae81 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Mon, 24 Jul 2017 14:44:05 +0900 Subject: [PATCH 08/16] Fix wrong format for dlog Change-Id: I190fa88a76e8f8b212b96111ab74aaf4c0df0501 Signed-off-by: Wonnam Jang --- common/vc_cmd_db.c | 2 +- common/vc_command.c | 2 +- server/vcd_dbus_server.c | 6 +++--- server/vcd_recorder.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/vc_cmd_db.c b/common/vc_cmd_db.c index ca87d8b..e68f92a 100644 --- a/common/vc_cmd_db.c +++ b/common/vc_cmd_db.c @@ -1259,7 +1259,7 @@ int vc_db_initialize(void) if (lstat(path, &stat) < 0) { char buf_err[256]; - SLOG(LOG_ERROR, vc_db_tag(), "%s", strerror_r(errno, buf_err, sizeof(buf_err))); + SLOG(LOG_ERROR, vc_db_tag(), "%d", strerror_r(errno, buf_err, sizeof(buf_err))); if (db_handle) db_util_close(db_handle); db_handle = NULL; diff --git a/common/vc_command.c b/common/vc_command.c index 1263d48..3efc055 100644 --- a/common/vc_command.c +++ b/common/vc_command.c @@ -2316,7 +2316,7 @@ int vc_cmd_get_datetime(const char *text, time_t *result, char **remain) SLOG(LOG_DEBUG, TAG_VCCMD, "Timestamp in the text = %ld", *result); SLOG(LOG_DEBUG, TAG_VCCMD, "%d-%d-%d (%s), %d:%d:%d", - td.tm_year + 1900, td.tm_mon + 1, td.tm_mday, day_name[td.tm_wday], td.tm_hour, td.tm_min, td.tm_sec, td.tm_yday); + td.tm_year + 1900, td.tm_mon + 1, td.tm_mday, day_name[td.tm_wday], td.tm_hour, td.tm_min, td.tm_sec); *remain = (char *)calloc(sizeof(char), (strlen(text) + 1 - g_data_eidx + g_data_sidx)); diff --git a/server/vcd_dbus_server.c b/server/vcd_dbus_server.c index 45c92ec..a83d053 100644 --- a/server/vcd_dbus_server.c +++ b/server/vcd_dbus_server.c @@ -124,7 +124,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)"); + SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1097,7 +1097,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)"); + SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } @@ -1661,7 +1661,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)"); + SLOG(LOG_DEBUG, TAG_VCD, "[OUT SUCCESS] Result(%d)", ret); } else { SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Result(%d)", ret); } diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index af4bb75..f701b47 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -584,7 +584,7 @@ int vcd_recorder_get(char** audio_type) if (NULL != g_current_audio_type) { *audio_type = strdup(g_current_audio_type); } else { - SLOG(LOG_WARN, TAG_VCD, "[Recorder] Current audio type is NOT ready", audio_type); + SLOG(LOG_WARN, TAG_VCD, "[Recorder] Current audio type(%s) is NOT ready", audio_type); *audio_type = NULL; } @@ -675,7 +675,7 @@ Eina_Bool __read_normal_func(void *data) return EINA_TRUE; } -static void __timer_read_normal_func(void *data) +static void __timer_read_normal_func(void *data) { SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] before __read_normal_func"); ecore_timer_add(0, __read_normal_func, NULL); -- 2.7.4 From 5dd1ec6fba95165395fb910c65b684f0c715daba Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Mon, 31 Jul 2017 09:14:49 +0900 Subject: [PATCH 09/16] Fix wrong format for dlog Change-Id: Iac96dfd4b8788e6ef0cd315d7819933508e07d18 Signed-off-by: Wonnam Jang --- 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 f701b47..81b2c98 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -584,7 +584,7 @@ int vcd_recorder_get(char** audio_type) if (NULL != g_current_audio_type) { *audio_type = strdup(g_current_audio_type); } else { - SLOG(LOG_WARN, TAG_VCD, "[Recorder] Current audio type(%s) is NOT ready", audio_type); + SLOG(LOG_WARN, TAG_VCD, "[Recorder] Current audio type(%s) is NOT ready", *audio_type); *audio_type = NULL; } -- 2.7.4 From bc3afa0f427704d46f8758ff13361484d0c26aad Mon Sep 17 00:00:00 2001 From: Suyeon Hwang Date: Thu, 27 Jul 2017 15:28:10 +0900 Subject: [PATCH 10/16] Fix security issue Change-Id: I5c2742843ddfb86cb5c052e8abaeba9739319466 Signed-off-by: Suyeon Hwang --- common/vc_config_parser.c | 2 +- common/vc_info_parser.c | 2 +- server/vcd_recorder.c | 20 ++++++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/common/vc_config_parser.c b/common/vc_config_parser.c index eb9c867..f8ed365 100644 --- a/common/vc_config_parser.c +++ b/common/vc_config_parser.c @@ -54,7 +54,7 @@ static int __vc_config_parser_set_file_mode(const char* filename) return -1; } - if (0 > chmod(filename, 0666)) { + if (0 > chmod(filename, 0600)) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Fail to change file mode"); return -1; } diff --git a/common/vc_info_parser.c b/common/vc_info_parser.c index 566e83b..8fda8ae 100644 --- a/common/vc_info_parser.c +++ b/common/vc_info_parser.c @@ -77,7 +77,7 @@ static int __vc_info_parser_set_file_mode(const char* filename) return -1; } - if (0 > chmod(filename, 0666)) { + if (0 > chmod(filename, 0600)) { SLOG(LOG_ERROR, vc_info_tag(), "[ERROR] Fail to change file mode"); return -1; } diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index f701b47..a1dfd2b 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -837,11 +837,27 @@ int vcd_recorder_start() char normal_file_name[128] = {'\0',}; g_count++; - snprintf(normal_file_name, sizeof(normal_file_name), "/tmp/vc_normal_%d_%d", getpid(), g_count); + while (1) { + snprintf(normal_file_name, sizeof(normal_file_name), "/tmp/vc_normal_%d_%d", getpid(), g_count); + ret = access(normal_file_name, 0); + + if (0 == ret) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] File is already exist"); + if (0 == remove(normal_file_name)) { + SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Remove file"); + break; + } else { + g_count++; + } + } else { + break; + } + } + SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] File normal name : %s", normal_file_name); /* open test file */ - g_normal_file = fopen(normal_file_name, "wb+"); + g_normal_file = fopen(normal_file_name, "wb+x"); if (!g_normal_file) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] File not found!"); } -- 2.7.4 From a78fdbd56b93f0788deede5dc60a157fc86d6b7f Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Wed, 16 Aug 2017 18:42:49 +0900 Subject: [PATCH 11/16] RW Update Change-Id: I476b7ed7fae327daddc5356d5f66bb0de1f84ada Signed-off-by: sooyeon.kim --- 502.vc_upgrade_24to30.sh | 34 ---------------------------------- CMakeLists.txt | 4 ---- packaging/voice-control.spec | 1 - 3 files changed, 39 deletions(-) delete mode 100755 502.vc_upgrade_24to30.sh diff --git a/502.vc_upgrade_24to30.sh b/502.vc_upgrade_24to30.sh deleted file mode 100755 index 78386c4..0000000 --- a/502.vc_upgrade_24to30.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -#------------------------------------------# -# Resourced patch for upgrade (2.4 -> 3.0) # -#------------------------------------------# - -# Macro -VOICE_DIR_24=/opt/usr/data/voice -VC_DIR_24=/opt/home/app/.voice/vc - -VOICE_DIR_30=/opt/usr/home/owner/share/.voice -VC_DIR_30=$VOICE_DIR_30/vc - -VC_CONF_FILE_24=/opt/home/app/.voice/vc-config.xml -VC_CONF_FILE_30=$VOICE_DIR_30/vc-config.xml - - -# Make new directories -mkdir -p $VOICE_DIR_30 -chown owner:users $VOICE_DIR_30 -chsmack -a User::App::Shared $VOICE_DIR_30 - - -# Move -mv $VC_DIR_24/ $VOICE_DIR_30/ -chown -R owner:users $VOICE_DIR_30/ -chsmack -ra User::App::Shared $VOICE_DIR_30/ - -mv $VC_CONF_FILE_24 $VC_CONF_FILE_30 -chown owner:users $VC_CONF_FILE_30 -chsmack -a User::App::Shared $VC_CONF_FILE_30 - -# Remove directories -rm -rf /opt/home/app/.voice diff --git a/CMakeLists.txt b/CMakeLists.txt index 86be582..51c98b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,3 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/vc-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/v INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.voice.vcserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services) INSTALL(FILES ${CMAKE_SOURCE_DIR}/vc-server.conf DESTINATION /etc/dbus-1/session.d) - -## Upgrade script ## -INSTALL(FILES ${CMAKE_SOURCE_DIR}/502.vc_upgrade_24to30.sh DESTINATION ${TZ_SYS_RO_SHARE}/upgrade/scripts) - diff --git a/packaging/voice-control.spec b/packaging/voice-control.spec index 4a21c0f..bb50859 100644 --- a/packaging/voice-control.spec +++ b/packaging/voice-control.spec @@ -122,7 +122,6 @@ mkdir -p %{_libdir}/voice/vc %{_libdir}/libvc_widget.so %{_libdir}/libvc_manager.so %{_bindir}/vc-daemon -%{TZ_SYS_RO_SHARE}/upgrade/scripts/502.vc_upgrade_24to30.sh %{TZ_SYS_RO_SHARE}/voice/vc/1.0/vc-config.xml %{TZ_SYS_RO_SHARE}/dbus-1/services/org.tizen.voice* /etc/dbus-1/session.d/vc-server.conf -- 2.7.4 From 24459445b9b331e7370505e60406997f9e5ff337 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Thu, 17 Aug 2017 17:03:29 +0900 Subject: [PATCH 12/16] change BT produce api Change-Id: I1465356abb0e9d9fcc842655a20b485a00e30764 Signed-off-by: Wonnam Jang --- 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 20c07d6..ce79fee 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -376,7 +376,7 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb bool is_bt_failed = false; - if (false == is_bt_failed && BT_ERROR_NONE != bt_initialize()) { + if (false == is_bt_failed && BT_ERROR_NONE != bt_product_init()) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to init bt"); is_bt_failed = true; } @@ -444,7 +444,7 @@ int vcd_recorder_destroy() bt_hid_host_deinitialize(); - bt_deinitialize(); + bt_product_deinit(); #endif g_audio_cb = NULL; -- 2.7.4 From 11d3773711c381e817bcaef1b06c659e33e0b42d Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Thu, 17 Aug 2017 19:23:04 +0900 Subject: [PATCH 13/16] Use thread instead of ecore time Change-Id: I0f043182067478e8ab804a899eccb84a325e0de5 Signed-off-by: Wonnam Jang --- client/vc_mgr.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index fa15f7d..eb5e8e9 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -313,19 +313,49 @@ static Eina_Bool __vc_mgr_connect_daemon(void *data) return EINA_FALSE; } -static Eina_Bool __vc_mgr_prepare_daemon(void *data) +static void __start_prepare_thread(void *data, Ecore_Thread *thread) { + SLOG(LOG_ERROR, TAG_VCM, "===== Start prepare thread"); + int ret = 1, retry_count = 0; + /* Send hello */ - if (0 != vc_mgr_dbus_request_hello()) { - return EINA_TRUE; + while (ret) { + + if (retry_count == 10) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to request hello !!"); + return; + } + + ret = vc_mgr_dbus_request_hello(); + if (ret == 0) { + SLOG(LOG_DEBUG, TAG_VCM, "Success to request hello. retry count(%d)", retry_count); + break; + } else { + retry_count++; + } } - g_m_connect_timer = NULL; - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Connect daemon"); + ret = 1; + retry_count = 0; - g_m_connect_timer = ecore_idler_add(__vc_mgr_connect_daemon, data); + while (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++; + } - return EINA_FALSE; + return; +} + +static void __end_prepare_thread(void *data, Ecore_Thread *thread) +{ + SLOG(LOG_DEBUG, TAG_VCM, "===== End prepare thread"); } int vc_mgr_prepare() @@ -348,7 +378,7 @@ int vc_mgr_prepare() return VC_ERROR_INVALID_STATE; } - g_m_connect_timer = ecore_timer_add(0, __vc_mgr_prepare_daemon, NULL); + ecore_thread_run(__start_prepare_thread, __end_prepare_thread, NULL, NULL); SLOG(LOG_DEBUG, TAG_VCM, "====="); SLOG(LOG_DEBUG, TAG_VCM, " "); -- 2.7.4 From f66fb04db8b2dc86c4d857cb4c6f040a110a71f5 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Mon, 21 Aug 2017 10:47:39 +0900 Subject: [PATCH 14/16] Apply to use external USB mic Change-Id: I28d8a883964f0c116137e816b2a83f860570fc36 Signed-off-by: Wonnam Jang --- client/vc_mgr.c | 1 - server/vcd_recorder.c | 58 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/client/vc_mgr.c b/client/vc_mgr.c index eb5e8e9..5ac54e5 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -337,7 +337,6 @@ static void __start_prepare_thread(void *data, Ecore_Thread *thread) ret = 1; retry_count = 0; - while (ret) { if (retry_count == 10) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to connect daemon !!"); diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index ce79fee..88a654f 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -55,9 +55,7 @@ static vcd_recorder_interrupt_cb g_interrupt_cb = NULL; static audio_in_h g_audio_h; -#if 1 static sound_stream_info_h g_stream_info_h; -#endif static vcp_audio_type_e g_audio_type; @@ -75,6 +73,8 @@ static char* g_current_audio_type = NULL; static int g_buffer_count; +static int g_device_id = -1; + /* Sound buf save */ /* #define BUF_SAVE_MODE @@ -293,6 +293,42 @@ static int __apply_device_for_stream_routing() return -1; } +static void __device_connection_changed_cb(sound_device_h device, bool is_connected, void *user_data) +{ + sound_device_type_e type; + if (is_connected) { + if (0 != sound_manager_get_device_type(device, &type)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to get device tyep"); + return; + } + 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"); + vcd_recorder_stop(); + is_recording_state = true; + } + if (0 != sound_manager_remove_device_for_stream_routing(g_stream_info_h, device)) + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to remove device"); + + if (0 != sound_manager_add_device_for_stream_routing(g_stream_info_h, device)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to add device"); + return; + } + if (0 != sound_manager_apply_stream_routing(g_stream_info_h)) { + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR} Fail to apply stream routing"); + return; + } + if (true == is_recording_state) { + SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Start recorder"); + vcd_recorder_start(); + } + SLOG(LOG_DEBUG, TAG_VCD, "[Recorder] Apply device for stream routing"); + } + } + return; +} + int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb interrupt_cb) { if (NULL == audio_cb || NULL == interrupt_cb) { @@ -356,7 +392,10 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb g_is_valid_audio_in = false; } -#if 1 + ret = sound_manager_add_device_connection_changed_cb(SOUND_DEVICE_IO_DIRECTION_IN_MASK, __device_connection_changed_cb, NULL, &g_device_id); + if (0 != ret) + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to add device connection changed callback"); + if (0 != sound_manager_create_stream_information_internal(SOUND_STREAM_TYPE_VOICE_RECOGNITION_SERVICE, __recorder_focus_state_cb, NULL, &g_stream_info_h)) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to create stream info"); } else { @@ -366,7 +405,6 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb if (0 != audio_in_set_sound_stream_info(g_audio_h, g_stream_info_h)) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to set stream info"); } -#endif g_audio_cb = audio_cb; g_interrupt_cb = interrupt_cb; @@ -431,11 +469,13 @@ int vcd_recorder_destroy() g_recorder_state = VCD_RECORDER_STATE_READY; } -#if 0 - if (0 != sound_manager_destroy_stream_information(g_stream_info_h)) { - SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to destroy stream info"); - } -#endif + int ret = sound_manager_remove_device_connection_changed_cb(g_device_id); + if (0 != ret) + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to remove device connection changed callback, ret(%d)", ret); + + ret = sound_manager_destroy_stream_information(g_stream_info_h); + if (0 != ret) + SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to destroy stream info, ret(%d)", ret); audio_in_destroy(g_audio_h); -- 2.7.4 From e551afaa66715d6a1d269fd9655a2cbb4a98d7a5 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Wed, 23 Aug 2017 13:46:34 +0900 Subject: [PATCH 15/16] Reduce logs Change-Id: I7774185f1e19d7b7850666fc40d1517ccf44e6af Signed-off-by: sooyeon.kim --- client/vc.c | 300 ++++++++++++++----------------------- client/vc_dbus.c | 228 ++++++++++++++-------------- client/vc_mgr.c | 324 +++++++++++++++------------------------ client/vc_mgr_dbus.c | 374 ++++++++++++++++++++++------------------------ client/vc_setting.c | 137 +++++++---------- client/vc_widget.c | 170 ++++++++------------- client/vc_widget_dbus.c | 162 ++++++++++---------- common/vc_cmd_db.c | 6 +- common/vc_command.c | 63 ++++---- common/vc_config_mgr.c | 29 ++-- common/vc_config_parser.c | 6 +- common/vc_json_parser.c | 2 +- server/vcd_client_data.c | 12 +- server/vcd_dbus.c | 28 ++-- server/vcd_dbus_server.c | 190 ++++++++++------------- server/vcd_engine_agent.c | 17 +-- server/vcd_main.c | 16 +- server/vcd_server.c | 58 +++---- 18 files changed, 893 insertions(+), 1229 deletions(-) diff --git a/client/vc.c b/client/vc.c index 75b930e..e5bb5c6 100644 --- a/client/vc.c +++ b/client/vc.c @@ -239,11 +239,11 @@ static Eina_Bool __notify_auth_changed_cb(void *data) static Eina_Bool __focus_changed_cb(void *data, int type, void *event) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Focus changed"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Focus changed"); int ret; if (ECORE_WL_EVENT_FOCUS_IN == type) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Set foreground"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Set foreground"); ret = vc_dbus_set_foreground(getpid(), true); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to set foreground (true) : %d", ret); @@ -266,7 +266,7 @@ static Eina_Bool __focus_changed_cb(void *data, int type, void *event) ecore_timer_add(0, __notify_auth_changed_cb, NULL); } } else if (ECORE_WL_EVENT_FOCUS_OUT == type) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Set background"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Set background"); ret = vc_dbus_set_foreground(getpid(), false); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to set foreground (false) : %d", ret); @@ -289,11 +289,10 @@ static Eina_Bool __focus_changed_cb(void *data, int type, void *event) ecore_timer_add(0, __notify_auth_changed_cb, NULL); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "===== type(%d) is NOT valid", type); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ type(%d) is NOT valid", type); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, ""); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ECORE_CALLBACK_RENEW; } @@ -307,7 +306,7 @@ int vc_initialize(void) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Initialize"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Initialize"); /* check handle */ if (true == vc_client_is_valid(g_vc)) { @@ -356,8 +355,7 @@ int vc_initialize(void) SLOG(LOG_DEBUG, TAG_VCC, "[Success] pid(%d)", g_vc->handle); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -406,12 +404,11 @@ int vc_deinitialize(void) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Deinitialize"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Deinitialize"); if (false == vc_client_is_valid(g_vc)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NOT initialized"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -451,8 +448,7 @@ int vc_deinitialize(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to close connection"); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -464,7 +460,7 @@ static Eina_Bool __vc_connect_daemon(void *data) return EINA_TRUE; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Connect daemon"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Connect daemon"); /* request initialization */ int ret = -1; @@ -484,8 +480,7 @@ static Eina_Bool __vc_connect_daemon(void *data) vc_client_set_error(g_vc, VC_ERROR_ENGINE_NOT_FOUND); ecore_timer_add(0, __vc_notify_error, g_vc); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return EINA_FALSE; } else if (0 != ret) { @@ -494,8 +489,7 @@ static Eina_Bool __vc_connect_daemon(void *data) vc_client_set_error(g_vc, VC_ERROR_TIMED_OUT); ecore_timer_add(0, __vc_notify_error, g_vc); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return EINA_FALSE; } else { /* Success to connect */ @@ -512,7 +506,7 @@ static Eina_Bool __vc_connect_daemon(void *data) int status = aul_app_get_status(appid); if (STATUS_FOCUS == status) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Set foreground"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Set foreground"); ret = vc_dbus_set_foreground(getpid(), true); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to set foreground (true) : %d", ret); @@ -541,8 +535,7 @@ static Eina_Bool __vc_connect_daemon(void *data) vc_client_set_mgr_pid(g_vc, mgr_pid); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return EINA_FALSE; } @@ -556,28 +549,25 @@ int vc_prepare(void) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Prepare"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Prepare"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_INITIALIZED) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'CREATED'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } g_connect_timer = ecore_timer_add(0, __vc_connect_daemon, NULL); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -591,21 +581,19 @@ int vc_unprepare(void) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Unprepare"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Unprepare"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -614,8 +602,7 @@ int vc_unprepare(void) vc_client_set_client_state(g_vc, VC_STATE_INITIALIZED); ecore_timer_add(0, __vc_notify_state_changed, g_vc); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -629,20 +616,18 @@ int vc_foreach_supported_languages(vc_supported_language_cb callback, void* user return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Foreach Supported Language"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Foreach Supported Language"); if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_PARAMETER; } 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -653,8 +638,7 @@ int vc_foreach_supported_languages(vc_supported_language_cb callback, void* user SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to get languages : %s", __vc_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -669,20 +653,18 @@ int vc_get_current_language(char** language) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Get Current Language"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get Current Language"); if (NULL == language) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_PARAMETER; } 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -693,8 +675,7 @@ int vc_get_current_language(char** language) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to get current languages : %s", __vc_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -708,7 +689,7 @@ int vc_get_state(vc_state_e* state) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Get State"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get State"); if (NULL == state) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); @@ -718,8 +699,7 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -732,8 +712,7 @@ int vc_get_state(vc_state_e* state) default: SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid state"); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -747,7 +726,7 @@ int vc_get_service_state(vc_service_state_e* state) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Get Service State"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get Service State"); if (NULL == state) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); @@ -757,15 +736,13 @@ int vc_get_service_state(vc_service_state_e* state) vc_state_e temp; if (0 != vc_client_get_client_state(g_vc, &temp)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } if (VC_STATE_READY != temp) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -786,8 +763,7 @@ int vc_get_service_state(vc_service_state_e* state) default: SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid state"); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -801,7 +777,7 @@ int vc_get_system_command_list(vc_cmd_list_h* vc_sys_cmd_list) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Get system command list"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get system command list"); if (NULL == vc_sys_cmd_list) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Input parameter is NULL"); @@ -811,16 +787,14 @@ int vc_get_system_command_list(vc_cmd_list_h* vc_sys_cmd_list) 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -829,8 +803,7 @@ int vc_get_system_command_list(vc_cmd_list_h* vc_sys_cmd_list) vc_client_get_service_state(g_vc, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -883,8 +856,7 @@ int vc_get_system_command_list(vc_cmd_list_h* vc_sys_cmd_list) return VC_ERROR_NONE; } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -913,13 +885,12 @@ int vc_is_command_format_supported(vc_cmd_format_e format, bool* support) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Is command format supported"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Is command format supported"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -940,8 +911,7 @@ int vc_is_command_format_supported(vc_cmd_format_e format, bool* support) SLOG(LOG_ERROR, TAG_VCC, "[DEBUG] Format(%d) support(%s)", format, *support ? "true" : "false"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -1022,7 +992,7 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Set Command list"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set Command list"); if (NULL == vc_cmd_list) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); @@ -1032,24 +1002,21 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -1104,8 +1071,7 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) invocation_name = NULL; } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -1119,21 +1085,19 @@ int vc_unset_command_list(int type) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Unset Command list"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Unset Command list"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1163,8 +1127,7 @@ int vc_unset_command_list(int type) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] cmd_type(%d), Fail to delete command list : %s", type, __vc_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -1178,29 +1141,26 @@ int vc_set_command_list_from_file(const char* file_path, int type) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Set Command list from file"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set Command list from file"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -1247,42 +1207,37 @@ int vc_set_command_list_from_file(const char* file_path, int type) invocation_name = NULL; } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } #if 0 int vc_get_exclusive_command_option(bool* value) { - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Get exclusive command"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get exclusive command"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } int ret = vc_client_get_exclusive_cmd(g_vc, value); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to set exclusive option : %d", ret); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -1296,29 +1251,26 @@ int vc_set_exclusive_command_option(bool value) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Set exclusive command"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set exclusive command"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } int ret = vc_client_set_exclusive_cmd(g_vc, value); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to set exclusive option : %d", ret); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -1341,8 +1293,7 @@ int vc_set_exclusive_command_option(bool value) } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -1351,21 +1302,19 @@ int vc_set_exclusive_command_option(bool value) #if 0 int vc_request_start(bool stop_by_silence) { - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request start"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request start"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: client state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1374,8 +1323,7 @@ int vc_request_start(bool stop_by_silence) vc_client_get_service_state(g_vc, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1405,29 +1353,26 @@ int vc_request_start(bool stop_by_silence) } } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } int vc_request_stop(void) { - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request stop"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request stop"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: client state is not 'Ready'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1436,8 +1381,7 @@ int vc_request_stop(void) vc_client_get_service_state(g_vc, &service_state); if (service_state != VC_SERVICE_STATE_RECORDING) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'RECORDING'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1464,29 +1408,26 @@ int vc_request_stop(void) } } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } int vc_request_cancel(void) { - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request cancel Interrupt"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request cancel Interrupt"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'Ready'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1495,8 +1436,7 @@ int vc_request_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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1522,8 +1462,7 @@ int vc_request_cancel(void) } } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } @@ -1668,7 +1607,7 @@ int vc_get_result(vc_result_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Get result"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get result"); if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Client result callback is NULL"); @@ -1706,8 +1645,7 @@ int vc_get_result(vc_result_cb callback, void* user_data) temp_text = NULL; } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -2039,21 +1977,19 @@ int vc_set_invocation_name(const char* name) } vc_state_e state; - SLOG(LOG_DEBUG, TAG_VCC, "===== Set invocation name"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Set invocation 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2068,7 +2004,7 @@ int vc_request_dialog(const char* disp_text, const char* utt_text, bool auto_sta { vc_state_e state; - SLOG(LOG_DEBUG, TAG_VCC, "===== Request dialog"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Request dialog"); if (0 != __vc_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; } @@ -2078,16 +2014,14 @@ int vc_request_dialog(const char* disp_text, const char* utt_text, bool auto_sta 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2096,8 +2030,7 @@ int vc_request_dialog(const char* disp_text, const char* utt_text, bool auto_sta vc_client_get_service_state(g_vc, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2108,8 +2041,7 @@ int vc_request_dialog(const char* disp_text, const char* utt_text, bool auto_sta return VC_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -2319,21 +2251,19 @@ int vc_auth_unset_state_changed_cb(void) int vc_auth_start(void) { - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request start"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request start"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: client state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2342,8 +2272,7 @@ int vc_auth_start(void) vc_client_get_service_state(g_vc, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2391,29 +2320,26 @@ int vc_auth_start(void) } } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } int vc_auth_stop(void) { - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request stop"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request stop"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: client state is not 'Ready'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2422,8 +2348,7 @@ int vc_auth_stop(void) vc_client_get_service_state(g_vc, &service_state); if (service_state != VC_SERVICE_STATE_RECORDING) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'RECORDING'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2469,29 +2394,26 @@ int vc_auth_stop(void) } } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } int vc_auth_cancel(void) { - SLOG(LOG_DEBUG, TAG_VCC, "===== [Client] Request cancel"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Request cancel"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'Ready'"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2500,8 +2422,7 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -2546,8 +2467,7 @@ int vc_auth_cancel(void) } } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return ret; } diff --git a/client/vc_dbus.c b/client/vc_dbus.c index 1836396..6bbfdf0 100644 --- a/client/vc_dbus.c +++ b/client/vc_dbus.c @@ -58,7 +58,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle snprintf(if_name, 64, "%s", VC_CLIENT_SERVICE_INTERFACE); if (dbus_message_is_method_call(msg, if_name, VCD_METHOD_HELLO)) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Get Hello"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Get Hello"); int pid = 0; int response = -1; @@ -70,10 +70,10 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle } if (pid > 0) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc get hello : pid(%d) ", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc get hello : pid(%d) ", pid); response = 1; } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc get hello : invalid pid "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc get hello : invalid pid "); } DBusMessage* reply = NULL; @@ -83,18 +83,17 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle dbus_message_append_args(reply, DBUS_TYPE_INT32, &response, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc get hello : fail to send reply"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc get hello : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc get hello : result(%d)", response); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc get hello : result(%d)", response); dbus_connection_flush(g_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc get hello : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc get hello : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); } /* VCD_METHOD_HELLO */ else if (dbus_message_is_signal(msg, if_name, VCD_METHOD_SET_SERVICE_STATE)) { @@ -106,19 +105,18 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_VCC, "<<<< state changed : %d", state); + SLOG(LOG_DEBUG, TAG_VCC, "@@ state changed : %d", state); __vc_cb_service_state(state); } /* VCD_METHOD_SET_SERVICE_STATE */ else if (dbus_message_is_method_call(msg, if_name, VCD_METHOD_RESULT)) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Get Client Result"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Get Client Result"); __vc_cb_result(); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); } /* VCD_METHOD_RESULT */ else if (dbus_message_is_signal(msg, if_name, VCD_METHOD_SEND_MANAGER_PID)) { @@ -130,14 +128,14 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_VCC, "<<<< manager pid is changed : %d", manager_pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ manager pid is changed : %d", manager_pid); __vc_cb_manager_pid(manager_pid); } /* VCD_METHOD_SEND_MANAGER_PID */ else if (dbus_message_is_signal(msg, if_name, VCD_METHOD_ERROR)) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Get Error"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Get Error"); int reason; int daemon_pid; char* err_msg; @@ -149,19 +147,18 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc Get Error message : Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc Get Error message : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc Get Error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, err_msg); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc Get Error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, err_msg); __vc_cb_error(reason, daemon_pid, err_msg); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); } /* VCD_METHOD_ERROR */ else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Owner Changed"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Owner Changed"); DBusError err; dbus_error_init(&err); /* remove a rule for daemon error */ @@ -175,8 +172,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle dbus_error_free(&err); } __vc_cb_error(VC_ERROR_SERVICE_RESET, -1, "Daemon Reset"); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); } /* NameOwnerChanged */ else { @@ -391,7 +387,7 @@ int vc_dbus_request_hello() VC_METHOD_HELLO); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> Request vc hello : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Request vc hello : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } @@ -435,10 +431,10 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid, int* service_state, int* d VC_METHOD_INITIALIZE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc initialize : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc initialize : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc initialize : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc initialize : pid(%d)", pid); } dbus_message_append_args(msg, @@ -471,7 +467,7 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid, int* service_state, int* d DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -495,12 +491,12 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid, int* service_state, int* d return VC_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc initialize : result = %d mgr = %d service = %d daemon_pid = %d", result, *mgr_pid, *service_state, *daemon_pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc initialize : result = %d mgr = %d service = %d daemon_pid = %d", result, *mgr_pid, *service_state, *daemon_pid); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc initialize : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc initialize : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL "); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -537,10 +533,10 @@ int vc_dbus_request_finalize(int pid) VC_METHOD_FINALIZE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc finalize : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc finalize : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc finalize : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc finalize : pid(%d)", pid); } dbus_message_append_args(msg, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); @@ -562,7 +558,7 @@ int vc_dbus_request_finalize(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -570,12 +566,12 @@ int vc_dbus_request_finalize(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc finalize : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc finalize : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc finalize : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc finalize : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL "); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -598,10 +594,10 @@ int vc_dbus_request_set_exclusive_command(int pid, bool value) VC_METHOD_SET_EXCLUSIVE_CMD); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set exclusive command : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set exclusive command : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set exclusive command : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set exclusive command : pid(%d)", pid); } int temp = value; @@ -631,19 +627,19 @@ int vc_dbus_request_set_exclusive_command(int pid, bool value) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc set exclusive command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set exclusive command : result = %d", result); } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc set exclusive command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set exclusive command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -666,10 +662,10 @@ int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type) VC_METHOD_SET_COMMAND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set command : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set command : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set command : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set command : pid(%d)", pid); } dbus_message_append_args(msg, @@ -697,19 +693,19 @@ int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc set command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set command : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc set command : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -732,10 +728,10 @@ int vc_dbus_request_unset_command(int pid, vc_cmd_type_e cmd_type) VC_METHOD_UNSET_COMMAND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc unset command : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc unset command : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc unset command : pid(%d), type(%d)", pid, cmd_type); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc unset command : pid(%d), type(%d)", pid, cmd_type); } dbus_message_append_args(msg, @@ -763,19 +759,19 @@ int vc_dbus_request_unset_command(int pid, vc_cmd_type_e cmd_type) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc unset command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc unset command : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc unset command : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc unset command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -800,10 +796,10 @@ int vc_dbus_set_foreground(int pid, bool value) VCC_MANAGER_METHOD_SET_FOREGROUND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set foreground to manager : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set foreground to manager : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set foreground to manager : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set foreground to manager : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); } dbus_message_append_args(msg, @@ -826,10 +822,10 @@ int vc_dbus_set_foreground(int pid, bool value) VC_METHOD_SET_FOREGROUND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set foreground to daemon : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set foreground to daemon : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set foreground to daemon : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set foreground to daemon : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); } dbus_message_append_args(msg, @@ -872,10 +868,10 @@ int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, VC_METHOD_DIALOG); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc request dialog to manager : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc request dialog to manager : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc request dialog to manager : client pid(%d), disp_text(%s), utt_text(%s), continuous(%d)", getpid(), disp_text, utt_text, continuous); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc request dialog to manager : client pid(%d), disp_text(%s), utt_text(%s), continuous(%d)", getpid(), disp_text, utt_text, continuous); } dbus_message_append_args(msg, @@ -920,19 +916,19 @@ int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc set command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set command : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc set command : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -959,10 +955,10 @@ int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) VC_METHOD_IS_SYS_COMMAND_VALID); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc is system command valid : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc is system command valid : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc is system command valid : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc is system command valid : pid(%d)", pid); } dbus_message_append_args(msg, @@ -991,7 +987,7 @@ int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -999,12 +995,12 @@ int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) if (0 == result) { *is_sys_cmd_valid = (bool)tmp_sys_cmd; - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc is system command valid : result = %d, is_sys_cmd_valid = %d", result, *is_sys_cmd_valid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc is system command valid : result = %d, is_sys_cmd_valid = %d", result, *is_sys_cmd_valid); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc is system command valid : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc is system command valid : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1026,10 +1022,10 @@ int vc_dbus_request_start(int pid, int silence) VC_METHOD_REQUEST_START); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc start : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc start : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc start : pid(%d), silence(%d)", pid, silence); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc start : pid(%d), silence(%d)", pid, silence); } DBusMessageIter args; @@ -1059,19 +1055,19 @@ int vc_dbus_request_start(int pid, int silence) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc start : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc start : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc start : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc start : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1091,10 +1087,10 @@ int vc_dbus_request_stop(int pid) VC_METHOD_REQUEST_STOP); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc stop : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc stop : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc stop : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc stop : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1121,19 +1117,19 @@ int vc_dbus_request_stop(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc stop : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc stop : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc stop : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc stop : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1153,10 +1149,10 @@ int vc_dbus_request_cancel(int pid) VC_METHOD_REQUEST_CANCEL); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc cancel : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc cancel : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc cancel : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc cancel : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1183,19 +1179,19 @@ int vc_dbus_request_cancel(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc cancel : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc cancel : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc cancel : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc cancel : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1229,10 +1225,10 @@ int vc_dbus_request_auth_enable(int pid, int mgr_pid) VC_METHOD_AUTH_ENABLE); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth enable : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth enable : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth enable : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth enable : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1259,19 +1255,19 @@ int vc_dbus_request_auth_enable(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc auth enable : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth enable : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth enable : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth enable : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1303,10 +1299,10 @@ int vc_dbus_request_auth_disable(int pid, int mgr_pid) VC_METHOD_AUTH_DISABLE); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth disable : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth disable : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth disable : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth disable : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1333,19 +1329,19 @@ int vc_dbus_request_auth_disable(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc auth disable : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth disable : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth disable : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth disable : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1377,10 +1373,10 @@ int vc_dbus_request_auth_start(int pid, int mgr_pid) VC_METHOD_AUTH_START); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth start : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth start : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth start : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth start : pid(%d)", pid); } DBusMessageIter args; @@ -1409,19 +1405,19 @@ int vc_dbus_request_auth_start(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc auth start : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth start : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth start : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth start : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1453,10 +1449,10 @@ int vc_dbus_request_auth_stop(int pid, int mgr_pid) VC_METHOD_AUTH_STOP); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth stop : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth stop : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth stop : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth stop : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1483,19 +1479,19 @@ int vc_dbus_request_auth_stop(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc auth stop : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth stop : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth stop : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth stop : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1527,10 +1523,10 @@ int vc_dbus_request_auth_cancel(int pid, int mgr_pid) VC_METHOD_AUTH_CANCEL); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth cancel : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth cancel : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth cancel : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth cancel : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1557,19 +1553,19 @@ int vc_dbus_request_auth_cancel(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ 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_DEBUG, TAG_VCC, "<<<< vc auth cancel : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth cancel : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth cancel : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth cancel : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 5ac54e5..b8c5458 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -123,11 +123,11 @@ static int __vc_mgr_get_feature_enabled() int vc_mgr_initialize() { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Initialize"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Initialize"); if (0 != __vc_mgr_get_feature_enabled()) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] not supported"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] not supported"); return VC_ERROR_NOT_SUPPORTED; } @@ -172,8 +172,7 @@ int vc_mgr_initialize() SLOG(LOG_DEBUG, TAG_VCM, "[Success] pid(%d)", g_vc_m->handle); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_NONE; } @@ -191,12 +190,11 @@ static void __vc_mgr_internal_unprepare() int vc_mgr_deinitialize() { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Deinitialize"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Deinitialize"); if (false == vc_mgr_client_is_valid(g_vc_m)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] NOT initialized"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -244,8 +242,7 @@ int vc_mgr_deinitialize() SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to close connection"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_NONE; } @@ -267,8 +264,7 @@ static Eina_Bool __vc_mgr_connect_daemon(void *data) vc_mgr_client_set_error(g_vc_m, VC_ERROR_ENGINE_NOT_FOUND); ecore_timer_add(0, __vc_mgr_notify_error, g_vc_m); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return EINA_FALSE; } else if (0 != ret) { @@ -307,15 +303,14 @@ static Eina_Bool __vc_mgr_connect_daemon(void *data) SLOG(LOG_WARN, TAG_VCM, "[WARNING] State changed callback is null"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return EINA_FALSE; } static void __start_prepare_thread(void *data, Ecore_Thread *thread) { - SLOG(LOG_ERROR, TAG_VCM, "===== Start prepare thread"); + SLOG(LOG_ERROR, TAG_VCM, "@@@ Start prepare thread"); int ret = 1, retry_count = 0; /* Send hello */ @@ -354,54 +349,49 @@ static void __start_prepare_thread(void *data, Ecore_Thread *thread) static void __end_prepare_thread(void *data, Ecore_Thread *thread) { - SLOG(LOG_DEBUG, TAG_VCM, "===== End prepare thread"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ End prepare thread"); } int vc_mgr_prepare() { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Prepare"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Prepare"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_INITIALIZED) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'CREATED'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } ecore_thread_run(__start_prepare_thread, __end_prepare_thread, NULL, NULL); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_NONE; } int vc_mgr_unprepare() { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Unprepare"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Unprepare"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -410,28 +400,25 @@ int vc_mgr_unprepare() 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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_NONE; } 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_DEBUG, TAG_VCM, "@@@ [Manager] Foreach Supported Language"); if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_PARAMETER; } 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -442,8 +429,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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_NONE; } @@ -475,7 +461,7 @@ int vc_mgr_get_current_language(char** language) int vc_mgr_get_state(vc_state_e* state) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Get State"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get State"); if (NULL == state) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); @@ -485,8 +471,7 @@ int vc_mgr_get_state(vc_state_e* state) vc_state_e temp; 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -499,15 +484,14 @@ 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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_NONE; } int vc_mgr_get_service_state(vc_service_state_e* state) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Get Service State"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get Service State"); if (NULL == state) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); @@ -543,29 +527,26 @@ 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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_NONE; } int vc_mgr_set_demandable_client_rule(const char* rule) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Set Demandable client rule"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set Demandable client 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -573,8 +554,7 @@ int vc_mgr_set_demandable_client_rule(const char* rule) ret = vc_info_parser_set_demandable_client(rule); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] rule is NOT valid"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -583,8 +563,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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; } @@ -618,13 +597,12 @@ 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_DEBUG, TAG_VCM, "@@@ [Manager] Is command type supported"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -645,29 +623,26 @@ int vc_mgr_is_command_format_supported(vc_cmd_format_e 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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_NONE; } int vc_mgr_enable_command_type(int cmd_type) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Enable Command Type"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Enable Command 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -676,8 +651,7 @@ int vc_mgr_enable_command_type(int cmd_type) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -701,29 +675,26 @@ int vc_mgr_enable_command_type(int cmd_type) } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return ret; } int vc_mgr_disable_command_type(int cmd_type) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Disable Command Type"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Disable Command 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -732,8 +703,7 @@ int vc_mgr_disable_command_type(int cmd_type) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -757,29 +727,26 @@ int vc_mgr_disable_command_type(int cmd_type) } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); 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_DEBUG, TAG_VCM, "@@@ [Manager] Set Command 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -788,8 +755,7 @@ int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -848,15 +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_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return ret; } int vc_mgr_unset_command_list() { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Unset Command list"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Unset Command list"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -897,28 +862,26 @@ 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_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, 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_DEBUG, TAG_VCM, "@@@ [Manager] Set Command list from file"); if (NULL == file_path) { 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_DEBUG, TAG_VCM, "@@@ File path: %s", file_path); } /* check type */ if (VC_COMMAND_TYPE_FOREGROUND > type || VC_COMMAND_TYPE_EXCLUSIVE < type) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid command type: input type is %d", type); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -970,15 +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_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); 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_DEBUG, TAG_VCM, "@@@ [Manager] Set preloaded command list"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1005,14 +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_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return ret; } int vc_mgr_set_audio_type(const char* audio_id) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Set audio type"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set audio type"); if (NULL == audio_id) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); @@ -1022,16 +983,14 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1040,8 +999,7 @@ int vc_mgr_set_audio_type(const char* audio_id) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1071,15 +1029,14 @@ int vc_mgr_set_audio_type(const char* audio_id) } } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return ret; } int vc_mgr_get_audio_type(char** audio_id) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Get audio type"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get audio type"); if (NULL == audio_id) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); @@ -1089,16 +1046,14 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1107,8 +1062,7 @@ int vc_mgr_get_audio_type(char** audio_id) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1154,21 +1108,19 @@ 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_DEBUG, TAG_VCM, "@@@ [Manager] Foreach current commands"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1177,15 +1129,13 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } if (NULL == vc_cmd_list) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid Parameter"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -1310,8 +1260,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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; } @@ -1345,29 +1294,26 @@ 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_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; } int vc_mgr_set_recognition_mode(vc_recognition_mode_e mode) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Set recognition mode = %d", mode); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set recognition mode = %d", 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1376,8 +1322,7 @@ int vc_mgr_set_recognition_mode(vc_recognition_mode_e mode) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1395,13 +1340,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_DEBUG, 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_DEBUG, TAG_VCM, "@@@ [Manager] Set private data"); if (NULL == key) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); @@ -1411,16 +1356,14 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1429,8 +1372,7 @@ int vc_mgr_set_private_data(const char* key, const char* data) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1455,15 +1397,14 @@ int vc_mgr_set_private_data(const char* key, const char* data) SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set domain"); } } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; } int vc_mgr_get_private_data(const char* key, char** data) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Get private data"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get private data"); if (NULL == key || NULL == data) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); @@ -1473,16 +1414,14 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1491,8 +1430,7 @@ int vc_mgr_get_private_data(const char* key, char** data) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1526,15 +1464,14 @@ int vc_mgr_get_private_data(const char* key, char** data) temp = NULL; } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; } int vc_mgr_set_domain(const char* domain) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Set domain"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Set domain"); if (NULL == domain) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); @@ -1544,16 +1481,14 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1562,8 +1497,7 @@ int vc_mgr_set_domain(const char* domain) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1588,15 +1522,14 @@ int vc_mgr_set_domain(const char* domain) SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] Set domain"); } } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; } int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] do action"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] do action"); if (NULL == send_event) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); @@ -1606,16 +1539,14 @@ 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1624,8 +1555,7 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1650,29 +1580,26 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) SLOG(LOG_DEBUG, TAG_VCM, "[SUCCESS] do action"); } } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; } int vc_mgr_start(bool exclusive_command_option) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Request start"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request start"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1681,8 +1608,7 @@ int vc_mgr_start(bool exclusive_command_option) vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1739,29 +1665,26 @@ 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_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return ret; } int vc_mgr_stop() { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Request stop"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request stop"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: client state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1770,8 +1693,7 @@ int vc_mgr_stop() vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state != VC_SERVICE_STATE_RECORDING) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'RECORDING'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1815,29 +1737,26 @@ int vc_mgr_stop() } } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return ret; } int vc_mgr_cancel() { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Request cancel"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Request cancel"); 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: client state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1846,8 +1765,7 @@ int vc_mgr_cancel() vc_mgr_client_get_service_state(g_vc_m, &service_state); if (service_state == VC_SERVICE_STATE_NONE) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1891,8 +1809,7 @@ int vc_mgr_cancel() vc_mgr_client_set_exclusive_command(g_vc_m, false); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return ret; } @@ -1989,7 +1906,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_DEBUG, TAG_VCM, "@@@ [Manager] Select result"); /* Do not check state for 'restart continusly' mode */ @@ -2001,8 +1918,7 @@ 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 continously'"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } } @@ -2049,8 +1965,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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return 0; } @@ -2383,7 +2298,7 @@ int vc_mgr_unset_pre_result_cb() int vc_mgr_get_error_message(char** err_msg) { - SLOG(LOG_DEBUG, TAG_VCM, "===== [Manager] Get error message"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ [Manager] Get error message"); if (NULL == err_msg) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] invalid parameter"); @@ -2401,8 +2316,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, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return ret; } diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c index dde3532..7a005e0 100644 --- a/client/vc_mgr_dbus.c +++ b/client/vc_mgr_dbus.c @@ -88,7 +88,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd snprintf(if_name, 64, "%s", VC_MANAGER_SERVICE_INTERFACE); if (dbus_message_is_method_call(msg, if_name, VCD_MANAGER_METHOD_HELLO)) { - SLOG(LOG_DEBUG, TAG_VCM, "===== Get Hello"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get Hello"); int pid = 0; int response = -1; @@ -99,10 +99,10 @@ 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 hello : pid(%d) ", pid); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr get hello : pid(%d) ", pid); response = 1; } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr get hello : invalid pid "); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get hello : invalid pid "); } DBusMessage *reply = NULL; @@ -112,18 +112,17 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_message_append_args(reply, DBUS_TYPE_INT32, &response, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc get hello : fail to send reply"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc get hello : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc get hello : result(%d)", response); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc get hello : result(%d)", response); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr get hello : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get hello : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_METHOD_HELLO */ else if (dbus_message_is_signal(msg, if_name, VCD_MANAGER_METHOD_SET_VOLUME)) { @@ -137,8 +136,8 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } if (10 == g_volume_count) { - SLOG(LOG_DEBUG, TAG_VCM, "===== Set volume"); - SLOG(LOG_DEBUG, TAG_VCM, "<<<< vc mgr set volume : volume(%f)", volume); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Set volume"); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set volume : volume(%f)", volume); g_volume_count = 0; } @@ -156,37 +155,35 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_VCM, "<<<< state changed : %d", state); + SLOG(LOG_DEBUG, TAG_VCM, "@@ state changed : %d", state); __vc_mgr_cb_service_state(state); } /* 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_DEBUG, TAG_VCM, "@@@ Get Speech detected"); __vc_mgr_cb_speech_detected(); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Get All Result"); int result_type = 0; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &result_type, DBUS_TYPE_INVALID); __vc_mgr_cb_all_result((vc_result_type_e)result_type); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Get Pre Result"); int event; char* pre_result = NULL; @@ -196,22 +193,20 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd __vc_mgr_cb_pre_result((vc_pre_result_event_e)event, pre_result); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_PRE_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_DEBUG, TAG_VCM, "@@@ Get System Result"); __vc_mgr_cb_system_result(); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Set foreground"); int pid = 0; int value = 0; @@ -224,15 +219,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_DEBUG, 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, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + 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_DEBUG, TAG_VCM, "@@@ Request Dialog"); int pid = -1; char* disp_text = NULL; char* utt_text = NULL; @@ -252,13 +246,12 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd __vc_mgr_cb_dialog(pid, disp_text, utt_text, (bool)tmp_continue); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_ALL_RESULT */ else if (dbus_message_is_signal(msg, if_name, VCD_MANAGER_METHOD_ERROR)) { - SLOG(LOG_DEBUG, TAG_VCM, "===== Get Error"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Get Error"); int reason; int daemon_pid; char* err_msg = NULL; @@ -270,14 +263,14 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr Get Error message : Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr Get Error message : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { char* temp_msg = NULL; 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); __vc_mgr_cb_error(reason, daemon_pid, temp_msg); if (NULL != temp_msg) { free(temp_msg); @@ -285,12 +278,11 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd } } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Get request set private data"); int pid = 0; int ret = -1; char* key = NULL; @@ -308,10 +300,10 @@ 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_DEBUG, TAG_VCM, "@@ vc mgr get request set private data : pid(%d) ", pid); ret = __vc_mgr_cb_private_data_set(key, data); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr get requset set private data : invalid pid "); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get requset set private data : invalid pid "); } DBusMessage *reply = NULL; @@ -321,22 +313,21 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc get request set private data : fail to send reply"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc get request set private data : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc get request set private data : result(%d)", ret); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc get request set private data : result(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr get request set private data : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get request set private data : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Get request get private data"); int pid = 0; int ret = -1; char* key = NULL; @@ -353,10 +344,10 @@ 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_DEBUG, 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 "); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get request get private data : invalid pid "); } DBusMessage *reply = NULL; @@ -366,25 +357,24 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_STRING, &temp, DBUS_TYPE_INVALID); 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"); + 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_DEBUG, TAG_VCM, "@@ vc get request get private data : result(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr get request get private data : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr get request get private data : fail to create reply message"); } if (NULL != temp) free(temp); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VCD_MANAGER_METHOD_GET_PRIVATE_DATA */ /* 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_DEBUG, TAG_VCM, "@@@ Get request auth enable"); int pid; int ret = 0; @@ -393,10 +383,10 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr request auth enable : Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth enable : pid(%d)", pid); ret = __vc_mgr_request_auth_enable(pid); } @@ -408,21 +398,20 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth enable : fail to send reply"); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth enable : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth enable : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth enable : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Get request auth disable"); int pid; int ret = 0; @@ -431,10 +420,10 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr request auth disable : Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth disable : pid(%d)", pid); ret = __vc_mgr_request_auth_disable(pid); } @@ -446,21 +435,20 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth disable : fail to send reply"); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth disable : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth disable : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth disable : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Get request auth start"); int pid; int ret = 0; @@ -469,10 +457,10 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr request auth start : Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth start : pid(%d)", pid); ret = __vc_mgr_request_auth_start(pid); } @@ -484,21 +472,20 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth start : fail to send reply"); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth start : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth start : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth start : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Get request auth stop"); int pid; int ret = 0; @@ -507,10 +494,10 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr request auth stop : Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth stop : pid(%d)", pid); ret = __vc_mgr_request_auth_stop(pid); } @@ -522,21 +509,20 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth stop : fail to send reply"); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth stop : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth stop : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth stop : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* 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_DEBUG, TAG_VCM, "@@@ Get request auth cancel"); int pid; int ret = 0; @@ -545,10 +531,10 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr request auth cancel : Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "@@ vc mgr request auth cancel : pid(%d)", pid); ret = __vc_mgr_request_auth_cancel(pid); } @@ -560,21 +546,20 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_m_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc request auth cancel : fail to send reply"); + 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_DEBUG, TAG_VCM, "@@ vc request auth cancel : ret(%d)", ret); dbus_connection_flush(g_m_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth cancel : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr request auth cancel : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* VC_METHOD_AUTH_CANCEL */ else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) { - SLOG(LOG_DEBUG, TAG_VCM, "===== Owner Changed"); + SLOG(LOG_DEBUG, TAG_VCM, "@@@ Owner Changed"); /* remove a rule for daemon error */ DBusError err; /* initialise the error value */ @@ -589,8 +574,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_error_free(&err); } __vc_mgr_cb_error(VC_ERROR_SERVICE_RESET, -1, "Daemon Reset"); - SLOG(LOG_DEBUG, TAG_VCM, "====="); - SLOG(LOG_DEBUG, TAG_VCM, " "); + SLOG(LOG_DEBUG, TAG_VCM, "@@@"); } /* NameOwnerChanged */ else { @@ -789,7 +773,7 @@ int vc_mgr_dbus_request_hello() VC_METHOD_HELLO); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> Request vc hello : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Request vc hello : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } @@ -873,10 +857,10 @@ int vc_mgr_dbus_request_initialize(int pid, int* service_state, int* foreground, VC_MANAGER_METHOD_INITIALIZE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr initialize : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr initialize : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr initialize : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr initialize : pid(%d)", pid); } dbus_message_append_args(msg, @@ -906,7 +890,7 @@ int vc_mgr_dbus_request_initialize(int pid, int* service_state, int* foreground, DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCM, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -929,13 +913,13 @@ int vc_mgr_dbus_request_initialize(int pid, int* service_state, int* foreground, dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_VCM, "<<<< vc mgr initialize : result = %d, service state = %d, foreground = %d, daemon_pid = %d", + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr initialize : result = %d, service state = %d, foreground = %d, daemon_pid = %d", result, *service_state, *foreground, *daemon_pid); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr initialize : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr initialize : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result message is NULL "); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -985,10 +969,10 @@ int vc_mgr_dbus_request_finalize(int pid) VC_MANAGER_METHOD_FINALIZE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr finalize : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc mgr finalize : pid(%d)", pid); } dbus_message_append_args(msg, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); @@ -1010,7 +994,7 @@ int vc_mgr_dbus_request_finalize(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCM, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -1018,12 +1002,12 @@ 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_DEBUG, TAG_VCM, "@@ vc mgr finalize : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr finalize : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr finalize : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result message is NULL "); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1061,10 +1045,10 @@ int vc_mgr_dbus_request_set_command(int pid) VC_MANAGER_METHOD_SET_COMMAND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set command : Fail to make message"); + 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_DEBUG, TAG_VCM, "@@ vc mgr set command : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1088,19 +1072,19 @@ int vc_mgr_dbus_request_set_command(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc mgr set command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set command : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr set command : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1138,10 +1122,10 @@ int vc_mgr_dbus_request_unset_command(int pid) VC_MANAGER_METHOD_UNSET_COMMAND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr unset command : Fail to make message"); + 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_DEBUG, TAG_VCM, "@@ vc mgr unset command : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1165,19 +1149,19 @@ int vc_mgr_dbus_request_unset_command(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc mgr unset command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr unset command : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr unset command : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr unset command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1215,10 +1199,10 @@ int vc_mgr_dbus_request_demandable_client(int pid) VC_MANAGER_METHOD_SET_DEMANDABLE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set demandable client : Fail to make message"); + 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_DEBUG, TAG_VCM, "@@ vc mgr set demandable client : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1242,19 +1226,19 @@ int vc_mgr_dbus_request_demandable_client(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc mgr set demandable client : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set demandable client : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr set demandable client : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr set demandable client : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCM, "@@ Result message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1293,10 +1277,10 @@ int vc_mgr_dbus_request_set_audio_type(int pid, const char* audio_type) VC_MANAGER_METHOD_SET_AUDIO_TYPE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set audio type : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc mgr set audio type : pid(%d), audio type(%s)", pid, audio_type); } dbus_message_append_args(msg, @@ -1321,19 +1305,19 @@ int vc_mgr_dbus_request_set_audio_type(int pid, const char* audio_type) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc mgr set audio type : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set audio type : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr set audio type : result = %d", result); + 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_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1372,10 +1356,10 @@ int vc_mgr_dbus_request_get_audio_type(int pid, char** audio_type) VC_MANAGER_METHOD_GET_AUDIO_TYPE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr get audio type : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc mgr get audio type : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1402,7 +1386,7 @@ int vc_mgr_dbus_request_get_audio_type(int pid, char** audio_type) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCM, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -1412,12 +1396,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_DEBUG, 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); + 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_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1437,10 +1421,10 @@ int vc_mgr_dbus_request_set_private_data(int pid, const char* key, const char* d VC_MANAGER_METHOD_SET_PRIVATE_DATA); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc set private data : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc set private data : pid(%d), data(%s)", pid, data); } dbus_message_append_args(msg, @@ -1469,19 +1453,19 @@ int vc_mgr_dbus_request_set_private_data(int pid, const char* key, const char* d DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc set private data : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc set private data : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc set private data : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc set private data : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1501,10 +1485,10 @@ int vc_mgr_dbus_request_get_private_data(int pid, const char* key, char** data) VC_MANAGER_METHOD_GET_PRIVATE_DATA); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr get private data : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc mgr get private data : pid(%d), key(%s)", pid, key); } dbus_message_append_args(msg, @@ -1534,7 +1518,7 @@ int vc_mgr_dbus_request_get_private_data(int pid, const char* key, char** data) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCM, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -1544,13 +1528,13 @@ int vc_mgr_dbus_request_get_private_data(int pid, const char* key, char** data) if (NULL != data && NULL != temp) { *data = strdup(temp); - SLOG(LOG_DEBUG, TAG_VCM, "<<<< vc mgr get private data : result = %d private data = %s", result, *data); + SLOG(LOG_DEBUG, 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); + 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_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1589,10 +1573,10 @@ int vc_mgr_dbus_request_set_client_info(int pid) VC_MANAGER_METHOD_SET_CLIENT_INFO); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr set client info : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc mgr set client info : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1616,19 +1600,19 @@ int vc_mgr_dbus_request_set_client_info(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc mgr set client info : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr set client info : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr set client info : result = %d", result); + 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_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1648,10 +1632,10 @@ int vc_mgr_dbus_request_set_domain(int pid, const char* domain) VC_MANAGER_METHOD_SET_DOMAIN); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc set domain : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc set domain : pid(%d), domain(%s)", pid, domain); } dbus_message_append_args(msg, @@ -1679,19 +1663,19 @@ int vc_mgr_dbus_request_set_domain(int pid, const char* domain) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc set domain : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc set domain : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc set domain : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc set domain : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1711,10 +1695,10 @@ int vc_mgr_dbus_request_do_action(int pid, vc_send_event_type_e type, char* send VC_MANAGER_METHOD_DO_ACTION); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc set domain : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc set domain : pid(%d), type(%d), send_event(%s)", pid, type, send_event); } dbus_message_append_args(msg, @@ -1767,10 +1751,10 @@ int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_comm VC_MANAGER_METHOD_START); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr start : Fail to make message "); + 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_DEBUG, 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); } @@ -1801,19 +1785,19 @@ int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_comm DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc mgr start : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr start : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr start : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr start : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1852,10 +1836,10 @@ int vc_mgr_dbus_request_stop(int pid) VC_MANAGER_METHOD_STOP); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr stop : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc mgr stop : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1879,19 +1863,19 @@ int vc_mgr_dbus_request_stop(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc mgr stop : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc mgr stop : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr stop : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc mgr stop : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1930,10 +1914,10 @@ int vc_mgr_dbus_request_cancel(int pid) VC_MANAGER_METHOD_CANCEL); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc cancel : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc cancel : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1957,19 +1941,19 @@ int vc_mgr_dbus_request_cancel(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc cancel : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc cancel : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc cancel : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc cancel : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -2008,10 +1992,10 @@ int vc_mgr_dbus_request_enable_command_type(int pid, int cmd_type) 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 "); + 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_DEBUG, TAG_VCM, "@@ vc enable command type : pid(%d) type(%d)", pid, cmd_type); } dbus_message_append_args(msg, @@ -2036,19 +2020,19 @@ int vc_mgr_dbus_request_enable_command_type(int pid, int cmd_type) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc enable command type : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc enable command type : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc enable command type : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc enable command type : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -2087,10 +2071,10 @@ int vc_mgr_dbus_request_disable_command_type(int pid, int cmd_type) 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 "); + 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_DEBUG, TAG_VCM, "@@ vc disable command type : pid(%d) type(%d)", pid, cmd_type); } dbus_message_append_args(msg, @@ -2115,19 +2099,19 @@ int vc_mgr_dbus_request_disable_command_type(int pid, int cmd_type) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCM, "<<<< Get arguments error (%s)", err.message); + 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_DEBUG, TAG_VCM, "<<<< vc disable command type : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCM, "@@ vc disable command type : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCM, "<<<< vc disable command type : result = %d", result); + SLOG(LOG_ERROR, TAG_VCM, "@@ vc disable command type : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCM, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCM, "@@ Result Message is NULL"); vc_mgr_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -2212,10 +2196,10 @@ int vc_mgr_dbus_send_result_selection(int pid) VC_MANAGER_METHOD_RESULT_SELECTION); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCM, ">>>> vc result selection : Fail to make message "); + 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_DEBUG, TAG_VCM, "@@ vc result selection : pid(%d)", pid); } dbus_message_append_args(msg, diff --git a/client/vc_setting.c b/client/vc_setting.c index 3f35bb3..82826a0 100644 --- a/client/vc_setting.c +++ b/client/vc_setting.c @@ -74,28 +74,25 @@ void __vc_setting_enabled_changed_cb(bool enabled) int vc_setting_initialize(void) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Initialize VC Setting"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_NONE; } 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); vc_config_mgr_finalize(getpid() + VC_SETTING_CONFIG_HANDLE); return VC_ERROR_OPERATION_FAILED; } @@ -104,20 +101,18 @@ int vc_setting_initialize(void) g_state = VC_SETTING_STATE_READY; - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_NONE; } int vc_setting_deinitialize() { - SLOG(LOG_DEBUG, TAG_VCS, "===== Deinitialize VC Setting"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -126,27 +121,24 @@ int vc_setting_deinitialize() g_state = VC_SETTING_STATE_NONE; - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_NONE; } int vc_setting_foreach_supported_languages(vc_setting_supported_language_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Foreach supported languages"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -157,27 +149,24 @@ 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, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return ret; } int vc_setting_get_language(char** language) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Get default 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (NULL == language) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -188,27 +177,24 @@ 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, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return ret; } int vc_setting_set_language(const char* language) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Set default 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (NULL == language) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -219,27 +205,24 @@ int vc_setting_set_language(const char* language) SLOG(LOG_DEBUG, TAG_VCS, "[SUCCESS] Set default language"); } - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return ret; } int vc_setting_set_auto_language(bool value) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Set auto voice"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (value != true && value != false) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Invalid value"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -250,27 +233,24 @@ 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, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return ret; } int vc_setting_get_auto_language(bool* value) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Get auto language"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (NULL == value) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -281,27 +261,24 @@ 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, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return 0; } int vc_setting_set_enabled(bool value) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Set service enabled"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (value != true && value != false) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Invalid value"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -312,27 +289,24 @@ 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, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return ret; } int vc_setting_get_enabled(bool* value) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Get service enabled"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (NULL == value) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } @@ -344,102 +318,91 @@ 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, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return ret; } int vc_setting_set_enabled_changed_cb(vc_setting_enabled_changed_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Set service enabled callback"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } g_callback = callback; g_user_data = user_data; - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return 0; } int vc_setting_unset_enabled_changed_cb() { - SLOG(LOG_DEBUG, TAG_VCS, "===== Unset service enabled callback"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } g_callback = NULL; g_user_data = NULL; - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return 0; } int vc_setting_set_current_language_changed_cb(vc_setting_current_language_changed_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCS, "===== Set current language changed callback"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCS, "[ERROR] Param is NULL"); - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_PARAMETER; } g_lang_callback = callback; g_lang_user_data = user_data; - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return 0; } int vc_setting_unset_current_language_changed_cb() { - SLOG(LOG_DEBUG, TAG_VCS, "===== Unset current language changed callback"); + 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, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return VC_ERROR_INVALID_STATE; } g_lang_callback = NULL; g_lang_user_data = NULL; - SLOG(LOG_DEBUG, TAG_VCS, "====="); - SLOG(LOG_DEBUG, TAG_VCS, " "); + SLOG(LOG_DEBUG, TAG_VCS, "@@@"); return 0; } diff --git a/client/vc_widget.c b/client/vc_widget.c index 201be60..178f360 100644 --- a/client/vc_widget.c +++ b/client/vc_widget.c @@ -113,7 +113,7 @@ static void __vc_widget_lang_changed_cb(const char* before_lang, const char* cur int vc_widget_initialize(vc_h* vc_w) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Initialize"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Initialize"); if (NULL == vc_w) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); @@ -161,8 +161,7 @@ int vc_widget_initialize(vc_h* vc_w) SLOG(LOG_DEBUG, TAG_VCW, "[Success] uid(%d)", (*vc_w)->handle); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } @@ -192,12 +191,11 @@ static void __vc_widget_internal_unprepare(vc_h vc_w) int vc_widget_deinitialize(vc_h vc_w) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Deinitialize"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Deinitialize"); if (false == vc_widget_client_is_valid(vc_w)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] NOT initialized"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -243,34 +241,33 @@ int vc_widget_deinitialize(vc_h vc_w) } } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } static Eina_Bool __focus_changed_cb(void *data, int type, void *event) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Focus changed"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Focus changed"); int ret; if (ECORE_WL_EVENT_FOCUS_IN == type) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Set foreground"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Set foreground"); ret = vc_widget_dbus_set_foreground(getpid(), true); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to set foreground (true) : %d", ret); } } else if (ECORE_WL_EVENT_FOCUS_OUT == type) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Set background"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Set background"); ret = vc_widget_dbus_set_foreground(getpid(), false); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to set foreground (false) : %d", ret); } } else { - SLOG(LOG_DEBUG, TAG_VCW, "===== type(%d) is NOT valid", type); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ type(%d) is NOT valid", type); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); SLOG(LOG_DEBUG, TAG_VCW, ""); return ECORE_CALLBACK_RENEW; @@ -285,7 +282,7 @@ static Eina_Bool __vc_widget_connect_daemon(void *data) return EINA_TRUE; } - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Connect daemon"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Connect daemon"); vc_widget_s* widget = widget_get(vc_w); if (NULL != widget) { @@ -303,8 +300,7 @@ static Eina_Bool __vc_widget_connect_daemon(void *data) vc_widget_client_set_error(vc_w, VC_ERROR_ENGINE_NOT_FOUND); ecore_timer_add(0, __vc_widget_notify_error, vc_w); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return EINA_FALSE; } else if (VC_ERROR_INVALID_PARAMETER == ret) { @@ -315,8 +311,7 @@ static Eina_Bool __vc_widget_connect_daemon(void *data) vc_widget_client_set_error(vc_w, VC_ERROR_TIMED_OUT); ecore_timer_add(0, __vc_widget_notify_error, vc_w); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return EINA_FALSE; } @@ -332,7 +327,7 @@ static Eina_Bool __vc_widget_connect_daemon(void *data) int status = aul_app_get_status(appid); if (status == STATUS_FOCUS) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Set foreground"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Set foreground"); ret = vc_widget_dbus_set_foreground(getpid(), true); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to set foreground (true) : %d", ret); @@ -342,65 +337,58 @@ static Eina_Bool __vc_widget_connect_daemon(void *data) vc_widget_client_set_state(vc_w, VC_STATE_READY); ecore_timer_add(0, __vc_widget_notify_state_changed, vc_w); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return EINA_FALSE; } int vc_widget_prepare(vc_h vc_w) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Prepare"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Prepare"); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_INITIALIZED) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } vc_widget_s* widget = widget_get(vc_w); if (NULL == widget) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to get widget handle"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } widget->conn_timer = ecore_timer_add(0, __vc_widget_connect_daemon, (void*)vc_w); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } int vc_widget_unprepare(vc_h vc_w) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Unprepare"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Unprepare"); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -409,29 +397,26 @@ int vc_widget_unprepare(vc_h vc_w) vc_widget_client_set_state(vc_w, VC_STATE_INITIALIZED); ecore_timer_add(0, __vc_widget_notify_state_changed, vc_w); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } int vc_widget_enable_asr_result(vc_h vc_w, bool enable) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Enable asr result"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Enable asr result"); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -458,28 +443,25 @@ int vc_widget_enable_asr_result(vc_h vc_w, bool enable) vc_widget_client_set_asr_result_enabled(vc_w, enable); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return ret; } int vc_widget_foreach_supported_languages(vc_h vc_w, vc_supported_language_cb callback, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Foreach Supported Language"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Foreach Supported Language"); if (NULL == callback) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_PARAMETER; } vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -490,28 +472,25 @@ int vc_widget_foreach_supported_languages(vc_h vc_w, vc_supported_language_cb ca SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to get languages : %s", __vc_widget_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } int vc_widget_get_current_language(vc_h vc_w, char** language) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Get Current Language"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Get Current Language"); if (NULL == language) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_PARAMETER; } vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -522,15 +501,14 @@ int vc_widget_get_current_language(vc_h vc_w, char** language) SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to get current languages : %s", __vc_widget_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return ret; } int vc_widget_get_state(vc_h vc_w, vc_state_e* state) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Get State"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Get State"); if (NULL == state) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); @@ -540,8 +518,7 @@ int vc_widget_get_state(vc_h vc_w, vc_state_e* state) vc_state_e temp; if (0 != vc_widget_client_get_state(vc_w, &temp)) { SLOG(LOG_DEBUG, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -554,15 +531,14 @@ int vc_widget_get_state(vc_h vc_w, vc_state_e* state) default: SLOG(LOG_ERROR, TAG_VCW, "Invalid state"); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } int vc_widget_get_service_state(vc_h vc_w, vc_service_state_e* state) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Get Service State"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Get Service State"); if (NULL == state) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); @@ -572,15 +548,13 @@ int vc_widget_get_service_state(vc_h vc_w, vc_service_state_e* state) vc_state_e temp; if (0 != vc_widget_client_get_state(vc_w, &temp)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } if (temp != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -601,29 +575,26 @@ int vc_widget_get_service_state(vc_h vc_w, vc_service_state_e* state) default: SLOG(LOG_ERROR, TAG_VCW, "Invalid service state"); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } int vc_widget_set_foreground(vc_h vc_w, bool value) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Set foreground state"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Set foreground state"); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -634,21 +605,19 @@ int vc_widget_set_foreground(vc_h vc_w, bool value) SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to set foreground : %s", __vc_widget_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } int vc_widget_is_format_supported(vc_h vc_w, vc_cmd_format_e format, bool* support) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Is command type supported"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Is command type supported"); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -669,8 +638,7 @@ int vc_widget_is_format_supported(vc_h vc_w, vc_cmd_format_e format, bool* suppo SLOG(LOG_ERROR, TAG_VCW, "[DEBUG] Format(%d) support(%s)", format, *support ? "true" : "false"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } @@ -697,21 +665,19 @@ int vc_widget_is_format_supported(vc_h vc_w, vc_cmd_format_e format, bool* suppo #if 0 int vc_widget_start(bool stop_by_silence, vc_cmd_group_h vc_group) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Start"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Start"); vc_state_e state; if (0 != vc_widget_client_get_state(g_vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -720,8 +686,7 @@ int vc_widget_start(bool stop_by_silence, vc_cmd_group_h vc_group) vc_widget_client_get_service_state(g_vc_w, &service_state); if (service_state != VC_SERVICE_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -762,8 +727,7 @@ int vc_widget_start(bool stop_by_silence, vc_cmd_group_h vc_group) } while (0 != ret); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_NONE; } @@ -788,21 +752,19 @@ int vc_widget_start(bool stop_by_silence, vc_cmd_group_h vc_group) #if 0 int vc_widget_stop() { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Stop"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Stop"); vc_state_e state; if (0 != vc_widget_client_get_state(g_vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -811,8 +773,7 @@ int vc_widget_stop() vc_widget_client_get_service_state(g_vc_w, &service_state); if (service_state != VC_SERVICE_STATE_RECORDING) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: service state is not 'RECORDING'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -853,21 +814,19 @@ int vc_widget_stop() int vc_widget_cancel(vc_h vc_w) { - SLOG(LOG_DEBUG, TAG_VCW, "===== [Widget] Cancel Recognition"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Cancel Recognition"); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -876,8 +835,7 @@ int vc_widget_cancel(vc_h vc_w) vc_widget_client_get_service_state(vc_w, &service_state); if (service_state != VC_SERVICE_STATE_RECORDING && service_state != VC_SERVICE_STATE_PROCESSING) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: service state is not 'RECORDING' or 'PROCESSING'"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -902,7 +860,7 @@ int vc_widget_cancel(vc_h vc_w) } } while (0 != ret); - SLOG(LOG_DEBUG, TAG_VCW, "====="); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return 0; } diff --git a/client/vc_widget_dbus.c b/client/vc_widget_dbus.c index 18dbe2c..0ef7019 100644 --- a/client/vc_widget_dbus.c +++ b/client/vc_widget_dbus.c @@ -62,7 +62,7 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd snprintf(if_name, 64, "%s", VC_WIDGET_SERVICE_INTERFACE); if (dbus_message_is_method_call(msg, if_name, VCD_WIDGET_METHOD_HELLO)) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Get widget hello"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Get widget hello"); int pid = 0; int response = -1; @@ -74,10 +74,10 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd } if (pid > 0) { - SLOG(LOG_DEBUG, TAG_VCW, "<<<< vc widget get hello : pid(%d) ", pid); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget get hello : pid(%d) ", pid); response = 1; } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget get hello : invalid pid "); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget get hello : invalid pid "); } DBusMessage* reply = NULL; @@ -87,18 +87,17 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_message_append_args(reply, DBUS_TYPE_INT32, &response, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_w_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget get hello : fail to send reply"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget get hello : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget get hello : result(%d)", response); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget get hello : result(%d)", response); dbus_connection_flush(g_w_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget get hello : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget get hello : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_WIDGET_METHOD_HELLO */ else if (dbus_message_is_signal(msg, if_name, VCD_WIDGET_METHOD_SET_SERVICE_STATE)) { @@ -110,14 +109,14 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_VCW, "<<<< service state changed : %d", state); + SLOG(LOG_DEBUG, TAG_VCW, "@@ service state changed : %d", state); __vc_widget_cb_service_state(state); } /* VCD_WIDGET_METHOD_SET_SERVICE_STATE */ else if (dbus_message_is_method_call(msg, if_name, VCD_WIDGET_METHOD_SHOW_TOOLTIP)) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Show / Hide tooltip"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Show / Hide tooltip"); int pid = 0; int show = 0; @@ -132,18 +131,17 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd } if (pid > 0) { - SLOG(LOG_DEBUG, TAG_VCW, "<<<< vc widget show tooltip : pid(%d), show(%d)", pid, show); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget show tooltip : pid(%d), show(%d)", pid, show); __vc_widget_cb_show_tooltip(pid, (bool)show); } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget show tooltip : invalid pid"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget show tooltip : invalid pid"); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_WIDGET_METHOD_SHOW_TOOLTIP */ else if (dbus_message_is_method_call(msg, if_name, VCD_WIDGET_METHOD_RESULT)) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Get widget result"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Get widget result"); __vc_widget_cb_result(); @@ -152,24 +150,23 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (NULL != reply) { if (!dbus_connection_send(g_w_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget get result : fail to send reply"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget get result : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget get result"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget get result"); dbus_connection_flush(g_w_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget get result : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget get result : fail to create reply message"); */ - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_WIDGET_METHOD_RESULT */ else if (dbus_message_is_method_call(msg, if_name, VCD_WIDGET_METHOD_ASR_RESULT)) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Get widget asr result"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Get widget asr result"); int ret = 0; if (false == __vc_widget_cb_asr_result()) ret = 0; @@ -180,23 +177,22 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (NULL != reply) { dbus_message_append_args(reply, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_w_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget get asr result : fail to send reply"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget get asr result : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget get asr result"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget get asr result"); dbus_connection_flush(g_w_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget asr get result : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget asr get result : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_WIDGET_METHOD_ASR_RESULT */ else if (dbus_message_is_signal(msg, if_name, VCD_WIDGET_METHOD_ERROR)) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Get widget error"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Get widget error"); int reason; int daemon_pid; char* err_msg; @@ -208,10 +204,10 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget get error message : Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget get error message : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCW, "<<<< vc widget get error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, err_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); } @@ -220,23 +216,22 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd if (NULL != reply) { if (!dbus_connection_send(g_w_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget error message : fail to send reply"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget error message : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget error message"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget error message"); dbus_connection_flush(g_w_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget error message : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget error message : fail to create reply message"); } */ - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* VCD_WIDGET_METHOD_ERROR */ else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) { - SLOG(LOG_DEBUG, TAG_VCW, "===== Owner Changed"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Owner Changed"); DBusError err; dbus_error_init(&err); @@ -251,8 +246,7 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd dbus_error_free(&err); } __vc_widget_cb_error(VC_ERROR_SERVICE_RESET, -1, "Daemon Reset"); - SLOG(LOG_DEBUG, TAG_VCW, "====="); - SLOG(LOG_DEBUG, TAG_VCW, " "); + SLOG(LOG_DEBUG, TAG_VCW, "@@@"); } /* NameOwnerChanged */ else { @@ -468,7 +462,7 @@ int vc_widget_dbus_request_hello() VC_METHOD_HELLO); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> Request vc hello : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCW, "@@ Request vc hello : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } @@ -512,10 +506,10 @@ int vc_widget_dbus_request_initialize(int pid, int* service_state, int* daemon_p VC_WIDGET_METHOD_INITIALIZE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget initialize : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget initialize : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget initialize : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget initialize : pid(%d)", pid); } dbus_message_append_args(msg, @@ -546,7 +540,7 @@ int vc_widget_dbus_request_initialize(int pid, int* service_state, int* daemon_p DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCW, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -569,12 +563,12 @@ int vc_widget_dbus_request_initialize(int pid, int* service_state, int* daemon_p return VC_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCW, "<<<< vc widget initialize : result = %d service = %d daemon_pid = %d", result, *service_state, *daemon_pid); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget initialize : result = %d service = %d daemon_pid = %d", result, *service_state, *daemon_pid); } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget initialize : result = %d", result); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget initialize : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCW, "@@ Result message is NULL "); vc_widget_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -612,10 +606,10 @@ int vc_widget_dbus_request_finalize(int pid) VC_WIDGET_METHOD_FINALIZE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget finalize : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget finalize : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget finalize : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget finalize : pid(%d)", pid); } dbus_message_append_args(msg, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); @@ -637,7 +631,7 @@ int vc_widget_dbus_request_finalize(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCW, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -645,12 +639,12 @@ int vc_widget_dbus_request_finalize(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCW, "<<<< vc widget finalize : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget finalize : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget finalize : result = %d", result); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget finalize : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCW, "@@ Result message is NULL "); vc_widget_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -673,10 +667,10 @@ int vc_widget_dbus_request_start_recording(int pid, bool command) VC_WIDGET_METHOD_START_RECORDING); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget start recording : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget start recording : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget start recording : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget start recording : pid(%d)", pid); } int temp = (int)command; @@ -704,19 +698,19 @@ int vc_widget_dbus_request_start_recording(int pid, bool command) dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCW, "@@ 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_DEBUG, TAG_VCW, "<<<< vc widget start recording : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget start recording : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget start recording : result = %d", result); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget start recording : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCW, "@@ Result message is NULL"); vc_widget_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -741,10 +735,10 @@ int vc_widget_dbus_set_foreground(int pid, bool value) VCC_MANAGER_METHOD_SET_FOREGROUND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget set foreground to manager : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget set foreground to manager : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget set foreground to manager : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget set foreground to manager : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); } dbus_message_append_args(msg, @@ -767,10 +761,10 @@ int vc_widget_dbus_set_foreground(int pid, bool value) VC_METHOD_SET_FOREGROUND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget set foreground to daemon : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget set foreground to daemon : Fail to make message"); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget set foreground to daemon : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget set foreground to daemon : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); } dbus_message_append_args(msg, @@ -808,10 +802,10 @@ int vc_widget_dbus_request_enable_asr_result(int pid, bool enable) VC_WIDGET_METHOD_ENABLE_ASR_RESULT); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget enable asr result : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget enable asr result : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget enable asr result : pid(%d), enable(%d)", pid, enable); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget enable asr result : pid(%d), enable(%d)", pid, enable); } DBusMessageIter args; @@ -844,19 +838,19 @@ int vc_widget_dbus_request_enable_asr_result(int pid, bool enable) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCW, "@@ 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_DEBUG, TAG_VCW, "<<<< vc widget enable asr result : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget enable asr result : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget enable asr result : result = %d", result); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget enable asr result : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCW, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ Result Message is NULL"); vc_widget_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -880,10 +874,10 @@ int vc_widget_dbus_request_start(int pid, int silence) VC_WIDGET_METHOD_START); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget start : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget start : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget start : pid(%d), silence(%d)", pid, silence); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget start : pid(%d), silence(%d)", pid, silence); } DBusMessageIter args; @@ -913,19 +907,19 @@ int vc_widget_dbus_request_start(int pid, int silence) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCW, "@@ 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_DEBUG, TAG_VCW, "<<<< vc widget start : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget start : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget start : result = %d", result); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget start : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCW, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ Result Message is NULL"); vc_widget_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -949,10 +943,10 @@ int vc_widget_dbus_request_stop(int pid) VC_WIDGET_METHOD_STOP); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget stop : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget stop : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget stop : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget stop : pid(%d)", pid); } dbus_message_append_args(msg, @@ -979,19 +973,19 @@ int vc_widget_dbus_request_stop(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCW, "@@ 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_DEBUG, TAG_VCW, "<<<< vc widget stop : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget stop : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget stop : result = %d", result); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget stop : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCW, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ Result Message is NULL"); vc_widget_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1015,10 +1009,10 @@ int vc_widget_dbus_request_cancel(int pid) VC_WIDGET_METHOD_CANCEL); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCW, ">>>> vc widget cancel : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget cancel : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCW, ">>>> vc widget cancel : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget cancel : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1045,19 +1039,19 @@ int vc_widget_dbus_request_cancel(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCW, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCW, "@@ 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_DEBUG, TAG_VCW, "<<<< vc widget cancel : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCW, "@@ vc widget cancel : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCW, "<<<< vc widget cancel : result = %d", result); + SLOG(LOG_ERROR, TAG_VCW, "@@ vc widget cancel : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCW, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCW, "@@ Result Message is NULL"); vc_widget_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } diff --git a/common/vc_cmd_db.c b/common/vc_cmd_db.c index e68f92a..43642da 100644 --- a/common/vc_cmd_db.c +++ b/common/vc_cmd_db.c @@ -282,7 +282,7 @@ static int __vc_db_insert_commands(int pid, vc_cmd_type_e type, vc_cmd_s* cmd) } SLOG(LOG_INFO, vc_db_tag(), "[SQL] INSERT INTO vc_info (id, pid(%d), type(%d), format(%d), domain(%d), command(%s)", pid, cmd->type, cmd->format, cmd->domain, cmd->command); - SLOG(LOG_INFO, vc_db_tag(), "[SQL] ==== appid(%s), invocation(%s), fixed(%s)", cmd->appid, cmd->invocation_name, cmd->fixed); + SLOG(LOG_INFO, vc_db_tag(), "[SQL] @@ appid(%s), invocation(%s), fixed(%s)", cmd->appid, cmd->invocation_name, cmd->fixed); sqlite3_reset(stmt); sqlite3_clear_bindings(stmt); @@ -688,10 +688,10 @@ static int __vc_db_extract_unfixed_command(char* command, char* fixed, char** te char* temp = (char*)calloc(256, sizeof(char)); if (0 == strncasecmp(command, fixed, strlen(fixed))) { strncpy(temp, command + strlen(fixed) + 1, strlen(command) - strlen(fixed) - 1); - SLOG(LOG_WARN, vc_db_tag(), "=="); + 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); - SLOG(LOG_WARN, vc_db_tag(), "=="); + SLOG(LOG_WARN, vc_db_tag(), "@@@"); } SLOG(LOG_WARN, vc_db_tag(), "Command(%s) Fixed(%s) Unfixed(%s)", command, fixed, temp); diff --git a/common/vc_command.c b/common/vc_command.c index 3efc055..2d588e5 100644 --- a/common/vc_command.c +++ b/common/vc_command.c @@ -359,7 +359,7 @@ int vc_cmd_list_remove_all(vc_cmd_list_h vc_cmd_list, bool release_command) return VC_ERROR_PERMISSION_DENIED; } - SLOG(LOG_DEBUG, TAG_VCCMD, "===== Destroy all command"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Destroy all command"); if (NULL == vc_cmd_list) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Input parameter is NULL"); @@ -398,8 +398,7 @@ int vc_cmd_list_remove_all(vc_cmd_list_h vc_cmd_list, bool release_command) list->list = NULL; list->index = -1; - SLOG(LOG_DEBUG, TAG_VCCMD, "====="); - SLOG(LOG_DEBUG, TAG_VCCMD, " "); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@"); return VC_ERROR_NONE; } @@ -446,14 +445,14 @@ int vc_cmd_list_foreach_commands(vc_cmd_list_h vc_cmd_list, vc_cmd_list_cb callb iter = g_slist_next(iter); } - SLOG(LOG_DEBUG, TAG_VCCMD, "===== Foreach commands Done"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Foreach commands Done"); return VC_ERROR_NONE; } int vc_cmd_list_filter_by_type(vc_cmd_list_h original, int type, vc_cmd_list_h* filtered) { - SLOG(LOG_DEBUG, TAG_VCCMD, "===== Filter by type"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Filter by type"); if (0 != __vc_cmd_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; @@ -539,7 +538,7 @@ int vc_cmd_list_filter_by_type(vc_cmd_list_h original, int type, vc_cmd_list_h* *filtered = temp_list; - SLOG(LOG_DEBUG, TAG_VCCMD, "====="); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@"); return VC_ERROR_NONE; } @@ -1303,7 +1302,7 @@ int vc_cmd_get_domain(vc_cmd_h vc_command, int* domain) */ int vc_cmd_set_result_key(vc_cmd_h vc_command, int key, int modifier) { - SLOG(LOG_DEBUG, TAG_VCCMD, "===== Set result key"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Set result key"); if (NULL == vc_command) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Invalid parameter "); @@ -1318,8 +1317,7 @@ int vc_cmd_set_result_key(vc_cmd_h vc_command, int key, int modifier) cmd->key = key; cmd->modifier = modifier; - SLOG(LOG_DEBUG, TAG_VCCMD, "====="); - SLOG(LOG_DEBUG, TAG_VCCMD, " "); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@"); return 0; } @@ -1339,7 +1337,7 @@ int vc_cmd_set_result_key(vc_cmd_h vc_command, int key, int modifier) */ int vc_cmd_get_result_key(vc_cmd_h vc_command, int* key, int* modifier) { - SLOG(LOG_DEBUG, TAG_VCCMD, "===== Get result key"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Get result key"); if (NULL == vc_command || NULL == key || NULL == modifier) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Invalid parameter "); @@ -1352,8 +1350,7 @@ int vc_cmd_get_result_key(vc_cmd_h vc_command, int* key, int* modifier) *key = cmd->key; *modifier = cmd->modifier; - SLOG(LOG_DEBUG, TAG_VCCMD, "====="); - SLOG(LOG_DEBUG, TAG_VCCMD, " "); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@"); return 0; } @@ -1367,7 +1364,7 @@ int vc_cmd_print_list(vc_cmd_list_h vc_cmd_list) vc_cmd_list_s* list = NULL; list = (vc_cmd_list_s*)vc_cmd_list; - SLOG(LOG_DEBUG, TAG_VCCMD, "=== Command List ==="); + SLOG(LOG_DEBUG, TAG_VCCMD, "@ Command List @"); SLOG(LOG_DEBUG, TAG_VCCMD, "[List][%p]", list); int count = g_slist_length(list->list); @@ -1384,8 +1381,7 @@ int vc_cmd_print_list(vc_cmd_list_h vc_cmd_list) } } - SLOG(LOG_DEBUG, TAG_VCCMD, "=================="); - SLOG(LOG_DEBUG, TAG_VCCMD, " "); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@"); return 0; } @@ -1419,20 +1415,19 @@ int vc_cmd_get_nlu_json(vc_cmd_h vc_cmd, char** json) static void __vc_cmd_regex_deinit(int num_regex) { - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Start Deinitialize regex ===="); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Start Deinitialize regex @@@"); int i; for (i = 0; num_regex > i; i++) { regfree(®[i]); } - SLOG(LOG_DEBUG, TAG_VCCMD, "===="); - SLOG(LOG_DEBUG, TAG_VCCMD, ""); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@"); } static int __vc_cmd_regex_init() { - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Initialize regular expression ===="); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Initialize regular expression @@@"); int cflags = REG_EXTENDED | REG_ICASE; int ret; @@ -1461,7 +1456,7 @@ static int __vc_cmd_regex_init() free(lang); lang = NULL; - SLOG(LOG_DEBUG, TAG_VCCMD, "==== lang type > %d ====", lang_type); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ lang type > %d @@@", lang_type); re_syntax_options = RE_SYNTAX_POSIX_EXTENDED; @@ -1584,8 +1579,7 @@ static int __vc_cmd_regex_init() return VC_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCCMD, "===="); - SLOG(LOG_DEBUG, TAG_VCCMD, ""); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@"); return VC_ERROR_NONE; } @@ -1673,7 +1667,7 @@ static void __vc_cmd_add_min(struct tm *td, int min) static void __copy_struct_tm(struct tm *des, struct tm *src) { - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Start to copy struct tm ===="); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Start to copy struct tm @@@"); des->tm_sec = src->tm_sec; des->tm_min = src->tm_min; @@ -2190,7 +2184,7 @@ static int __vc_cmd_dabsolute_check(const char *str, struct tm *td, int *exist) static int __vc_cmd_time_check(const char *str, struct tm *td) { - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Check time value in string \"%s\"", str); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Check time value in string \"%s\"", str); vc_error_e ret; int exist = 0; @@ -2199,7 +2193,7 @@ static int __vc_cmd_time_check(const char *str, struct tm *td) if (1 == exist) { g_time_flag = 1; - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Time value is exist"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Time value is exist"); return ret; } else if (VC_ERROR_NONE != ret) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Error is occured > (%d)", ret); @@ -2210,7 +2204,7 @@ static int __vc_cmd_time_check(const char *str, struct tm *td) if (1 == exist) { g_time_flag = 2; - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Time value is exist"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Time value is exist"); return ret; } else if (VC_ERROR_NONE != ret) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Error is occured > (%d)", ret); @@ -2221,20 +2215,20 @@ static int __vc_cmd_time_check(const char *str, struct tm *td) if (1 == exist) { g_time_flag = 3; - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Time value is exist"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Time value is exist"); return ret; } else if (VC_ERROR_NONE != ret) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Error is occured > (%d)", ret); return ret; } - SLOG(LOG_DEBUG, TAG_VCCMD, "==== There is no time value"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ There is no time value"); return VC_ERROR_NONE; } static int __vc_cmd_date_check(const char *str, struct tm *td) { - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Check date value in string \"%s\"", str); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Check date value in string \"%s\"", str); vc_error_e ret; int exist = 0; @@ -2243,7 +2237,7 @@ static int __vc_cmd_date_check(const char *str, struct tm *td) if (1 == exist) { g_date_flag = 1; - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Date value is exist"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Date value is exist"); return ret; } else if (VC_ERROR_NONE != ret) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Error is occured > (%d)", ret); @@ -2254,20 +2248,20 @@ static int __vc_cmd_date_check(const char *str, struct tm *td) if (1 == exist) { g_date_flag = 1; - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Date value is exist"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Date value is exist"); return ret; } else if (VC_ERROR_NONE != ret) { SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Error is occured > (%d)", ret); return ret; } - SLOG(LOG_DEBUG, TAG_VCCMD, "==== There is no date value"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ There is no date value"); return VC_ERROR_NONE; } int vc_cmd_get_datetime(const char *text, time_t *result, char **remain) { - SLOG(LOG_DEBUG, TAG_VCCMD, "==== Get timestamp data"); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@ Get timestamp data"); struct tm td; const char *day_name[7] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; @@ -2331,8 +2325,7 @@ int vc_cmd_get_datetime(const char *text, time_t *result, char **remain) SLOG(LOG_DEBUG, TAG_VCCMD, "[REGEX] There is no data in the text"); } - SLOG(LOG_DEBUG, TAG_VCCMD, "===="); - SLOG(LOG_DEBUG, TAG_VCCMD, ""); + SLOG(LOG_DEBUG, TAG_VCCMD, "@@@"); return VC_ERROR_NONE; } diff --git a/common/vc_config_mgr.c b/common/vc_config_mgr.c index 041701e..246d842 100755 --- a/common/vc_config_mgr.c +++ b/common/vc_config_mgr.c @@ -277,7 +277,7 @@ int __vc_config_mgr_select_lang(const char* engine_id, char** language) 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"); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@ Config changed callback event"); int length; struct inotify_event event; @@ -287,8 +287,7 @@ Eina_Bool vc_config_mgr_inotify_event_cb(void* data, Ecore_Fd_Handler *fd_handle if (0 > length) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Empty Inotify event"); - SLOG(LOG_DEBUG, vc_config_tag(), "====="); - SLOG(LOG_DEBUG, vc_config_tag(), " "); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@"); return ECORE_CALLBACK_PASS_ON; } @@ -358,8 +357,7 @@ Eina_Bool vc_config_mgr_inotify_event_cb(void* data, Ecore_Fd_Handler *fd_handle SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Undefined event"); } - SLOG(LOG_DEBUG, vc_config_tag(), "====="); - SLOG(LOG_DEBUG, vc_config_tag(), " "); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@"); return ECORE_CALLBACK_PASS_ON; } @@ -637,11 +635,11 @@ int vc_config_mgr_initialize(int uid) } /* print daemon config */ - SLOG(LOG_DEBUG, vc_config_tag(), "== Daemon config =="); + SLOG(LOG_DEBUG, vc_config_tag(), "@ Daemon config @"); SLOG(LOG_DEBUG, vc_config_tag(), " engine : %s", g_config_info->engine_id); SLOG(LOG_DEBUG, vc_config_tag(), " auto language : %s", g_config_info->auto_lang ? "on" : "off"); SLOG(LOG_DEBUG, vc_config_tag(), " language : %s", g_config_info->language); - SLOG(LOG_DEBUG, vc_config_tag(), "==================="); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@@"); g_lang_ref_count = 0; @@ -1224,16 +1222,16 @@ int __vc_config_mgr_print_engine_info() vc_engine_info_s *engine_info = NULL; if (0 >= g_slist_length(g_engine_list)) { - SLOG(LOG_DEBUG, vc_config_tag(), "-------------- engine list -----------------"); + SLOG(LOG_DEBUG, vc_config_tag(), "@ engine list @"); SLOG(LOG_DEBUG, vc_config_tag(), " No Engine in engine directory"); - SLOG(LOG_DEBUG, vc_config_tag(), "--------------------------------------------"); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@@"); return 0; } /* Get a first item */ iter = g_slist_nth(g_engine_list, 0); - SLOG(LOG_DEBUG, vc_config_tag(), "--------------- engine list -----------------"); + SLOG(LOG_DEBUG, vc_config_tag(), "@ engine list @"); int i = 1; while (NULL != iter) { @@ -1265,11 +1263,10 @@ int __vc_config_mgr_print_engine_info() } else { SLOG(LOG_DEBUG, vc_config_tag(), " language is NONE"); } - SLOG(LOG_DEBUG, vc_config_tag(), " "); iter = g_slist_next(iter); i++; } - SLOG(LOG_DEBUG, vc_config_tag(), "--------------------------------------------"); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@@"); return 0; } @@ -1280,16 +1277,16 @@ int __vc_config_mgr_print_client_info() vc_config_client_s* temp_client = NULL; if (0 >= g_slist_length(g_config_client_list)) { - SLOG(LOG_DEBUG, vc_config_tag(), "-------------- Client list -----------------"); + SLOG(LOG_DEBUG, vc_config_tag(), "@ Client list @"); SLOG(LOG_DEBUG, vc_config_tag(), " No Client"); - SLOG(LOG_DEBUG, vc_config_tag(), "--------------------------------------------"); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@@"); return 0; } /* Get a first item */ iter = g_slist_nth(g_config_client_list, 0); - SLOG(LOG_DEBUG, vc_config_tag(), "--------------- Client list -----------------"); + SLOG(LOG_DEBUG, vc_config_tag(), "@ Client list @"); int i = 1; while (NULL != iter) { @@ -1300,7 +1297,7 @@ int __vc_config_mgr_print_client_info() iter = g_slist_next(iter); i++; } - SLOG(LOG_DEBUG, vc_config_tag(), "--------------------------------------------"); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@@"); return 0; } diff --git a/common/vc_config_parser.c b/common/vc_config_parser.c index f8ed365..3950472 100644 --- a/common/vc_config_parser.c +++ b/common/vc_config_parser.c @@ -237,7 +237,7 @@ int vc_parser_print_engine_info(vc_engine_info_s* engine_info) if (NULL == engine_info) return -1; - SLOG(LOG_DEBUG, vc_config_tag(), "== engine info =="); + SLOG(LOG_DEBUG, vc_config_tag(), "@ engine info @"); SLOG(LOG_DEBUG, vc_config_tag(), " id : %s", engine_info->uuid); SLOG(LOG_DEBUG, vc_config_tag(), " languages"); @@ -261,7 +261,7 @@ int vc_parser_print_engine_info(vc_engine_info_s* engine_info) } else { SLOG(LOG_DEBUG, vc_config_tag(), " language is NONE"); } - SLOG(LOG_DEBUG, vc_config_tag(), "====================="); + SLOG(LOG_DEBUG, vc_config_tag(), "@@@@"); return 0; } @@ -902,4 +902,4 @@ int vc_parser_get_foreground(int* pid) } return 0; -} \ No newline at end of file +} diff --git a/common/vc_json_parser.c b/common/vc_json_parser.c index 3f6a487..6e715ab 100755 --- a/common/vc_json_parser.c +++ b/common/vc_json_parser.c @@ -469,4 +469,4 @@ int vc_json_set_all_commands_from_file(const char* file_path) g_object_unref(parser); return ret; -} \ No newline at end of file +} diff --git a/server/vcd_client_data.c b/server/vcd_client_data.c index e7a9a00..ff3e686 100644 --- a/server/vcd_client_data.c +++ b/server/vcd_client_data.c @@ -772,7 +772,7 @@ int __show_client_list() GSList *iter = NULL; vc_client_info_s *data = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "----- client list"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ client list"); int count = g_slist_length(g_client_list); int i; @@ -794,9 +794,9 @@ int __show_client_list() } } - SLOG(LOG_DEBUG, TAG_VCD, "-----"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); - SLOG(LOG_DEBUG, TAG_VCD, "----- widget list"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ widget list"); widget_info_s *widget_data = NULL; @@ -819,7 +819,7 @@ int __show_client_list() } } - SLOG(LOG_DEBUG, TAG_VCD, "-----"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -829,7 +829,7 @@ int __show_command_list(GSList* cmd_group) GSList *iter = NULL; vc_cmd_s *data = NULL; - SLOG(LOG_DEBUG, TAG_VCD, "----- command group"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ command group"); int count = g_slist_length(cmd_group); int i; @@ -854,7 +854,7 @@ int __show_command_list(GSList* cmd_group) } } - SLOG(LOG_DEBUG, TAG_VCD, "-----"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } diff --git a/server/vcd_dbus.c b/server/vcd_dbus.c index 45c5e4c..186abf4 100644 --- a/server/vcd_dbus.c +++ b/server/vcd_dbus.c @@ -244,7 +244,7 @@ int vcdc_send_set_volume(int manger_pid, float volume) return -1; } else { if (10 == g_volume_count) { - SLOG(LOG_DEBUG, TAG_VCD, "<<<< Send set volume : pid(%d), volume(%f)", manger_pid, volume); + SLOG(LOG_DEBUG, TAG_VCD, "@@ Send set volume : pid(%d), volume(%f)", manger_pid, volume); g_volume_count = 0; } @@ -355,17 +355,17 @@ int vcdc_send_asr_result(int pid, int cmd_type, bool* is_consumed) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCD, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCD, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VCD_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); - SLOG(LOG_DEBUG, TAG_VCD, "<<<< vc send asr result : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCD, "@@ vc send asr result : result = %d", result); *is_consumed = result; return VCD_ERROR_NONE; } else { - SLOG(LOG_ERROR, TAG_VCD, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCD, "@@ Result message is NULL "); return VCD_ERROR_OPERATION_FAILED; } } @@ -501,7 +501,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 serive state message to manager : state(%d)", state); + SLOG(LOG_DEBUG, TAG_VCD, "@@ Send serive state message to manager : state(%d)", state); dbus_connection_flush(g_conn_sender); } @@ -526,7 +526,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 serive state message to client : state(%d)", state); + SLOG(LOG_DEBUG, TAG_VCD, "@@ Send serive state message to client : state(%d)", state); dbus_connection_flush(g_conn_sender); } @@ -551,7 +551,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 serive state message to widget client : state(%d)", state); + SLOG(LOG_DEBUG, TAG_VCD, "@@ Send serive state message to widget client : state(%d)", state); dbus_connection_flush(g_conn_sender); } @@ -584,7 +584,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_DEBUG, TAG_VCD, "@@ Send manager pid to client : pid(%d)", manager_pid); dbus_connection_flush(g_conn_sender); } @@ -659,7 +659,7 @@ int vcdc_send_dialog(int manger_pid, int pid, const char* disp_text, const char* int vcdc_send_error_signal_to_manager(int manager_pid, int reason, char *err_msg) { - SLOG(LOG_ERROR, TAG_VCD, ">>>> Send error signal to manager"); + SLOG(LOG_ERROR, TAG_VCD, "@@ Send error signal to manager"); if (0 != __dbus_check()) { return VCD_ERROR_OPERATION_FAILED; @@ -700,7 +700,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_DEBUG, TAG_VCD, "@@ Send error signal to manager : reason(%d), Error Msg(%s)", reason, temp_msg); dbus_connection_flush(g_conn_sender); } @@ -715,7 +715,7 @@ int vcdc_send_error_signal_to_manager(int manager_pid, int reason, char *err_msg int vcdc_send_error_signal(int reason, char *err_msg) { - SLOG(LOG_ERROR, TAG_VCD, ">>>> Send error signal"); + SLOG(LOG_ERROR, TAG_VCD, "@@ Send error signal"); if (NULL == err_msg) { SLOG(LOG_ERROR, TAG_VCD, "[Dbus ERROR] Input parameter is NULL"); @@ -749,7 +749,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_DEBUG, 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); } @@ -772,7 +772,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_DEBUG, TAG_VCD, "@@ Send error signal : reason(%d), daemon_pid(%d), Error Msg(%s)", reason, daemon_pid, err_msg); dbus_connection_flush(g_conn_sender); } @@ -795,7 +795,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_DEBUG, 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); } diff --git a/server/vcd_dbus_server.c b/server/vcd_dbus_server.c index a83d053..5a72d01 100644 --- a/server/vcd_dbus_server.c +++ b/server/vcd_dbus_server.c @@ -48,15 +48,14 @@ int __dbus_error_return(DBusConnection* conn, DBusMessage* msg, int ret) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } int vcd_dbus_server_hello(DBusConnection* conn, DBusMessage* msg) { - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Hello"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Hello"); DBusMessage* reply; reply = dbus_message_new_method_return(msg); @@ -72,8 +71,7 @@ int vcd_dbus_server_hello(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -97,7 +95,7 @@ int vcd_dbus_server_mgr_initialize(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager Initialize"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager Initialize"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr initialize : get arguments error (%s)", err.message); @@ -139,8 +137,7 @@ int vcd_dbus_server_mgr_initialize(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -154,7 +151,7 @@ int vcd_dbus_server_mgr_finalize(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager Finalize"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager Finalize"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr finalize : get arguments error (%s)", err.message); @@ -188,8 +185,7 @@ int vcd_dbus_server_mgr_finalize(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -204,7 +200,7 @@ int vcd_dbus_server_mgr_set_command(DBusConnection* conn, DBusMessage* msg) dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager Set command"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager Set command"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr set command : get arguments error (%s)", err.message); @@ -240,8 +236,7 @@ int vcd_dbus_server_mgr_set_command(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -256,7 +251,7 @@ int vcd_dbus_server_mgr_unset_command(DBusConnection* conn, DBusMessage* msg) dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD manager unset command"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD manager unset command"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr unset command : get arguments error (%s)", err.message); @@ -292,8 +287,7 @@ int vcd_dbus_server_mgr_unset_command(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -308,7 +302,7 @@ int vcd_dbus_server_mgr_set_demandable_client(DBusConnection* conn, DBusMessage* dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager Set demandable client"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager Set demandable client"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr set demandable client : get arguments error (%s)", err.message); @@ -344,8 +338,7 @@ int vcd_dbus_server_mgr_set_demandable_client(DBusConnection* conn, DBusMessage* SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -360,7 +353,7 @@ int vcd_dbus_server_mgr_set_audio_type(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager set audio type"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set audio type"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -398,8 +391,7 @@ int vcd_dbus_server_mgr_set_audio_type(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -414,7 +406,7 @@ int vcd_dbus_server_mgr_get_audio_type(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager get audio type"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager get audio type"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -454,8 +446,7 @@ int vcd_dbus_server_mgr_get_audio_type(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); if (NULL != audio_type) free(audio_type); @@ -471,7 +462,7 @@ int vcd_dbus_server_mgr_set_client_info(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager set client info"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set client info"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -510,8 +501,7 @@ int vcd_dbus_server_mgr_set_client_info(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -527,7 +517,7 @@ int vcd_dbus_server_mgr_set_private_data(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager set private data"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set private data"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -566,8 +556,7 @@ int vcd_dbus_server_mgr_set_private_data(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -583,7 +572,7 @@ int vcd_dbus_server_mgr_get_private_data(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager get private data"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager get private data"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -624,8 +613,7 @@ int vcd_dbus_server_mgr_get_private_data(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); if (NULL != data) free(data); @@ -642,7 +630,7 @@ int vcd_dbus_server_mgr_set_domain(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager set audio type"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager set audio type"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -680,8 +668,7 @@ int vcd_dbus_server_mgr_set_domain(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -697,7 +684,7 @@ int vcd_dbus_server_mgr_do_action(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager request to do action"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager request to do action"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -736,8 +723,7 @@ int vcd_dbus_server_mgr_do_action(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -752,7 +738,7 @@ int vcd_dbus_server_mgr_enable_command_type(DBusConnection* conn, DBusMessage* m int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager enable command type"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager enable command type"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -790,8 +776,7 @@ int vcd_dbus_server_mgr_enable_command_type(DBusConnection* conn, DBusMessage* m SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -806,7 +791,7 @@ int vcd_dbus_server_mgr_disable_command_type(DBusConnection* conn, DBusMessage* int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager disable command type"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager disable command type"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -844,8 +829,7 @@ int vcd_dbus_server_mgr_disable_command_type(DBusConnection* conn, DBusMessage* SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -862,7 +846,7 @@ int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager start"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager start"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, @@ -902,8 +886,7 @@ int vcd_dbus_server_mgr_start(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -917,7 +900,7 @@ int vcd_dbus_server_mgr_stop(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager stop"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager stop"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr stop : get arguments error (%s)", err.message); @@ -950,8 +933,7 @@ int vcd_dbus_server_mgr_stop(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -965,7 +947,7 @@ int vcd_dbus_server_mgr_cancel(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager cancel"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager cancel"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr cancel : get arguments error (%s)", err.message); @@ -998,8 +980,7 @@ int vcd_dbus_server_mgr_cancel(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1012,7 +993,7 @@ int vcd_dbus_server_mgr_result_selection(DBusConnection* conn, DBusMessage* msg) int pid; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Manager result selection"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Manager result selection"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd mgr result selection : get arguments error (%s)", err.message); @@ -1046,8 +1027,7 @@ int vcd_dbus_server_mgr_result_selection(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; */ @@ -1070,7 +1050,7 @@ int vcd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Initialize"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Initialize"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd initialize : get arguments error (%s)", err.message); @@ -1112,8 +1092,7 @@ int vcd_dbus_server_initialize(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1127,7 +1106,7 @@ int vcd_dbus_server_finalize(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Finalize"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Finalize"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd finalize : get arguments error (%s)", err.message); @@ -1161,8 +1140,7 @@ int vcd_dbus_server_finalize(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1179,7 +1157,7 @@ int vcd_dbus_server_set_exclusive_command(DBusConnection* conn, DBusMessage* msg dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &value, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD set exclusive command"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD set exclusive command"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd unset command : get arguments error (%s)", err.message); @@ -1215,8 +1193,7 @@ int vcd_dbus_server_set_exclusive_command(DBusConnection* conn, DBusMessage* msg SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1233,7 +1210,7 @@ int vcd_dbus_server_set_command(DBusConnection* conn, DBusMessage* msg) dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &cmd_type, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD set command"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD set command"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd set command : get arguments error (%s)", err.message); @@ -1269,8 +1246,7 @@ int vcd_dbus_server_set_command(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1286,7 +1262,7 @@ int vcd_dbus_server_unset_command(DBusConnection* conn, DBusMessage* msg) dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &cmd_type, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD unset command"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD unset command"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd unset command : get arguments error (%s)", err.message); @@ -1322,8 +1298,7 @@ int vcd_dbus_server_unset_command(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1338,7 +1313,7 @@ int vcd_dbus_server_set_foreground(DBusConnection* conn, DBusMessage* msg) dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &value, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD set foreground"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD set foreground"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd set foreground : get arguments error (%s)", err.message); @@ -1350,8 +1325,7 @@ int vcd_dbus_server_set_foreground(DBusConnection* conn, DBusMessage* msg) vcd_server_set_foreground(pid, tmp_value); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1374,7 +1348,7 @@ int vcd_dbus_server_dialog(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INT32, &continuous, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD request dialog"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD request dialog"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd request dialog : get arguments error (%s)", err.message); @@ -1410,8 +1384,7 @@ int vcd_dbus_server_dialog(DBusConnection* conn, DBusMessage* msg) } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1430,7 +1403,7 @@ int vcd_dbus_server_is_system_command_valid(DBusConnection* conn, DBusMessage* m DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD request to check system command is valid"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD request to check system command is valid"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd request to check system command is valid : get arguments error (%s)", err.message); @@ -1465,8 +1438,7 @@ int vcd_dbus_server_is_system_command_valid(DBusConnection* conn, DBusMessage* m SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1482,7 +1454,7 @@ int vcd_dbus_server_start_request(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Request Start"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Request Start"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &silence, DBUS_TYPE_INVALID); @@ -1517,8 +1489,7 @@ int vcd_dbus_server_start_request(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1532,7 +1503,7 @@ int vcd_dbus_server_stop_request(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Request Stop"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Request Stop"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd stop : get arguments error (%s)", err.message); @@ -1565,8 +1536,7 @@ int vcd_dbus_server_stop_request(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1580,7 +1550,7 @@ int vcd_dbus_server_cancel_request(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Request Cancel"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Request Cancel"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd cancel : get arguments error (%s)", err.message); @@ -1613,8 +1583,7 @@ int vcd_dbus_server_cancel_request(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1637,7 +1606,7 @@ int vcd_dbus_server_widget_initialize(DBusConnection* conn, DBusMessage* msg) DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Widget Initialize"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Initialize"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget initialize : get arguments error (%s)", err.message); @@ -1676,8 +1645,7 @@ int vcd_dbus_server_widget_initialize(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1691,7 +1659,7 @@ int vcd_dbus_server_widget_finalize(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD Widget Finalize"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD Widget Finalize"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget finalize : get arguments error (%s)", err.message); @@ -1725,8 +1693,7 @@ int vcd_dbus_server_widget_finalize(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1745,7 +1712,7 @@ int vcd_dbus_server_widget_start_recording(DBusConnection* conn, DBusMessage* ms DBUS_TYPE_INT32, &widget_command, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget start recording"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD widget start recording"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget start recording : get arguments error (%s)", err.message); @@ -1781,8 +1748,7 @@ int vcd_dbus_server_widget_start_recording(DBusConnection* conn, DBusMessage* ms SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1797,7 +1763,7 @@ int vcd_dbus_server_widget_start(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget start"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD widget start"); dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &silence, DBUS_TYPE_INVALID); @@ -1832,8 +1798,7 @@ int vcd_dbus_server_widget_start(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1847,7 +1812,7 @@ int vcd_dbus_server_widget_stop(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget stop"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD widget stop"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget stop : get arguments error (%s)", err.message); @@ -1880,8 +1845,7 @@ int vcd_dbus_server_widget_stop(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1895,7 +1859,7 @@ int vcd_dbus_server_widget_cancel(DBusConnection* conn, DBusMessage* msg) int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget cancel"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD widget cancel"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget cancel : get arguments error (%s)", err.message); @@ -1928,8 +1892,7 @@ int vcd_dbus_server_widget_cancel(DBusConnection* conn, DBusMessage* msg) SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } @@ -1944,7 +1907,7 @@ int vcd_dbus_server_widget_enable_asr_result(DBusConnection* conn, DBusMessage* int ret = VCD_ERROR_OPERATION_FAILED; dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &enable, DBUS_TYPE_INVALID); - SLOG(LOG_DEBUG, TAG_VCD, ">>>>> VCD widget enable asr result"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VCD widget enable asr result"); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_VCD, "[IN ERROR] vcd widget enable asr result : get arguments error (%s)", err.message); @@ -1977,8 +1940,7 @@ int vcd_dbus_server_widget_enable_asr_result(DBusConnection* conn, DBusMessage* SLOG(LOG_ERROR, TAG_VCD, "[OUT ERROR] Fail to create reply message!!"); } - SLOG(LOG_DEBUG, TAG_VCD, "<<<<<"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; -} \ No newline at end of file +} diff --git a/server/vcd_engine_agent.c b/server/vcd_engine_agent.c index 1718842..2811020 100644 --- a/server/vcd_engine_agent.c +++ b/server/vcd_engine_agent.c @@ -283,11 +283,11 @@ int vcd_engine_agent_initialize_current_engine() g_dynamic_engine.is_loaded = false; g_dynamic_engine.is_set = true; - SLOG(LOG_DEBUG, TAG_VCD, "-----"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); SLOG(LOG_DEBUG, TAG_VCD, " Dynamic engine uuid : %s", g_dynamic_engine.engine_uuid); SLOG(LOG_DEBUG, TAG_VCD, " Dynamic engine name : %s", g_dynamic_engine.engine_name); SLOG(LOG_DEBUG, TAG_VCD, " Dynamic engine path : %s", g_dynamic_engine.engine_path); - SLOG(LOG_DEBUG, TAG_VCD, "-----"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); } @@ -396,12 +396,11 @@ int __internal_get_engine_info(const char* filepath, vcengine_info_s** info) temp->engine_path = g_strdup(filepath); - SLOG(LOG_DEBUG, TAG_VCD, "----- Valid Engine"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Valid Engine"); SLOG(LOG_DEBUG, TAG_VCD, "Engine uuid : %s", temp->engine_uuid); SLOG(LOG_DEBUG, TAG_VCD, "Engine name : %s", temp->engine_name); SLOG(LOG_DEBUG, TAG_VCD, "Engine path : %s", temp->engine_path); - SLOG(LOG_DEBUG, TAG_VCD, "-----"); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); *info = temp; @@ -1221,7 +1220,7 @@ int __log_enginelist() /* Get a first item */ iter = g_list_first(g_engine_list); - SLOG(LOG_DEBUG, TAG_VCD, "--------------- engine list -------------------"); + SLOG(LOG_DEBUG, TAG_VCD, "@ engine list @"); int i = 1; while (NULL != iter) { @@ -1235,11 +1234,11 @@ int __log_enginelist() iter = g_list_next(iter); i++; } - SLOG(LOG_DEBUG, TAG_VCD, "----------------------------------------------"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@@"); } else { - SLOG(LOG_DEBUG, TAG_VCD, "-------------- engine list -------------------"); + SLOG(LOG_DEBUG, TAG_VCD, "@ engine list @"); SLOG(LOG_DEBUG, TAG_VCD, " No Engine in engine directory"); - SLOG(LOG_DEBUG, TAG_VCD, "----------------------------------------------"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@@"); } return 0; diff --git a/server/vcd_main.c b/server/vcd_main.c index 2996ba0..f91fbd1 100644 --- a/server/vcd_main.c +++ b/server/vcd_main.c @@ -25,9 +25,7 @@ static Ecore_Timer* g_check_client_timer = NULL; int main(int argc, char** argv) { - SLOG(LOG_DEBUG, TAG_VCD, " "); - SLOG(LOG_DEBUG, TAG_VCD, " "); - SLOG(LOG_DEBUG, TAG_VCD, "===== VC Daemon Initialize"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VC Daemon Initialize"); if (!ecore_init()) { SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail ecore_init()"); @@ -51,15 +49,13 @@ int main(int argc, char** argv) SLOG(LOG_WARN, TAG_VCD, "[Main Warning] Fail to create timer of client check"); } - SLOG(LOG_DEBUG, TAG_VCD, "[Main] vc-daemon start..."); + SLOG(LOG_DEBUG, TAG_VCD, "[Main] vc-daemon start"); - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); ecore_main_loop_begin(); - SLOG(LOG_DEBUG, TAG_VCD, "===== VC Daemon Finalize"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ VC Daemon Finalize"); if (NULL != g_check_client_timer) { ecore_timer_del(g_check_client_timer); @@ -71,9 +67,7 @@ int main(int argc, char** argv) ecore_shutdown(); - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return 0; } diff --git a/server/vcd_server.c b/server/vcd_server.c index a2aa150..c8e3304 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -58,40 +58,37 @@ static int __vcd_server_launch_manager_app(); */ static Eina_Bool __stop_by_silence(void *data) { - SLOG(LOG_DEBUG, TAG_VCD, "===== Silence Detected "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Silence Detected "); vcd_server_mgr_stop(); - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return EINA_FALSE; } static Eina_Bool __cancel_by_interrupt(void *data) { - SLOG(LOG_DEBUG, TAG_VCD, "===== Cancel by interrupt"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Cancel by interrupt"); vcd_server_mgr_cancel(); - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return EINA_FALSE; } static void __cancel_by_error(void *data) { - SLOG(LOG_DEBUG, TAG_VCD, "===== Cancel by error"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Cancel by error"); vcd_server_mgr_cancel(); - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return; } static Eina_Bool __restart_engine(void *data) { - SLOG(LOG_DEBUG, TAG_VCD, "===== Restart by no result"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Restart by no result"); g_restart_timer = NULL; @@ -111,8 +108,7 @@ static Eina_Bool __restart_engine(void *data) SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Restart recognition"); - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return EINA_FALSE; } @@ -178,17 +174,16 @@ 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_DEBUG, TAG_VCD, "@@@ Cancel by sound interrupt"); ecore_timer_add(0, __cancel_by_interrupt, NULL); - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); } static void __config_lang_changed_cb(const char* current_lang, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "===== Change language "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Change language "); /* Current state is recording */ vcd_state_e state = vcd_config_get_service_state(); @@ -203,15 +198,14 @@ 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_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return; } static void __config_foreground_changed_cb(int previous, int current, void* user_data) { - SLOG(LOG_DEBUG, TAG_VCD, "===== Change foreground"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Change foreground"); SLOG(LOG_DEBUG, TAG_VCD, "Foreground pid(%d)", current); @@ -224,8 +218,7 @@ static void __config_foreground_changed_cb(int previous, int current, void* user } } - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); return; } @@ -540,7 +533,7 @@ static void __vcd_server_result_cb(vcp_result_event_e event, int* result_id, int /* 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_DEBUG, TAG_VCD, "[Server] @ Get engine result @"); int ret = -1; vc_cmd_s* temp_cmd = NULL; @@ -655,7 +648,7 @@ static void __vcd_server_result_cb(vcp_result_event_e event, int* result_id, int vc_cmd_print_list(vc_cmd_list); - SLOG(LOG_DEBUG, TAG_VCD, "[Server] ========================="); + SLOG(LOG_DEBUG, TAG_VCD, "[Server] @@@@"); int result_count = 0; vc_cmd_list_get_count(vc_cmd_list, &result_count); @@ -763,7 +756,7 @@ static void __vcd_server_result_cb(vcp_result_event_e event, int* result_id, int } /* Normal result */ - SLOG(LOG_DEBUG, TAG_VCD, "[Server] === Get engine result ==="); + SLOG(LOG_DEBUG, TAG_VCD, "[Server] @ Get engine result @"); int ret = -1; vc_cmd_s* temp_cmd = NULL; @@ -830,7 +823,7 @@ static void __vcd_server_result_cb(vcp_result_event_e event, int* result_id, int vc_cmd_print_list(vc_cmd_list); - SLOG(LOG_DEBUG, TAG_VCD, "[Server] ========================="); + SLOG(LOG_DEBUG, TAG_VCD, "[Server] @@@@"); int result_count = 0; vc_cmd_list_get_count(vc_cmd_list, &result_count); @@ -1138,7 +1131,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_DEBUG, 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; @@ -1165,8 +1158,7 @@ static void __vcd_cleanup_client(vcd_client_type_e type) } } } - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); } if (NULL != client_list && -1 == mgr_pid) { free(client_list); @@ -1185,7 +1177,7 @@ Eina_Bool vcd_cleanup_client_all(void *data) #if 0 if (0 == vcd_client_get_list(&client_list, &client_count)) { - SLOG(LOG_DEBUG, TAG_VCD, "===== Clean up client "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Clean up client "); if (NULL != client_list && client_count > 0) { for (i = 0; i < client_count; i++) { exist = false; @@ -1217,8 +1209,7 @@ Eina_Bool vcd_cleanup_client_all(void *data) #endif } } - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); } if (NULL != client_list) { free(client_list); @@ -1227,7 +1218,7 @@ Eina_Bool vcd_cleanup_client_all(void *data) /* If app is in background state, app cannot response message. */ if (0 == vcd_client_widget_get_list(&client_list, &client_count)) { - SLOG(LOG_DEBUG, TAG_VCD, "===== Clean up widget"); + SLOG(LOG_DEBUG, TAG_VCD, "@@@ Clean up widget"); if (NULL != client_list && client_count > 0) { for (i = 0; i < client_count; i++) { exist = false; @@ -1259,8 +1250,7 @@ Eina_Bool vcd_cleanup_client_all(void *data) #endif } } - SLOG(LOG_DEBUG, TAG_VCD, "====="); - SLOG(LOG_DEBUG, TAG_VCD, " "); + SLOG(LOG_DEBUG, TAG_VCD, "@@@"); } if (NULL != client_list) { -- 2.7.4 From fd608e0cbada622b6384752a2a929373a8f3a66b Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Mon, 11 Sep 2017 10:18:27 +0900 Subject: [PATCH 16/16] Remove to start recorder when bt data received cb is called Change-Id: I01f7b09f752051088821b0772bfd7f3d44fa6ad1 Signed-off-by: Wonnam Jang --- 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 88a654f..1d69fff 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -166,7 +166,7 @@ static void _bt_hid_audio_data_receive_cb(bt_hid_voice_data_s *voice_data, void if (VCD_RECORDER_STATE_RECORDING != g_recorder_state) { SLOG(LOG_WARN, TAG_VCD, "[Recorder] Not start yet, but send audio data vi Bluetooth"); - vcd_recorder_start(); +// vcd_recorder_start(); } if (NULL != g_audio_cb) { -- 2.7.4