From 5debf3afb46e8f70660fde04bfb7a93ec27c7c3d Mon Sep 17 00:00:00 2001 From: sooyeon Date: Wed, 22 Jun 2022 18:45:50 +0900 Subject: [PATCH] Disconnection dbus relationship Change-Id: Ia8bfdf75fb6b8aad8bbcd49968e3185434cdfe1e Signed-off-by: sooyeon --- server/CMakeLists.txt | 4 ++-- server/vcd_dbus.c | 4 ++-- server/vcd_dbus.h | 8 -------- server/vcd_dbus_server.c | 4 ++-- server/vcd_engine_agent.c | 2 +- server/vcd_recorder.c | 1 - server/vcd_server.c | 24 +++++++++++++----------- server/vce.c | 2 +- 8 files changed, 21 insertions(+), 28 deletions(-) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index c269a11..2cda660 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -9,8 +9,8 @@ SET(SRCS vcd_client_data.c vcd_server_data.cpp vcd_config.c - vcd_dbus_server.c - vcd_dbus.c +# vcd_dbus_server.c +# vcd_dbus.c vcd_tidl.c vcd_stub.c vcd_mgr_stub.c diff --git a/server/vcd_dbus.c b/server/vcd_dbus.c index a00d8bc..29b6d75 100755 --- a/server/vcd_dbus.c +++ b/server/vcd_dbus.c @@ -16,8 +16,8 @@ #include #include "vcd_client_data.h" -#include "vcd_dbus.h" -#include "vcd_dbus_server.h" +// #include "vcd_dbus.h" +// #include "vcd_dbus_server.h" #include "vcd_tidl.h" #include "vcd_main.h" diff --git a/server/vcd_dbus.h b/server/vcd_dbus.h index c4c4ad9..88fd974 100644 --- a/server/vcd_dbus.h +++ b/server/vcd_dbus.h @@ -30,14 +30,6 @@ int vcd_dbus_close_connection(); int vcd_check_dbus_connection(); -// int vcdc_send_error_signal(int reason, char *err_msg); // No call in anywhere.. - -//int vcdc_send_error_signal_to_app(int pid, int reason, char *err_msg); - -// int vcdc_send_manager_pid(int manager_pid); - -/* for TTS feedback */ -//int vcdc_send_feedback_streaming(int pid, int utt_id, vc_feedback_event_e event, char* buffer, int len); #ifdef __cplusplus } diff --git a/server/vcd_dbus_server.c b/server/vcd_dbus_server.c index d5d4ac1..4556102 100755 --- a/server/vcd_dbus_server.c +++ b/server/vcd_dbus_server.c @@ -16,9 +16,9 @@ #include "vcd_client_data.h" -#include "vcd_dbus.h" +// #include "vcd_dbus.h" #include "vcd_tidl.h" -#include "vcd_dbus_server.h" +// #include "vcd_dbus_server.h" #include "vcd_main.h" #include "vcd_server.h" #include "vcd_config.h" diff --git a/server/vcd_engine_agent.c b/server/vcd_engine_agent.c index 6e45a4d..7b89164 100644 --- a/server/vcd_engine_agent.c +++ b/server/vcd_engine_agent.c @@ -23,7 +23,7 @@ #include "vcd_engine_agent.h" #include "vcd_main.h" #include "vcd_recorder.h" -#include "vcd_dbus.h" +// #include "vcd_dbus.h" #include "vcd_tidl.h" #include "vce_internal.h" diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index 9c4845f..0dd1394 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -21,7 +21,6 @@ #include "vcd_client_data.h" #include "vcd_config.h" -#include "vcd_dbus.h" #include "vcd_tidl.h" #include "vcd_engine_agent.h" #include "vcd_recorder.h" diff --git a/server/vcd_server.c b/server/vcd_server.c index ae36531..a9beceb 100644 --- a/server/vcd_server.c +++ b/server/vcd_server.c @@ -28,7 +28,7 @@ #include "vcd_engine_agent.h" #include "vcd_config.h" #include "vcd_recorder.h" -#include "vcd_dbus.h" +// #include "vcd_dbus.h" #include "vcd_tidl.h" #include "vce_internal.h" @@ -1341,13 +1341,14 @@ int vcd_initialize(vce_request_callback_s *callback) // if (TRUE == __is_default_engine()) { /* Open dbus connection */ - if (0 != vcd_dbus_open_connection()) { - SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to open connection"); - if (TRUE != vcd_finalize()) { - SLOG(LOG_ERROR, TAG_VCD, "[Server Error] Fail to finalize"); - } - return VCD_ERROR_OPERATION_FAILED; - } + // TODO: remove + // if (0 != vcd_dbus_open_connection()) { + // SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to open connection"); + // if (TRUE != vcd_finalize()) { + // SLOG(LOG_ERROR, TAG_VCD, "[Server Error] Fail to finalize"); + // } + // return VCD_ERROR_OPERATION_FAILED; + // } /* Open tidl connection */ if (0 != vcd_tidl_open_connection()) { @@ -1437,9 +1438,10 @@ bool vcd_finalize() } /* Close dbus connection */ - if (0 != vcd_dbus_close_connection()) { - SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to close connection"); - } + // TODO: remove + // if (0 != vcd_dbus_close_connection()) { + // SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Fail to close connection"); + // } /* Close tidl connection */ if (0 != vcd_tidl_close_connection()) { diff --git a/server/vce.c b/server/vce.c index 5353ea0..e4b359b 100644 --- a/server/vce.c +++ b/server/vce.c @@ -19,7 +19,7 @@ #include #include #include -#include "vcd_dbus.h" +// #include "vcd_dbus.h" #include "vcd_tidl.h" #include "vcd_main.h" #include "vcd_server.h" -- 2.7.4