From 2a66366be4c2715870e4859fd5a5db6e8a9dc00a Mon Sep 17 00:00:00 2001
From: chenmengzheAAA <123789350+chenmengzheAAA@users.noreply.github.com>
Date: 星期四, 14 九月 2023 19:00:17 +0800
Subject: [PATCH] Merge pull request #956 from alibaba-damo-academy/chenmengzheAAA-patch-4
---
funasr/runtime/websocket/websocket-server.cpp | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/funasr/runtime/websocket/websocket-server.cpp b/funasr/runtime/websocket/websocket-server.cpp
index 865015a..36af3c2 100644
--- a/funasr/runtime/websocket/websocket-server.cpp
+++ b/funasr/runtime/websocket/websocket-server.cpp
@@ -100,6 +100,7 @@
LOG(INFO) << "buffer.size=" << buffer.size() << ",result json=" << jsonresult.dump();
}else{
+ LOG(INFO) << "Sent empty meg";
websocketpp::lib::error_code ec;
nlohmann::json jsonresult; // result json
jsonresult["text"] = ""; // put result in 'text'
@@ -148,7 +149,6 @@
unique_lock guard_decoder(*(data_msg->thread_lock));
data_msg->msg["is_eof"]=true;
guard_decoder.unlock();
- // data_map.erase(hdl); // remove data vector when connection is closed
LOG(INFO) << "on_close, active connections: " << data_map.size();
}
@@ -157,7 +157,6 @@
websocketpp::connection_hdl hdl,
std::map<websocketpp::connection_hdl, std::shared_ptr<FUNASR_MESSAGE>,
std::owner_less<websocketpp::connection_hdl>>& data_map) {
-
std::shared_ptr<FUNASR_MESSAGE> data_msg = nullptr;
auto it_data = data_map.find(hdl);
if (it_data != data_map.end()) {
@@ -213,8 +212,10 @@
iter++;
}
for (auto hdl : to_remove) {
- remove_hdl(hdl, data_map);
- //LOG(INFO) << "remove one connection ";
+ {
+ unique_lock lock(m_lock);
+ remove_hdl(hdl, data_map);
+ }
}
}
}
@@ -229,7 +230,11 @@
auto it_data = data_map.find(hdl);
if (it_data != data_map.end()) {
msg_data = it_data->second;
+ } else{
+ lock.unlock();
+ return;
}
+
std::shared_ptr<std::vector<char>> sample_data_p = msg_data->samples;
std::shared_ptr<websocketpp::lib::mutex> thread_lock_p = msg_data->thread_lock;
--
Gitblit v1.9.1