From 2f1dca6913d814abe5cfd0481f52a202a22d1e0a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 1 May 2024 19:37:02 +0800 Subject: [PATCH] 1 --- third_party/a8/a8/constant.cc | 16 ++++++++++++++++ third_party/a8/a8/tcpclient.cc | 14 ++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 third_party/a8/a8/constant.cc diff --git a/third_party/a8/a8/constant.cc b/third_party/a8/a8/constant.cc new file mode 100644 index 0000000..05ee099 --- /dev/null +++ b/third_party/a8/a8/constant.cc @@ -0,0 +1,16 @@ +module; + +export module a8m.constant; + +export namespace a8m { + constexpr int INVALID_FD() { return -1; } + constexpr int INVALID_SOCKET() { return -1; } + constexpr int INVALID_SOCKET_HANDLE() { return 0; } + + constexpr int TIMER_EXEC_EVENT() { return 1; } + constexpr int TIMER_DELETE_EVENT() { return 2; } + constexpr int TIMER_DESTORY_EVENT() { return 3; } + constexpr int TIMER_USER_EVENT() { return 66; } + + constexpr float A8_PI() { return 3.1415926f; } +} diff --git a/third_party/a8/a8/tcpclient.cc b/third_party/a8/a8/tcpclient.cc index 89d3a70..cbc10e6 100644 --- a/third_party/a8/a8/tcpclient.cc +++ b/third_party/a8/a8/tcpclient.cc @@ -15,6 +15,8 @@ const int MAX_RECV_BUFFERSIZE = 1024 * 64; +import a8m.constant; + namespace a8 { TcpClient::TcpClient(const std::string& remote_ip, int remote_port) @@ -53,7 +55,7 @@ namespace a8 bool TcpClient::IsActive() { - return socket_ != a8::INVALID_SOCKET; + return socket_ != a8m::INVALID_SOCKET(); } bool TcpClient::Connected() @@ -103,7 +105,7 @@ namespace a8 bool TcpClient::ActiveStart() { socket_ = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (INVALID_SOCKET == socket_) { + if (a8m::INVALID_SOCKET() == socket_) { if (on_error) { on_error(this, errno); } @@ -119,7 +121,7 @@ namespace a8 on_error(this, errno); } ::close(socket_); - socket_ = INVALID_SOCKET; + socket_ = a8m::INVALID_SOCKET(); return false; } //set nodelay @@ -145,7 +147,7 @@ namespace a8 void TcpClient::ActiveStop() { connected_ = false; - if (socket_ != INVALID_SOCKET) { + if (socket_ != a8m::INVALID_SOCKET()) { shutdown(socket_, 2); ::close(socket_); } @@ -155,7 +157,7 @@ namespace a8 delete worker_thread_; worker_thread_ = nullptr; } - socket_ = INVALID_SOCKET; + socket_ = a8m::INVALID_SOCKET(); } void TcpClient::WorkerThreadProc() @@ -193,7 +195,7 @@ namespace a8 senderthread->join(); delete senderthread; senderthread = nullptr; - socket_ = INVALID_SOCKET; + socket_ = a8m::INVALID_SOCKET(); } void TcpClient::SenderThreadProc()