Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-12-23 11:59:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Miner: reset share counter when synchronized

Browse source
This commit is contained in:
SChernykh 2022-06-30 12:13:17 +02:00
parent a1d1420ec3
commit deaf47155f
5 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/miner.cpp
View file

@ -112,7 +112,7 @@ void Miner::on_block(const BlockTemplate& block)
const double time_running = static_cast<double>(duration_cast<milliseconds>(cur_ts - m_startTimestamp).count()) / 1e3; const double time_running = static_cast<double>(duration_cast<milliseconds>(cur_ts - m_startTimestamp).count()) / 1e3;
s << "{\"current_hashrate\":" << hr s << "{\"current_hashrate\":" << hr
<< ",\"total_hashes\":" << m_totalHashes << ",\"total_hashes\":" << m_totalHashes.load()
<< ",\"time_running\":" << time_running << ",\"time_running\":" << time_running
<< ",\"shares_found\":" << m_sharesFound.load() << ",\"shares_found\":" << m_sharesFound.load()
<< ",\"block_reward_share_percent\":" << block_reward_share_percent << ",\"block_reward_share_percent\":" << block_reward_share_percent
@ -122,6 +122,12 @@ void Miner::on_block(const BlockTemplate& block)
} }
} }
void Miner::reset_share_counters()
{
m_totalHashes = 0;
m_sharesFound = 0;
}
void Miner::run(void* data) void Miner::run(void* data)
{ {
WorkerData* d = static_cast<WorkerData*>(data); WorkerData* d = static_cast<WorkerData*>(data);

3
src/miner.h
View file

@ -33,6 +33,7 @@ public:
void print_status(); void print_status();
void on_block(const BlockTemplate& block); void on_block(const BlockTemplate& block);
void reset_share_counters();
private: private:
static void run(void* data); static void run(void* data);
@ -57,7 +58,7 @@ private:
std::chrono::high_resolution_clock::time_point m_nonceTimestamp; std::chrono::high_resolution_clock::time_point m_nonceTimestamp;
const uint32_t m_extraNonce; const uint32_t m_extraNonce;
uint64_t m_totalHashes; std::atomic<uint64_t> m_totalHashes;
std::atomic<uint32_t> m_sharesFound; std::atomic<uint32_t> m_sharesFound;
struct Job struct Job

9
src/p2pool.cpp
View file

@ -1348,6 +1348,15 @@ void p2pool::stop_mining()
m_miner = nullptr; m_miner = nullptr;
} }
} }
void p2pool::reset_miner()
{
MutexLock lock(m_minerLock);
if (m_miner) {
m_miner->reset_share_counters();
}
}
#endif #endif
static void on_signal(uv_signal_t* handle, int signum) static void on_signal(uv_signal_t* handle, int signum)

1
src/p2pool.h
View file

@ -91,6 +91,7 @@ public:
#ifdef WITH_RANDOMX #ifdef WITH_RANDOMX
void start_mining(uint32_t threads); void start_mining(uint32_t threads);
void stop_mining(); void stop_mining();
void reset_miner();
#endif #endif
uint64_t zmq_last_active() const { return m_zmqLastActive; } uint64_t zmq_last_active() const { return m_zmqLastActive; }

11
src/side_chain.cpp
View file

@ -1475,9 +1475,14 @@ void SideChain::update_chain_tip(PoolBlock* block)
m_pool->update_block_template_async(); m_pool->update_block_template_async();
// Reset stratum share counters when switching to an alternative chain to avoid confusion // Reset stratum share counters when switching to an alternative chain to avoid confusion
StratumServer* s = m_pool->stratum_server(); if (is_alternative) {
if (s && is_alternative) { StratumServer* s = m_pool->stratum_server();
s->reset_share_counters(); if (s) {
s->reset_share_counters();
}
#ifdef WITH_RANDOMX
m_pool->reset_miner();
#endif
LOGINFO(0, log::LightCyan() << "SYNCHRONIZED"); LOGINFO(0, log::LightCyan() << "SYNCHRONIZED");
} }
} }