Add document in vce.h

[platform/core/uifw/voice-control.git] / server / vcd_server.c

diff --git a/server/vcd_server.c b/server/vcd_server.c
index 58d6d7d..a525662 100755 (executable)
--- a/server/vcd_server.c
+++ b/server/vcd_server.c
@@ -425,12 +425,21 @@ static Eina_Bool __vcd_send_selected_result(void *data)
 
 int vcd_send_asr_result(vce_asr_result_event_e event, const char* asr_result, void *user_data)
 {
+       int ret = __vcd_server_launch_manager_app();
+       if (0 != ret) {
+               SECURE_SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send ASR result : mgr_pid(%d), asr_result(%s)", vcd_client_manager_get_pid(), asr_result);
+               return ret;
+       }
+
        if (NULL != asr_result) {
                SECURE_SLOG(LOG_DEBUG, TAG_VCD, "[Server] ASR result - Event(%d), Text(%s)", event, asr_result);
-               vcdc_send_pre_result_to_manager(vcd_client_manager_get_pid(), event, asr_result);
+               ret = vcdc_send_pre_result_to_manager(vcd_client_manager_get_pid(), event, asr_result);
+               if (0 != ret) {
+                       SECURE_SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send ASR result : mgr_pid(%d), asr_result(%s)", vcd_client_manager_get_pid(), asr_result);
+               }
        }
 
-       return VCD_ERROR_NONE;
+       return ret;
 }
 
 int vcd_send_nlg_result(const char* nlg_result, void *user_data)
@@ -918,9 +927,14 @@ int vcd_send_error(vce_error_e error, const char* msg, void *user_data)
        char* error_msg = NULL;
        if (NULL != msg) {
                error_msg = strdup(msg);
+               if (NULL == error_msg) {
+                       return VCD_ERROR_OUT_OF_MEMORY;
+               }
        }
 
-       if (0 != vcdc_send_error_signal_to_manager(vcd_client_manager_get_pid(), error, error_msg)) {
+       int ret = VCD_ERROR_NONE;
+       ret = vcdc_send_error_signal_to_manager(vcd_client_manager_get_pid(), error, error_msg);
+       if (VCD_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send error signal");
        }
 
@@ -929,7 +943,7 @@ int vcd_send_error(vce_error_e error, const char* msg, void *user_data)
                error_msg = NULL;
        }
 
-       return VCD_ERROR_NONE;
+       return ret;
 }
 
 /*
@@ -1033,7 +1047,7 @@ int vcd_initialize(vce_request_callback_s *callback)
        return 0;
 }
 
-void vcd_finalize()
+bool vcd_finalize()
 {
        GList *iter = NULL;
        if (0 < g_list_length(g_proc_list)) {
@@ -1056,14 +1070,17 @@ void vcd_finalize()
                }
                vcd_engine_recognize_cancel();
        }
+
        if (0 != vcd_recorder_destroy()) {
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to destroy recorder");
+               return false;
        } else {
                SLOG(LOG_DEBUG, TAG_VCD, "[Server] destroy recorder");
        }
 
        if (0 != vcd_engine_agent_release()) {
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to release engine");
+               return false;
        } else {
                SLOG(LOG_DEBUG, TAG_VCD, "[Server] release engine");
        }
@@ -1075,14 +1092,18 @@ void vcd_finalize()
 
        SLOG(LOG_ERROR, TAG_VCD, "[Server] mode finalize");
 
-       return;
+       return true;
 }
 
 static Eina_Bool __finalize_quit_ecore_loop(void *data)
 {
-       SLOG(LOG_ERROR, TAG_VCD, "[Server] quit ecore main loop");
-       ecore_main_loop_quit();
-       return EINA_FALSE;
+       bool ret = vcd_finalize();
+       if (false == ret) {
+               return EINA_TRUE;
+       } else {
+               ecore_main_loop_quit();
+               return EINA_FALSE;
+       }
 }
 
 static void __read_proc()
@@ -1355,7 +1376,7 @@ int vcd_server_mgr_finalize(int pid)
 
        if (0 == vcd_client_get_ref_count()) {
                SLOG(LOG_DEBUG, TAG_VCD, "[Server] Connected client list is empty");
-               ecore_timer_add(0, __finalize_quit_ecore_loop, NULL);
+               ecore_timer_add(0.5, __finalize_quit_ecore_loop, NULL);
        }
 
        SLOG(LOG_ERROR, TAG_VCD, "[Server Success] Manager Finalize : pid(%d)", pid);
@@ -1956,7 +1977,7 @@ int vcd_server_finalize(int pid)
 
        if (0 == vcd_client_get_ref_count()) {
                SLOG(LOG_DEBUG, TAG_VCD, "[Server] Connected client list is empty");
-               ecore_timer_add(0, __finalize_quit_ecore_loop, NULL);
+               ecore_timer_add(0.5, __finalize_quit_ecore_loop, NULL);
        }
 
        SLOG(LOG_DEBUG, TAG_VCD, "[Server Success] Client Finalize : pid(%d)", pid);
@@ -2270,7 +2291,7 @@ int vcd_server_widget_finalize(int pid)
 
        if (0 == vcd_client_get_ref_count()) {
                SLOG(LOG_ERROR, TAG_VCD, "[Server] connected client list is empty");
-               ecore_timer_add(0, __finalize_quit_ecore_loop, NULL);
+               ecore_timer_add(0.5, __finalize_quit_ecore_loop, NULL);
                return 0;
        }