X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=client%2Fstt_dbus.c;h=a70726408ab5a2373b2930fc8e9496d0b25c0cda;hb=e6e5e98c676315c8d51c52b643617d285b476f7d;hp=5f3a6a8ce0c5be689af8cd8956fceda9f7b34857;hpb=7258a8b5059922c43bd5d3d630f535bf89bf146b;p=platform%2Fcore%2Fuifw%2Fstt.git diff --git a/client/stt_dbus.c b/client/stt_dbus.c index 5f3a6a8..a707264 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -543,7 +543,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle if (NULL != temp_char) { temp_result[i] = strdup(temp_char); - SLOG(LOG_DEBUG, TAG_STTC, "result[%d] : %s", i, temp_result[i]); + SECURE_SLOG(LOG_DEBUG, TAG_STTC, "result[%d] : %s", i, temp_result[i]); } } @@ -615,6 +615,26 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle SLOG(LOG_DEBUG, TAG_STTC, " "); } /* STTD_METHOD_SPEECH_STATUS */ + else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) { + SLOG(LOG_DEBUG, TAG_STTC, "===== Owner Changed"); + DBusError err; + dbus_error_init(&err); + + /* remove a rule for daemon error */ + char rule_err[256] = {0, }; + snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface); + dbus_bus_remove_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); + dbus_error_free(&err); + } + + __stt_cb_error(-1, STT_ERROR_SERVICE_RESET, "Daemon Reset"); + SLOG(LOG_DEBUG, TAG_STTC, "====="); + SLOG(LOG_DEBUG, TAG_STTC, " "); + } /* NameOwnerChanged */ + else { SLOG(LOG_DEBUG, TAG_STTC, "Message is NOT valid"); dbus_message_unref(msg); @@ -628,6 +648,20 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle return ECORE_CALLBACK_RENEW; } +static void __stt_dbus_connection_free() +{ + if (NULL != g_conn_listener) { + dbus_connection_close(g_conn_listener); + dbus_connection_unref(g_conn_listener); + g_conn_listener = NULL; + } + if (NULL != g_conn_sender) { + dbus_connection_close(g_conn_sender); + dbus_connection_unref(g_conn_sender); + g_conn_sender = NULL; + } +} + int stt_dbus_open_connection() { if (NULL != g_conn_sender && NULL != g_conn_listener) { @@ -667,9 +701,14 @@ int stt_dbus_open_connection() if (NULL == g_conn_listener) { SLOG(LOG_ERROR, TAG_STTC, "Fail to get dbus connection"); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } + dbus_connection_set_exit_on_disconnect(g_conn_listener, false); + + dbus_connection_set_exit_on_disconnect(g_conn_listener, false); + int pid = getpid(); char service_name[64]; @@ -696,12 +735,14 @@ int stt_dbus_open_connection() if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); dbus_error_free(&err); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } int fd = 0; if (true != dbus_connection_get_unix_fd(g_conn_listener, &fd)) { SLOG(LOG_ERROR, TAG_STTC, "Fail to get fd from dbus"); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } else { SLOG(LOG_DEBUG, TAG_STTC, "Get fd from dbus : %d", fd); @@ -710,6 +751,7 @@ int stt_dbus_open_connection() g_fd_handler = ecore_main_fd_handler_add(fd, ECORE_FD_READ, (Ecore_Fd_Cb)listener_event_callback, g_conn_listener, NULL, NULL); if (NULL == g_fd_handler) { SLOG(LOG_ERROR, TAG_STTC, "fail to get fd handler from ecore"); + __stt_dbus_connection_free(); return STT_ERROR_OPERATION_FAILED; } @@ -726,27 +768,21 @@ int stt_dbus_close_connection() g_fd_handler = NULL; } - int pid = getpid(); + if (NULL != g_conn_listener) { + int pid = getpid(); - char service_name[64]; - memset(service_name, '\0', 64); - snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); + char service_name[64]; + memset(service_name, '\0', 64); + snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); - dbus_bus_release_name(g_conn_listener, service_name, &err); - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Release name Error (%s)", err.message); - dbus_error_free(&err); + dbus_bus_release_name(g_conn_listener, service_name, &err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Release name Error (%s)", err.message); + dbus_error_free(&err); + } } - dbus_connection_close(g_conn_sender); - dbus_connection_close(g_conn_listener); - - dbus_connection_unref(g_conn_sender); - dbus_connection_unref(g_conn_listener); - - g_conn_sender = NULL; - g_conn_listener = NULL; - + __stt_dbus_connection_free(); __stt_dbus_service_free(); return 0; @@ -754,6 +790,18 @@ int stt_dbus_close_connection() int stt_dbus_reconnect() { + if (!g_conn_sender || !g_conn_listener) { + stt_dbus_close_connection(); + + if (0 != stt_dbus_open_connection()) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to reconnect"); + return -1; + } + + SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] Reconnect"); + return 0; + } + bool sender_connected = dbus_connection_get_is_connected(g_conn_sender); bool listener_connected = dbus_connection_get_is_connected(g_conn_listener); SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] Sender(%s) Listener(%s)", @@ -858,9 +906,9 @@ int stt_dbus_request_hello(int uid) } else { SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] dbus: is_exist: False"); msg = dbus_message_new_method_call( - STT_SERVER_CUSTOM_SERVICE_NAME, - STT_SERVER_CUSTOM_SERVICE_OBJECT_PATH, - STT_SERVER_CUSTOM_SERVICE_INTERFACE, + STT_SERVER_CUSTOM_SERVICE_NAME, + STT_SERVER_CUSTOM_SERVICE_OBJECT_PATH, + STT_SERVER_CUSTOM_SERVICE_INTERFACE, STT_METHOD_HELLO); } } @@ -868,16 +916,17 @@ int stt_dbus_request_hello(int uid) } if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message"); - return STT_ERROR_OPERATION_FAILED; +// SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message"); + result = stt_dbus_reconnect(); + if (0 != result) + return STT_ERROR_OPERATION_FAILED; } - - if (g_conn_sender) { - result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, -1, &err); dbus_message_unref(msg); if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get arguments error (%s)", err.message); dbus_error_free(&err); } @@ -900,6 +949,7 @@ int stt_dbus_request_hello(int uid) } } else { SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + stt_dbus_reconnect(); result = STT_ERROR_OPERATION_FAILED; } @@ -965,6 +1015,27 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credenti if (0 == result) { SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt initialize : result = %d, silence(%d), credential(%d)", result, *silence_supported, *credential_needed); + + stt_client_s* client = stt_client_get_by_uid(uid); + if (NULL == client) { + SLOG(LOG_ERROR, TAG_STTC, "Fail to get STT client"); + return STT_ERROR_OPERATION_FAILED; + } + + if (STT_ERROR_SERVICE_RESET != client->reason) { + /* add a rule for daemon error */ + char rule_err[256] = {0, }; + + snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface); + dbus_bus_add_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); + dbus_error_free(&err); + return STT_ERROR_OPERATION_FAILED; + } + } } else { SLOG(LOG_ERROR, TAG_STTC, "<<<< stt initialize : result = %d", result); } @@ -987,12 +1058,25 @@ int stt_dbus_request_finalize(int uid) { DBusMessage* msg; + DBusError err; + dbus_error_init(&err); + + /* remove a rule for daemon error */ + char rule_err[256] = {0, }; + snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface); + dbus_bus_remove_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); + dbus_error_free(&err); + } + SLOG(LOG_DEBUG, TAG_STTC, "[dbus_info] service name: %s, service object: %s, service interface: %s", g_server_service_name, g_server_service_object, g_server_service_interface); msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_FINALIZE); if (NULL == msg) { @@ -1004,9 +1088,6 @@ int stt_dbus_request_finalize(int uid) dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); - DBusError err; - dbus_error_init(&err); - DBusMessage* result_msg; int result = STT_ERROR_OPERATION_FAILED; @@ -1018,7 +1099,7 @@ int stt_dbus_request_finalize(int uid) } if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, + dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID); @@ -1049,9 +1130,9 @@ int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* si DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_SET_CURRENT_ENGINE); @@ -1084,8 +1165,8 @@ int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* si int int_silence_supported = 0; int int_credential_needed = 0; - dbus_message_get_args(result_msg, &err, - DBUS_TYPE_INT32, &result, + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, DBUS_TYPE_INT32, &int_silence_supported, DBUS_TYPE_INT32, &int_credential_needed, DBUS_TYPE_INVALID); @@ -1126,9 +1207,9 @@ int stt_dbus_request_check_app_agreed(int uid, const char* appid, bool* value) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_CHECK_APP_AGREED); if (NULL == msg) { @@ -1195,9 +1276,9 @@ int stt_dbus_request_get_support_langs(int uid, stt_h stt, stt_supported_languag DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_GET_SUPPORT_LANGS); if (NULL == msg) { @@ -1280,9 +1361,9 @@ int stt_dbus_request_get_default_lang(int uid, char** language) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_GET_CURRENT_LANG); if (NULL == msg) { @@ -1348,9 +1429,9 @@ int stt_dbus_request_set_private_data(int uid, const char* key, const char* data DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_SET_PRIVATE_DATA); if (NULL == msg) { @@ -1418,9 +1499,9 @@ int stt_dbus_request_get_private_data(int uid, const char* key, char** data) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_GET_PRIVATE_DATA); if (NULL == msg) { @@ -1494,9 +1575,9 @@ int stt_dbus_request_is_recognition_type_supported(int uid, const char* type, bo DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_IS_TYPE_SUPPORTED); if (NULL == msg) { @@ -1563,9 +1644,9 @@ int stt_dbus_request_set_start_sound(int uid, const char* file) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_SET_START_SOUND); if (NULL == msg) { @@ -1624,9 +1705,9 @@ int stt_dbus_request_unset_start_sound(int uid) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_UNSET_START_SOUND); if (NULL == msg) { @@ -1689,9 +1770,9 @@ int stt_dbus_request_set_stop_sound(int uid, const char* file) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_SET_STOP_SOUND); if (NULL == msg) { @@ -1750,9 +1831,9 @@ int stt_dbus_request_unset_stop_sound(int uid) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_UNSET_STOP_SOUND); if (NULL == msg) { @@ -1816,9 +1897,9 @@ int stt_dbus_request_start(int uid, const char* lang, const char* type, int sile /* create a signal & check for errors */ msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_START); if (NULL == msg) { @@ -1921,9 +2002,9 @@ int stt_dbus_request_stop(int uid) /* create a signal & check for errors */ msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_STOP); if (NULL == msg) { @@ -1933,8 +2014,8 @@ int stt_dbus_request_stop(int uid) SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt stop : uid(%d)", uid); } - dbus_message_append_args(msg, - DBUS_TYPE_INT32, &uid, + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); #if 1 if (g_conn_sender) { @@ -2001,9 +2082,9 @@ int stt_dbus_request_cancel(int uid) /* create a signal & check for errors */ msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_CANCEL); if (NULL == msg) { @@ -2013,8 +2094,8 @@ int stt_dbus_request_cancel(int uid) SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt cancel : uid(%d)", uid); } - dbus_message_append_args(msg, - DBUS_TYPE_INT32, &uid, + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); #if 1 if (g_conn_sender) { @@ -2074,3 +2155,118 @@ int stt_dbus_request_cancel(int uid) return result; #endif } + +int stt_dbus_request_start_file(int uid, const char* lang, const char* type, int silence, const char* appid, const char* credential, const char* filepath, stt_audio_type_e audio_type, int sample_rate) +{ + if (NULL == lang || NULL == type || NULL == appid) { + SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); + return STT_ERROR_INVALID_PARAMETER; + } + + DBusMessage* msg; + + /* create a signal & check for errors */ + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_START_FILE); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt start file : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt start file : uid(%d), language(%s), type(%s), appid(%s), filepath(%s), audio_type(%d), sample_rate(%d)", uid, lang, type, appid, filepath, audio_type, sample_rate); + } + + char *temp = NULL; + if (NULL == credential) { + temp = strdup("NULL"); + } else { + temp = strdup(credential); + } + + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_STRING, &lang, + DBUS_TYPE_STRING, &type, + DBUS_TYPE_INT32, &silence, + DBUS_TYPE_STRING, &appid, + DBUS_TYPE_STRING, &temp, + DBUS_TYPE_STRING, &filepath, + DBUS_TYPE_INT32, &audio_type, + DBUS_TYPE_INT32, &sample_rate, + DBUS_TYPE_INVALID); + if (g_conn_sender) { + dbus_message_set_no_reply(msg, TRUE); + + if (!dbus_connection_send(g_conn_sender, msg, NULL)) { + SLOG(LOG_ERROR, TAG_STTC, "[Dbus ERROR] <<<< stt start message : Out Of Memory !"); + if (NULL != temp) { + free(temp); + temp = NULL; + } + return STT_ERROR_OUT_OF_MEMORY; + } else { + dbus_connection_flush(g_conn_sender); + } + + dbus_message_unref(msg); + + } else { + SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + if (NULL != temp) { + free(temp); + temp = NULL; + } + return STT_ERROR_OPERATION_FAILED; + } + + if (NULL != temp) { + free(temp); + temp = NULL; + } + return 0; +} + +int stt_dbus_request_cancel_file(int uid) +{ + DBusMessage* msg; + + /* create a signal & check for errors */ + msg = dbus_message_new_method_call( + g_server_service_name, + g_server_service_object, + g_server_service_interface, + STT_METHOD_CANCEL_FILE); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTC, ">>>> stt cancel file : Fail to make message"); + return STT_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt cancel file : uid(%d)", uid); + } + + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, + DBUS_TYPE_INVALID); + + if (g_conn_sender) { + dbus_message_set_no_reply(msg, TRUE); + + if (!dbus_connection_send(g_conn_sender, msg, NULL)) { + SLOG(LOG_ERROR, TAG_STTC, "[Dbus ERROR] <<<< stt stop message : Out Of Memory !"); + return STT_ERROR_OUT_OF_MEMORY; + } else { + dbus_connection_flush(g_conn_sender); + } + + dbus_message_unref(msg); + } else { + SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + return STT_ERROR_OPERATION_FAILED; + } + + return 0; +} +