fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: socket init/close 的一些逻辑调整

Browse Source
This commit is contained in:
zzyyyl
2022-09-18 19:20:00 +08:00
parent 9e9395f5e8
commit a724e97c78
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/MeoAssistant/Controller.cpp
View File

@@ -561,13 +561,6 @@ void asst::Controller::clear_info() noexcept
m_height = 0;
m_control_scale = 1.0;
m_scale_size = { WindowWidthDefault, WindowHeightDefault };
#ifdef _WIN32
if (m_server_sock) {
::closesocket(m_server_sock);
m_server_sock = 0U;
}
m_server_started = false;
#endif
}
int asst::Controller::push_cmd(const std::string& cmd)
@@ -580,14 +573,27 @@ int asst::Controller::push_cmd(const std::string& cmd)
return static_cast<int>(++m_push_id);
}
void asst::Controller::try_to_close_socket() noexcept
{
#ifdef _WIN32
if (m_server_sock != INVALID_SOCKET) {
::closesocket(m_server_sock);
m_server_sock = INVALID_SOCKET;
}
m_server_started = false;
#endif
}
std::optional<unsigned short> asst::Controller::try_to_init_socket(const std::string& local_address)
{
LogTraceFunction;
#ifdef _WIN32
m_server_sock = ::socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (m_server_sock == INVALID_SOCKET) {
return std::nullopt;
m_server_sock = ::socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (m_server_sock == INVALID_SOCKET) {
return std::nullopt;
}
}
DWORD dummy;
@@ -1235,13 +1241,7 @@ bool asst::Controller::try_release()
bool asst::Controller::release()
{
#ifdef _WIN32
if (m_server_sock) {
m_server_started = false;
::closesocket(m_server_sock);
m_server_sock = 0U;
}
#endif
try_to_close_socket();
#ifndef _WIN32
if (m_child)

5
src/MeoAssistant/Controller.h
View File

@@ -81,11 +81,12 @@ namespace asst
bool release();
void set_inited() noexcept;
void try_to_close_socket() noexcept;
std::optional<unsigned short> try_to_init_socket(const std::string& local_address);
using DecodeFunc = std::function<bool(std::string_view)>;
bool screencap();
bool screencap(const std::string& cmd, const DecodeFunc& decode_func, bool by_nc = false);
bool screencap(const std::string& cmd, const DecodeFunc& decode_func, bool by_socket = false);
void clear_lf_info();
cv::Mat get_resized_image() const;
@@ -110,7 +111,7 @@ namespace asst
ASST_AUTO_DEDUCED_ZERO_INIT_START
WSADATA m_wsa_data {};
SOCKET m_server_sock = 0ULL;
SOCKET m_server_sock = INVALID_SOCKET;
sockaddr_in m_server_addr {};
LPFN_ACCEPTEX m_AcceptEx = nullptr;
ASST_AUTO_DEDUCED_ZERO_INIT_END