Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2025-01-09 12:19:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

TCPServer: check if loop thread is running before waiting for it

Browse source
This commit is contained in:
SChernykh 2023-05-01 20:13:57 +02:00
parent fcb62894a5
commit 8a222d5e75
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/tcp_server.cpp
View file

@ -27,6 +27,7 @@ TCPServer::TCPServer(int default_backlog, allocate_client_callback allocate_new_
: m_allocateNewClient(allocate_new_client) : m_allocateNewClient(allocate_new_client)
, m_defaultBacklog(default_backlog) , m_defaultBacklog(default_backlog)
, m_loopThread{} , m_loopThread{}
, m_loopThreadRunning(false)
#ifdef WITH_UPNP #ifdef WITH_UPNP
, m_portMapping(0) , m_portMapping(0)
#endif #endif
@ -473,7 +474,9 @@ void TCPServer::shutdown_tcp()
} }
#endif #endif
uv_thread_join(&m_loopThread); if (m_loopThreadRunning.load()) {
uv_thread_join(&m_loopThread);
}
uv_mutex_destroy(&m_bansLock); uv_mutex_destroy(&m_bansLock);
@ -573,6 +576,9 @@ bool TCPServer::send_internal(Client* client, Callback<size_t, uint8_t*, size_t>
void TCPServer::loop(void* data) void TCPServer::loop(void* data)
{ {
TCPServer* server = static_cast<TCPServer*>(data); TCPServer* server = static_cast<TCPServer*>(data);
server->m_loopThreadRunning.exchange(true);
ON_SCOPE_LEAVE([server]() { server->m_loopThreadRunning.exchange(false); });
log_category_prefix = server->get_category(); log_category_prefix = server->get_category();
LOGINFO(1, "event loop started"); LOGINFO(1, "event loop started");

1
src/tcp_server.h
View file

@ -149,6 +149,7 @@ protected:
int m_defaultBacklog; int m_defaultBacklog;
uv_thread_t m_loopThread; uv_thread_t m_loopThread;
std::atomic<bool> m_loopThreadRunning;
static void loop(void* data); static void loop(void* data);