Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-11-17 00:07:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

P2PServer: ask peers about unknown blocks only once

Browse source
This commit is contained in:
SChernykh 2021-08-27 17:26:42 +02:00
parent 81a12158fc
commit f9be0de8d2
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/p2p_server.cpp
View file

@ -52,6 +52,7 @@ P2PServer::P2PServer(p2pool* pool)
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);
uv_mutex_init_checked(&m_missingBlockRequestsLock);
uv_rwlock_init_checked(&m_cachedBlocksLock); uv_rwlock_init_checked(&m_cachedBlocksLock);
int err = uv_async_init(&m_loop, &m_broadcastAsync, on_broadcast); int err = uv_async_init(&m_loop, &m_broadcastAsync, on_broadcast);
@ -97,6 +98,7 @@ P2PServer::~P2PServer()
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);
uv_mutex_destroy(&m_missingBlockRequestsLock);
uv_rwlock_destroy(&m_cachedBlocksLock); uv_rwlock_destroy(&m_cachedBlocksLock);
delete m_block; delete m_block;
@ -617,9 +619,26 @@ void P2PServer::download_missing_blocks()
clients.emplace_back(client); clients.emplace_back(client);
} }
if (clients.empty()) {
return;
}
// Try to download each block from a random client // Try to download each block from a random client
for (const hash& id : missing_blocks) { for (const hash& id : missing_blocks) {
send(clients[get_random64() % clients.size()], P2PClient* client = clients[get_random64() % clients.size()];
{
MutexLock lock2(m_missingBlockRequestsLock);
const uint64_t truncated_block_id = *reinterpret_cast<const uint64_t*>(id.h);
if (!m_missingBlockRequests.insert({ client->m_peerId, truncated_block_id }).second) {
// We already asked this peer about this block
// Don't try to ask another peer, leave it for another timer tick
continue;
}
}
send(client,
[this, &id](void* buf) [this, &id](void* buf)
{ {
uint8_t* p0 = reinterpret_cast<uint8_t*>(buf); uint8_t* p0 = reinterpret_cast<uint8_t*>(buf);

3
src/p2p_server.h
View file

@ -174,6 +174,9 @@ private:
uv_async_t m_broadcastAsync; uv_async_t m_broadcastAsync;
std::vector<Broadcast*> m_broadcastQueue; std::vector<Broadcast*> m_broadcastQueue;
uv_mutex_t m_missingBlockRequestsLock;
std::set<std::pair<uint64_t, uint64_t>> m_missingBlockRequests;
static void on_broadcast(uv_async_t* handle) { reinterpret_cast<P2PServer*>(handle->data)->on_broadcast(); } static void on_broadcast(uv_async_t* handle) { reinterpret_cast<P2PServer*>(handle->data)->on_broadcast(); }
void on_broadcast(); void on_broadcast();
}; };