saberbud/rest_rpc
1
0
Fork 0
mirror of https://github.com/qicosmos/rest_rpc.git synced 2026-08-29 08:34:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129 from qicosmos/remove_server_mutex

Browse Source
This commit is contained in:
qicosmos
2024-01-29 16:07:41 +08:00
committed by GitHub
parent 439925f620 4fd3a63ad9
commit 07d57356e5
1 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rest_rpc/connection.h
+58 -49
View File
@@ -46,17 +46,15 @@ public:
void response(uint64_t req_id, std::string data, void response(uint64_t req_id, std::string data,
request_type req_type = request_type::req_res) { request_type req_type = request_type::req_res) {
auto len = data.size(); assert(data.size() < MAX_BUF_LEN);
assert(len < MAX_BUF_LEN); auto sp_data = std::make_shared<std::string>(std::move(data));
std::weak_ptr<connection> weak = shared_from_this();
std::unique_lock<std::mutex> lock(write_mtx_); asio::post([this, weak, sp_data, req_id, req_type] {
write_queue_.emplace_back(message_type{ auto conn = weak.lock();
req_id, req_type, std::make_shared<std::string>(std::move(data))}); if (conn) {
if (write_queue_.size() > 1) { response_interal(req_id, std::move(sp_data), req_type);
return; }
} });
write();
} }
template <typename T> void pack_and_response(uint64_t req_id, T data) { template <typename T> void pack_and_response(uint64_t req_id, T data) {
@@ -196,48 +194,61 @@ private:
void read_body(uint32_t func_id, std::size_t size) { void read_body(uint32_t func_id, std::size_t size) {
auto self(this->shared_from_this()); auto self(this->shared_from_this());
async_read( async_read(size, [this, func_id, self](asio::error_code ec,
size, [this, func_id, self](asio::error_code ec, std::size_t length) { std::size_t length) {
cancel_timer(); cancel_timer();
if (!socket_.is_open()) { if (!socket_.is_open()) {
if (on_net_err_) { if (on_net_err_) {
(*on_net_err_)(self, "socket already closed"); (*on_net_err_)(self, "socket already closed");
} }
return; return;
} }
if (!ec) { if (!ec) {
read_head(); read_head();
if (req_type_ == request_type::req_res) { if (req_type_ == request_type::req_res) {
route_result_t ret = router_.route<connection>( route_result_t ret = router_.route<connection>(
func_id, nonstd::string_view{body_.data(), length}, func_id, nonstd::string_view{body_.data(), length},
this->shared_from_this()); this->shared_from_this());
if (delay_) { if (delay_) {
delay_ = false; delay_ = false;
} else {
response(req_id_, std::move(ret.result));
}
} else if (req_type_ == request_type::sub_pub) {
try {
msgpack_codec codec;
auto p = codec.unpack<std::tuple<std::string, std::string>>(
body_.data(), length);
callback_(std::move(std::get<0>(p)), std::move(std::get<1>(p)),
this->shared_from_this());
} catch (const std::exception &ex) {
print(ex);
if (on_net_err_) {
(*on_net_err_)(self, ex.what());
}
}
}
} else { } else {
response_interal(
req_id_, std::make_shared<std::string>(std::move(ret.result)));
}
} else if (req_type_ == request_type::sub_pub) {
try {
msgpack_codec codec;
auto p = codec.unpack<std::tuple<std::string, std::string>>(
body_.data(), length);
callback_(std::move(std::get<0>(p)), std::move(std::get<1>(p)),
this->shared_from_this());
} catch (const std::exception &ex) {
print(ex);
if (on_net_err_) { if (on_net_err_) {
(*on_net_err_)(self, ec.message()); (*on_net_err_)(self, ex.what());
} }
} }
}); }
} else {
if (on_net_err_) {
(*on_net_err_)(self, ec.message());
}
}
});
}
void response_interal(uint64_t req_id, std::shared_ptr<std::string> data,
request_type req_type = request_type::req_res) {
assert(data->size() < MAX_BUF_LEN);
write_queue_.emplace_back(message_type{req_id, req_type, std::move(data)});
if (write_queue_.size() > 1) {
return;
}
write();
} }
void write() { void write() {
@@ -269,7 +280,6 @@ private:
return; return;
} }
std::unique_lock<std::mutex> lock(write_mtx_);
write_queue_.pop_front(); write_queue_.pop_front();
if (!write_queue_.empty()) { if (!write_queue_.empty()) {
@@ -414,7 +424,6 @@ private:
rpc_header header_; rpc_header header_;
uint32_t write_size_ = 0; uint32_t write_size_ = 0;
std::mutex write_mtx_;
asio::steady_timer timer_; asio::steady_timer timer_;
std::size_t timeout_seconds_; std::size_t timeout_seconds_;