Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2025-01-03 17:29:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

P2PServer: removed an unnecessary lock

Browse source
This commit is contained in:
SChernykh 2022-11-22 09:57:50 +01:00
parent 3f66975e1b
commit 7eec4d742c
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p2p_server.cpp
View file

@ -86,7 +86,6 @@ P2PServer::P2PServer(p2pool* pool)
set_max_outgoing_peers(params.m_maxOutgoingPeers); set_max_outgoing_peers(params.m_maxOutgoingPeers);
set_max_incoming_peers(params.m_maxIncomingPeers); set_max_incoming_peers(params.m_maxIncomingPeers);
uv_mutex_init_checked(&m_rngLock);
uv_mutex_init_checked(&m_blockLock); uv_mutex_init_checked(&m_blockLock);
uv_mutex_init_checked(&m_peerListLock); uv_mutex_init_checked(&m_peerListLock);
uv_mutex_init_checked(&m_broadcastLock); uv_mutex_init_checked(&m_broadcastLock);
@ -142,7 +141,6 @@ P2PServer::~P2PServer()
{ {
shutdown_tcp(); shutdown_tcp();
uv_mutex_destroy(&m_rngLock);
uv_mutex_destroy(&m_blockLock); uv_mutex_destroy(&m_blockLock);
uv_mutex_destroy(&m_peerListLock); uv_mutex_destroy(&m_peerListLock);
uv_mutex_destroy(&m_broadcastLock); uv_mutex_destroy(&m_broadcastLock);
@ -365,10 +363,9 @@ void P2PServer::update_peer_connections()
void P2PServer::update_peer_list() void P2PServer::update_peer_list()
{ {
const uint64_t cur_time = seconds_since_epoch();
MutexLock lock(m_clientsListLock); MutexLock lock(m_clientsListLock);
const uint64_t cur_time = seconds_since_epoch();
for (P2PClient* client = static_cast<P2PClient*>(m_connectedClientsList->m_next); client != m_connectedClientsList; client = static_cast<P2PClient*>(client->m_next)) { for (P2PClient* client = static_cast<P2PClient*>(m_connectedClientsList->m_next); client != m_connectedClientsList; client = static_cast<P2PClient*>(client->m_next)) {
if (client->is_good() && (cur_time >= client->m_nextOutgoingPeerListRequest)) { if (client->is_good() && (cur_time >= client->m_nextOutgoingPeerListRequest)) {
send_peer_list_request(client, cur_time); send_peer_list_request(client, cur_time);
@ -934,7 +931,9 @@ void P2PServer::on_broadcast()
uint64_t P2PServer::get_random64() uint64_t P2PServer::get_random64()
{ {
MutexLock lock(m_rngLock); if (!server_event_loop_thread) {
LOGERR(1, "get_random64() was called from another thread, this is not thread safe");
}
return m_rng(); return m_rng();
} }

1
src/p2p_server.h
View file

@ -189,7 +189,6 @@ private:
void remove_peer_from_list(P2PClient* client); void remove_peer_from_list(P2PClient* client);
void remove_peer_from_list(const raw_ip& ip); void remove_peer_from_list(const raw_ip& ip);
uv_mutex_t m_rngLock;
std::mt19937_64 m_rng; std::mt19937_64 m_rng;
uv_mutex_t m_blockLock; uv_mutex_t m_blockLock;