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

Include P2P peer list into miner count

Browse source
This commit is contained in:
SChernykh 2021-10-31 12:41:13 +01:00
parent eaed654012
commit b56d027dd5
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p2p_server.h
View file

@ -128,6 +128,7 @@ public:
void print_status() override;
void show_peers();
size_t peer_list_size() const { return m_peerList.size(); }
private:
p2pool* m_pool;

4
src/p2pool.cpp
View file

@ -1013,7 +1013,7 @@ void p2pool::api_update_pool_stats()
uint64_t t;
const difficulty_type& diff = m_sideChain->difficulty();
const uint64_t hashrate = udiv128(diff.hi, diff.lo, m_sideChain->block_time(), &t);
const uint64_t miners = m_sideChain->miner_count();
const uint64_t miners = std::max<uint64_t>(m_sideChain->miner_count(), m_p2pServer ? m_p2pServer->peer_list_size() : 0U);
const difficulty_type total_hashes = m_sideChain->total_hashes();
time_t last_block_found_time = 0;
@ -1076,7 +1076,7 @@ void p2pool::api_update_stats_mod()
s << last_block_found_hash << '\0';
memcpy(last_block_found_buf + 4, "...", 4);
const uint64_t miners = m_sideChain->miner_count();
const uint64_t miners = std::max<uint64_t>(m_sideChain->miner_count(), m_p2pServer ? m_p2pServer->peer_list_size() : 0U);
uint64_t t;
const difficulty_type& diff = m_sideChain->difficulty();

4
src/side_chain.cpp
View file

@ -757,9 +757,9 @@ uint64_t SideChain::miner_count()
MutexLock lock(m_sidechainLock);
// Delete wallets that weren't seen for more than 48 hours and return how many remain
// Delete wallets that weren't seen for more than 72 hours and return how many remain
for (auto it = m_seenWallets.begin(); it != m_seenWallets.end();) {
if (it->second + 48 * 60 * 60 <= cur_time) {
if (it->second + 72 * 60 * 60 <= cur_time) {
it = m_seenWallets.erase(it);
}
else {