projects / platform / core / uifw / voice-control.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix memory leaks of dbus
[platform/core/uifw/voice-control.git] / client / vc_widget_dbus.c
diff --git a/client/vc_widget_dbus.c b/client/vc_widget_dbus.c
index 56937b4..14d3f4d 100644 (file)
--- a/client/vc_widget_dbus.c
+++ b/client/vc_widget_dbus.c
@@ -33,7 +33,7 @@ extern void __vc_widget_cb_show_tooltip(int pid, bool show);
 
 extern void __vc_widget_cb_result();
 
-extern bool __vc_widget_cb_asr_result();
+extern bool __vc_widget_cb_asr_result(int event, const char* asr_result);
 
 extern int __vc_widget_cb_service_state(int state);
 
@@ -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,26 +150,33 @@ 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())
+                       int event = -1;
+                       char* asr_result = NULL;
+
+                       dbus_message_get_args(msg, &err,
+                               DBUS_TYPE_INT32, &event,
+                               DBUS_TYPE_STRING, &asr_result,
+                               DBUS_TYPE_INVALID);
+
+                       if (false == __vc_widget_cb_asr_result(event, asr_result))
                                ret = 0;
                        else
                                ret = 1;
@@ -180,23 +185,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, event(%d), asr_result(%s), consumed(%d)", event, asr_result, ret);
 
                                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 +212,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 +224,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 +254,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 {
@@ -268,6 +270,20 @@ static Eina_Bool widget_listener_event_callback(void* data, Ecore_Fd_Handler *fd
        return ECORE_CALLBACK_PASS_ON;
 }
 
+static void __vc_mgr_dbus_connection_free()
+{
+       if (NULL != g_w_conn_listener) {
+               dbus_connection_close(g_w_conn_listener);
+               dbus_connection_unref(g_w_conn_listener);
+               g_w_conn_listener = NULL;
+       }
+       if (NULL != g_w_conn_sender) {
+               dbus_connection_close(g_w_conn_sender);
+               dbus_connection_unref(g_w_conn_sender);
+               g_w_conn_sender = NULL;
+       }
+}
+
 int vc_widget_dbus_open_connection()
 {
        if (NULL != g_w_conn_sender && NULL != g_w_conn_listener) {
@@ -294,6 +310,8 @@ int vc_widget_dbus_open_connection()
                return VC_ERROR_OPERATION_FAILED;
        }
 
+       dbus_connection_set_exit_on_disconnect(g_w_conn_sender, false);
+
        g_w_conn_listener = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
 
        if (dbus_error_is_set(&err)) {
@@ -303,9 +321,12 @@ int vc_widget_dbus_open_connection()
 
        if (NULL == g_w_conn_listener) {
                SLOG(LOG_ERROR, TAG_VCW, "Fail to get dbus connection ");
+               __vc_mgr_dbus_connection_free();
                return VC_ERROR_OPERATION_FAILED;
        }
 
+       dbus_connection_set_exit_on_disconnect(g_w_conn_listener, false);
+
        int pid = getpid();
 
        char service_name[64];
@@ -324,11 +345,13 @@ int vc_widget_dbus_open_connection()
 
        if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
                SLOG(LOG_ERROR, TAG_VCW, "fail dbus_bus_request_name()");
+               __vc_mgr_dbus_connection_free();
                return -2;
        }
 
        if (NULL != g_w_fd_handler) {
                SLOG(LOG_WARN, TAG_VCW, "The handler already exists.");
+               __vc_mgr_dbus_connection_free();
                return 0;
        }
 
@@ -342,12 +365,14 @@ int vc_widget_dbus_open_connection()
        if (dbus_error_is_set(&err)) {
                SLOG(LOG_ERROR, TAG_VCW, "Match Error (%s)", err.message);
                dbus_error_free(&err);
+               __vc_mgr_dbus_connection_free();
                return VC_ERROR_OPERATION_FAILED;
        }
 
        int fd = 0;
        if (1 != dbus_connection_get_unix_fd(g_w_conn_listener, &fd)) {
                SLOG(LOG_ERROR, TAG_VCW, "fail to get fd from dbus ");
+               __vc_mgr_dbus_connection_free();
                return VC_ERROR_OPERATION_FAILED;
        } else {
                SLOG(LOG_DEBUG, TAG_VCW, "Get fd from dbus : %d", fd);
@@ -357,6 +382,7 @@ int vc_widget_dbus_open_connection()
 
        if (NULL == g_w_fd_handler) {
                SLOG(LOG_ERROR, TAG_VCW, "fail to get fd handler from ecore ");
+               __vc_mgr_dbus_connection_free();
                return VC_ERROR_OPERATION_FAILED;
        }
 
@@ -373,33 +399,40 @@ int vc_widget_dbus_close_connection()
                g_w_fd_handler = NULL;
        }
 
-       int pid = getpid();
+       if (NULL != g_w_conn_listener) {
+               int pid = getpid();
 
-       char service_name[64];
-       memset(service_name, '\0', 64);
-       snprintf(service_name, 64, "%s%d", VC_WIDGET_SERVICE_NAME, pid);
+               char service_name[64];
+               memset(service_name, '\0', 64);
+               snprintf(service_name, 64, "%s%d", VC_WIDGET_SERVICE_NAME, pid);
 
-       dbus_bus_release_name(g_w_conn_listener, service_name, &err);
+               dbus_bus_release_name(g_w_conn_listener, service_name, &err);
 
-       if (dbus_error_is_set(&err)) {
-               SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Dbus Error (%s)", err.message);
-               dbus_error_free(&err);
+               if (dbus_error_is_set(&err)) {
+                       SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Dbus Error (%s)", err.message);
+                       dbus_error_free(&err);
+               }
        }
 
-       dbus_connection_close(g_w_conn_sender);
-       dbus_connection_close(g_w_conn_listener);
-
-       dbus_connection_unref(g_w_conn_sender);
-       dbus_connection_unref(g_w_conn_listener);
-
-       g_w_conn_sender = NULL;
-       g_w_conn_listener = NULL;
+       __vc_mgr_dbus_connection_free();
 
        return 0;
 }
 
 int vc_widget_dbus_reconnect()
 {
+       if (!g_w_conn_sender || !g_w_conn_listener) {
+               vc_widget_dbus_close_connection();
+
+               if (0 != vc_widget_dbus_open_connection()) {
+                       SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to reconnect");
+                       return -1;
+               }
+
+               SLOG(LOG_DEBUG, TAG_VCW, "[DBUS] Reconnect");
+               return 0;
+       }
+
        bool sender_connected = dbus_connection_get_is_connected(g_w_conn_sender);
        bool listener_connected = dbus_connection_get_is_connected(g_w_conn_listener);
        SLOG(LOG_DEBUG, TAG_VCW, "[DBUS] Sender(%s) Listener(%s)",
@@ -443,7 +476,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;
        }
 
@@ -487,10 +520,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,
@@ -521,7 +554,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;
                }
@@ -544,12 +577,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;
        }
@@ -587,10 +620,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);
@@ -612,7 +645,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;
                }
@@ -620,12 +653,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;
        }
@@ -648,10 +681,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;
@@ -679,19 +712,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;
        }
@@ -716,10 +749,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,
@@ -742,10 +775,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,
@@ -783,10 +816,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;
@@ -819,19 +852,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;
        }
@@ -855,10 +888,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;
@@ -888,19 +921,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;
        }
@@ -924,10 +957,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,
@@ -954,19 +987,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;
        }
@@ -990,10 +1023,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,
@@ -1020,19 +1053,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;
        }
Domain: UI Framework / Voice;