Browse Source

Check we don't exhaust the entire unsigned 32 bit ntime range when rolling time to cope with extremely high hashrates.

nfactor-troky
Con Kolivas 13 years ago
parent
commit
522f620c89
  1. 9
      cgminer.c

9
cgminer.c

@ -3646,13 +3646,17 @@ static inline bool can_roll(struct work *work) @@ -3646,13 +3646,17 @@ static inline bool can_roll(struct work *work)
return (work->pool && !stale_work(work, false) && work->rolltime && !work->clone);
}
static void roll_work(struct work *work)
static bool 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++;
@ -3663,12 +3667,13 @@ static void roll_work(struct work *work) @@ -3663,12 +3667,13 @@ static void 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)) {
roll_work(work);
if (likely(roll_work(work)))
return true;
}
return false;

Loading…
Cancel
Save