zhaomingwork
2023-08-11 b2ab45f70b547440a57ffa9330418dda846cd8a5
use asio strand to keep the order of data (#838)

Co-authored-by: Yabin Li <wucong.lyb@alibaba-inc.com>
2个文件已修改
17 ■■■■ 已修改文件
funasr/runtime/websocket/websocket-server-2pass.cpp 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
funasr/runtime/websocket/websocket-server-2pass.h 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
funasr/runtime/websocket/websocket-server-2pass.cpp
@@ -203,6 +203,12 @@
    data_msg->msg["is_eof"]=false; // if this connection is closed
    data_msg->punc_cache =
        std::make_shared<std::vector<std::vector<std::string>>>(2);
      data_msg->strand_ =    std::make_shared<asio::io_context::strand>(io_decoder_);
    // std::vector<int> chunk_size = {5, 10, 5};  //TODO, need get from client
    // FUNASR_HANDLE tpass_online_handle =
    //     FunTpassOnlineInit(tpass_handle, chunk_size);
    // data_msg->tpass_online_handle = tpass_online_handle;
    data_map.emplace(hdl, data_msg);
    // LOG(INFO) << "on_open, active connections: " << data_map.size();
  }catch (std::exception const& e) {
@@ -294,7 +300,8 @@
    }
    for (auto hdl : to_remove) {
      remove_hdl(hdl, data_map);
      // LOG(INFO) << "remove one connection ";
      //LOG(INFO) << "remove one connection ";
    }
  }
}
@@ -360,8 +367,8 @@
        // if it is in final message, post the sample_data to decode
        try{
          asio::post(
              io_decoder_,
          msg_data->strand_->post(
              std::bind(&WebSocketServer::do_decoder, this,
                        std::move(*(sample_data_p.get())), std::move(hdl),
                        std::ref(msg_data->msg), std::ref(*(punc_cache_p.get())),
@@ -400,7 +407,7 @@
          try{
            // post to decode
            asio::post(io_decoder_,
            msg_data->strand_->post(
                      std::bind(&WebSocketServer::do_decoder, this,
                                std::move(subvector), std::move(hdl),
                                std::ref(msg_data->msg),
funasr/runtime/websocket/websocket-server-2pass.h
@@ -58,7 +58,7 @@
  FUNASR_HANDLE tpass_online_handle=NULL;
  std::string online_res = "";
  std::string tpass_res = "";
  std::shared_ptr<asio::io_context::strand>  strand_; // for data execute in order
} FUNASR_MESSAGE;
// See https://wiki.mozilla.org/Security/Server_Side_TLS for more details about