Commit bcec5f510203f7f663a7d2d7c330043256d86890
2012-06-27T23:30:50
Revert "Check we don't exhaust the entire unsigned 32 bit ntime range when rolling time to cope with extremely high hashrates." This reverts commit 522f620c89b5f152f86a2916b0dca7b71b2a5005. Unrealistic. Limits are bitcoind related to 2 hours in the future.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/cgminer.c b/cgminer.c
index a352824..756e005 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -3649,17 +3649,13 @@ static inline bool can_roll(struct work *work)
return (work->pool && !stale_work(work, false) && work->rolltime && !work->clone);
}
-static bool roll_work(struct work *work)
+static void roll_work(struct work *work)
{
uint32_t *work_ntime;
uint32_t ntime;
work_ntime = (uint32_t *)(work->data + 68);
ntime = be32toh(*work_ntime);
- if (unlikely(ntime == 0xFFFFFFFF)) {
- applog(LOG_DEBUG, "Exhausted ntime space, cannot roll work");
- return false;
- }
ntime++;
*work_ntime = htobe32(ntime);
local_work++;
@@ -3670,14 +3666,13 @@ static bool roll_work(struct work *work)
/* This is now a different work item so it needs a different ID for the
* hashtable */
work->id = total_work++;
- return true;
}
static bool reuse_work(struct work *work)
{
if (can_roll(work) && should_roll(work)) {
- if (likely(roll_work(work)))
- return true;
+ roll_work(work);
+ return true;
}
return false;
}