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

Cache find_aux_nonce to save CPU time

Browse source
This commit is contained in:
SChernykh 2023-12-25 15:53:01 +01:00
parent 15f4761108
commit 6eb83dc891
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/p2pool.cpp
View file

@ -132,6 +132,7 @@ p2pool::p2pool(int argc, char* argv[])
uv_rwlock_init_checked(&m_minerDataLock); uv_rwlock_init_checked(&m_minerDataLock);
uv_rwlock_init_checked(&m_ZMQReaderLock); uv_rwlock_init_checked(&m_ZMQReaderLock);
uv_rwlock_init_checked(&m_mergeMiningClientsLock); uv_rwlock_init_checked(&m_mergeMiningClientsLock);
uv_rwlock_init_checked(&m_auxIdLock);
uv_mutex_init_checked(&m_foundBlocksLock); uv_mutex_init_checked(&m_foundBlocksLock);
#ifdef WITH_RANDOMX #ifdef WITH_RANDOMX
uv_mutex_init_checked(&m_minerLock); uv_mutex_init_checked(&m_minerLock);
@ -201,6 +202,7 @@ p2pool::~p2pool()
uv_rwlock_destroy(&m_minerDataLock); uv_rwlock_destroy(&m_minerDataLock);
uv_rwlock_destroy(&m_ZMQReaderLock); uv_rwlock_destroy(&m_ZMQReaderLock);
uv_rwlock_destroy(&m_mergeMiningClientsLock); uv_rwlock_destroy(&m_mergeMiningClientsLock);
uv_rwlock_destroy(&m_auxIdLock);
uv_mutex_destroy(&m_foundBlocksLock); uv_mutex_destroy(&m_foundBlocksLock);
#ifdef WITH_RANDOMX #ifdef WITH_RANDOMX
uv_mutex_destroy(&m_minerLock); uv_mutex_destroy(&m_minerLock);
@ -508,28 +510,39 @@ void p2pool::handle_chain_main(ChainMain& data, const char* extra)
void p2pool::update_aux_data(const hash& chain_id) void p2pool::update_aux_data(const hash& chain_id)
{ {
MinerData data; MinerData data;
std::vector<hash> aux_id;
{ {
ReadLock lock(m_mergeMiningClientsLock); ReadLock lock(m_mergeMiningClientsLock);
if (!m_mergeMiningClients.empty()) { if (!m_mergeMiningClients.empty()) {
data.aux_chains.reserve(m_mergeMiningClients.size()); data.aux_chains.reserve(m_mergeMiningClients.size());
std::vector<hash> tmp; aux_id.reserve(m_mergeMiningClients.size() + 1);
tmp.reserve(m_mergeMiningClients.size() + 1);
for (const MergeMiningClient* c : m_mergeMiningClients) { for (const MergeMiningClient* c : m_mergeMiningClients) {
data.aux_chains.emplace_back(c->aux_id(), c->aux_data(), c->aux_diff()); data.aux_chains.emplace_back(c->aux_id(), c->aux_data(), c->aux_diff());
tmp.emplace_back(c->aux_id()); aux_id.emplace_back(c->aux_id());
}
aux_id.emplace_back(m_sideChain->consensus_hash());
}
} }
tmp.emplace_back(m_sideChain->consensus_hash()); if (!aux_id.empty()) {
WriteLock lock(m_auxIdLock);
if (!find_aux_nonce(tmp, data.aux_nonce)) { if (aux_id == m_auxId) {
data.aux_nonce = m_auxNonce;
}
else if (find_aux_nonce(aux_id, data.aux_nonce)) {
m_auxId = aux_id;
m_auxNonce = data.aux_nonce;
}
else {
LOGERR(1, "Failed to find the aux nonce for merge mining. Merge mining will be off this round."); LOGERR(1, "Failed to find the aux nonce for merge mining. Merge mining will be off this round.");
data.aux_chains.clear(); data.aux_chains.clear();
} }
} }
}
{ {
WriteLock lock(m_minerDataLock); WriteLock lock(m_minerDataLock);

4
src/p2pool.h
View file

@ -235,6 +235,10 @@ private:
mutable uv_rwlock_t m_mergeMiningClientsLock; mutable uv_rwlock_t m_mergeMiningClientsLock;
std::vector<MergeMiningClient*> m_mergeMiningClients; std::vector<MergeMiningClient*> m_mergeMiningClients;
mutable uv_rwlock_t m_auxIdLock;
std::vector<hash> m_auxId;
uint32_t m_auxNonce = 0;
hash m_getMinerDataHash; hash m_getMinerDataHash;
bool m_getMinerDataPending = false; bool m_getMinerDataPending = false;