添加连接管理的互斥锁,增强多线程环境下的连接安全性;更新TCPClient以支持断开回调
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#include "tcp_client.h"
|
||||
#include <iostream>
|
||||
|
||||
TCPClient::TCPClient(const std::string& host, int port) : host_(host), port_(port), connected_(false), socket_(std::make_shared<tcp::socket>(io_context_)), work_(boost::asio::make_work_guard(io_context_)), buffer_(1024) {}
|
||||
TCPClient::TCPClient(const std::string& host, int port) : host_(host), port_(port), connected_(false), disconnected_(false), socket_(std::make_shared<tcp::socket>(io_context_)), work_(boost::asio::make_work_guard(io_context_)), buffer_(1024) {}
|
||||
|
||||
TCPClient::~TCPClient() { disconnect(); }
|
||||
|
||||
@@ -26,6 +26,11 @@ bool TCPClient::connect() {
|
||||
}
|
||||
|
||||
void TCPClient::disconnect() {
|
||||
if (disconnected_) return;
|
||||
disconnected_ = true;
|
||||
if (disconnectCallback_) {
|
||||
disconnectCallback_();
|
||||
}
|
||||
connected_ = false;
|
||||
io_context_.stop();
|
||||
if (clientThread_.joinable()) {
|
||||
@@ -59,6 +64,10 @@ void TCPClient::setReceiveCallback(std::function<void(const char*, size_t)> call
|
||||
receiveCallbackBytes_ = callback;
|
||||
}
|
||||
|
||||
void TCPClient::setDisconnectCallback(std::function<void()> callback) {
|
||||
disconnectCallback_ = callback;
|
||||
}
|
||||
|
||||
void TCPClient::start_read() {
|
||||
socket_->async_read_some(boost::asio::buffer(buffer_), [this](const boost::system::error_code& error, std::size_t bytes_transferred) {
|
||||
handle_read(error, bytes_transferred);
|
||||
|
||||
@@ -21,6 +21,7 @@ public:
|
||||
void send(const char* data, size_t size);
|
||||
void setReceiveCallback(std::function<void(const std::string&)> callback);
|
||||
void setReceiveCallback(std::function<void(const char*, size_t)> callback);
|
||||
void setDisconnectCallback(std::function<void()> callback);
|
||||
|
||||
private:
|
||||
void start_read();
|
||||
@@ -29,6 +30,7 @@ private:
|
||||
std::string host_;
|
||||
int port_;
|
||||
bool connected_;
|
||||
bool disconnected_;
|
||||
boost::asio::io_context io_context_;
|
||||
boost::asio::executor_work_guard<boost::asio::io_context::executor_type> work_;
|
||||
std::shared_ptr<tcp::socket> socket_;
|
||||
@@ -36,5 +38,6 @@ private:
|
||||
std::mutex socketMutex_;
|
||||
std::function<void(const std::string&)> receiveCallback_;
|
||||
std::function<void(const char*, size_t)> receiveCallbackBytes_;
|
||||
std::function<void()> disconnectCallback_;
|
||||
std::vector<char> buffer_;
|
||||
};
|
||||
Reference in New Issue
Block a user