From 1ed24d6ce99f0a35344f8b615024bc74ea81972d Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Thu, 5 Nov 2020 16:49:46 +0900 Subject: [PATCH] Add logs for checking clients in ttsd_data Change-Id: Ifbfe0178ffb0b3880b1de9f53f23ea38fa3fe6a2 Signed-off-by: sooyeon.kim --- server/ttsd_data.cpp | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp index 7d3b3bb..2b649b0 100644 --- a/server/ttsd_data.cpp +++ b/server/ttsd_data.cpp @@ -168,6 +168,9 @@ int ttsd_data_new_client(int pid, int uid) #ifdef DATA_DEBUG __data_show_list(); #endif + + SLOG(LOG_INFO, tts_tag(), "[DATA INFO] New client. pid(%d), uid(%d)", app.pid, app.uid); + return TTSD_ERROR_NONE; } @@ -192,6 +195,9 @@ int ttsd_data_delete_client(int uid) #ifdef DATA_DEBUG __data_show_list(); #endif + + SLOG(LOG_INFO, tts_tag(), "[DATA INFO] Client is deleted. uid(%d), index(%d)", uid, index); + return TTSD_ERROR_NONE; } @@ -201,16 +207,22 @@ int ttsd_data_is_client(int uid) for (int i = 0; i < vsize; i++) { if(g_app_list[i].uid == uid) { + SLOG(LOG_INFO, tts_tag(), "[DATA INFO] uid(%d), index(%d), g_app_list size(%d)", uid, i, vsize); return i; } } + SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] There is no corresponding client. uid(%d)", uid); + return -1; } int ttsd_data_get_client_count() { - return g_app_list.size(); + int num_client = g_app_list.size(); + SLOG(LOG_INFO, tts_tag(), "[DATA INFO] Number of clients(%d)", num_client); + + return num_client; } int ttsd_data_get_pid(int uid) @@ -224,7 +236,7 @@ int ttsd_data_get_pid(int uid) return -1; } - SLOG(LOG_INFO, tts_tag(), "[DATA INFO] uid(%d), pid(%d)", uid, g_app_list[index].pid); + SLOG(LOG_INFO, tts_tag(), "[DATA INFO] uid(%d), pid(%d), index(%d)", uid, g_app_list[index].pid, index); return g_app_list[index].pid; } @@ -344,16 +356,25 @@ int ttsd_data_add_speak_data(int uid, speak_data_s* data) std::list::iterator iter; + SLOG(LOG_INFO, tts_tag(), "[DATA INFO] uid(%d), index(%d), m_speak_data size(%d)", uid, index, g_app_list[index].m_speak_data.size()); + try { - iter = g_app_list[index].m_speak_data.insert(g_app_list[index].m_speak_data.end(), data); + if (index < g_app_list.size()) { + SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), text(%s), lang(%s), vctype(%d), speed(%d)", + *iter, (*iter)->utt_id, (*iter)->text, (*iter)->lang, (*iter)->vctype, (*iter)->speed); + + iter = g_app_list[index].m_speak_data.insert(g_app_list[index].m_speak_data.end(), data); + } else { + SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] Fail to insert data into m_speak_data. index(%d)", index); + } } catch (const std::bad_alloc&) { SLOG(LOG_ERROR, tts_tag(), "[DATA][ERROR] Fail to insert m_speak_data (bad_alloc)"); pthread_mutex_unlock(&g_speak_data_mutex); return TTSD_ERROR_OUT_OF_MEMORY; } - SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), text(%s), lang(%s), vctype(%d), speed(%d)", - *iter, (*iter)->utt_id, (*iter)->text, (*iter)->lang, (*iter)->vctype, (*iter)->speed); +// SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), text(%s), lang(%s), vctype(%d), speed(%d)", +// *iter, (*iter)->utt_id, (*iter)->text, (*iter)->lang, (*iter)->vctype, (*iter)->speed); if (1 == data->utt_id) g_app_list[index].utt_id_stopped = 0; @@ -430,15 +451,22 @@ int ttsd_data_add_sound_data(int uid, sound_data_s* data) std::list::iterator iter; + SLOG(LOG_INFO, tts_tag(), "[DATA INFO] uid(%d), index(%d), m_wav_data size(%d)", uid, index, g_app_list[index].m_wav_data.size()); + try { - iter = g_app_list[index].m_wav_data.insert(g_app_list[index].m_wav_data.end(), data); + if (index < g_app_list.size()) { + SLOG(LOG_ERROR, tts_tag(), "[DATA INFO] [%p] utt_id(%d), data(%p) data size(%d), type(%d)", *iter, (*iter)->utt_id, (*iter)->data, (*iter)->data_size, (*iter)->audio_type); + iter = g_app_list[index].m_wav_data.insert(g_app_list[index].m_wav_data.end(), data); + } else { + SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] Fail to insert data into m_wav_data. index(%d)", index); + } } catch (const std::bad_alloc&) { SLOG(LOG_ERROR, tts_tag(), "[DATA][ERROR] Fail to insert m_sound_data (bad_alloc)"); pthread_mutex_unlock(&g_sound_data_mutex); return TTSD_ERROR_OUT_OF_MEMORY; } - SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), data(%p) data size(%d), type(%d)", *iter, (*iter)->utt_id, (*iter)->data, (*iter)->data_size, (*iter)->audio_type); +// SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), data(%p) data size(%d), type(%d)", *iter, (*iter)->utt_id, (*iter)->data, (*iter)->data_size, (*iter)->audio_type); #ifdef DATA_DEBUG __data_show_sound_list(index); -- 2.7.4