From 060441f2aff186798bfb3c07eedc7bc3a9280a7c Mon Sep 17 00:00:00 2001 From: m0mchil Date: Wed, 17 Oct 2012 16:20:15 +0300 Subject: [PATCH] pass reference time for hash rate calculation --- BFLMiner.py | 4 ++-- Miner.py | 3 +-- OpenCLMiner.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/BFLMiner.py b/BFLMiner.py index 24e10e3..20410c2 100644 --- a/BFLMiner.py +++ b/BFLMiner.py @@ -188,9 +188,9 @@ def mining_thread(self): iterations += 4294967296 t = now - last_rated if t > self.options.rate: - self.update_rate(iterations, t, targetQ) + self.update_rate(now, iterations, t, targetQ) last_rated = now; iterations = 0 - + if result != b'NO-NONCE\n': r.nonces = result self.switch.put(r) diff --git a/Miner.py b/Miner.py index 0c7b2a3..ccb92ea 100644 --- a/Miner.py +++ b/Miner.py @@ -27,8 +27,7 @@ def stop(self, message = None): if message: print '\n%s' % message self.should_stop = True - def update_rate(self, iterations, t, targetQ, rate_divisor=1000): - now = time() + def update_rate(self, now, iterations, t, targetQ, rate_divisor=1000): self.rate = int((iterations / t) / rate_divisor) self.rate = Decimal(self.rate) / 1000 if self.accept_hist: diff --git a/OpenCLMiner.py b/OpenCLMiner.py index d88b0b5..7548844 100644 --- a/OpenCLMiner.py +++ b/OpenCLMiner.py @@ -219,7 +219,7 @@ def mining_thread(self): t = now - last_rated if t > self.options.rate: - self.update_rate(threads_run, t, work.targetQ, rate_divisor) + self.update_rate(now, threads_run, t, work.targetQ, rate_divisor) last_rated = now; threads_run = 0 queue.finish()