Commit 656067a44e13c17de0259b15b41109842fa3246f
2011-08-14T12:30:50
Stale work test should respect age of rolled work as well.
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 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/main.c b/main.c
index fe9c4c2..27f1e9c 100644
--- a/main.c
+++ b/main.c
@@ -1296,18 +1296,15 @@ static bool workio_get_work(struct workio_cmd *wc)
return true;
}
-static bool stale_work(struct work *work, bool rolling)
+static bool stale_work(struct work *work)
{
+ struct timeval now;
bool ret = false;
char *hexstr;
- if (!rolling) {
- struct timeval now;
-
- gettimeofday(&now, NULL);
- if ((now.tv_sec - work->tv_staged.tv_sec) > opt_scantime)
- return true;
- }
+ gettimeofday(&now, NULL);
+ if ((now.tv_sec - work->tv_staged.tv_sec) >= opt_scantime)
+ return true;
/* Only use the primary pool for determination as the work may
* interleave at times of new blocks */
@@ -1336,7 +1333,7 @@ static void *submit_work_thread(void *userdata)
pthread_detach(pthread_self());
- if (stale_work(work, false)) {
+ if (stale_work(work)) {
applog(LOG_WARNING, "Stale share detected, discarding");
total_stale++;
pool->stale_shares++;
@@ -1345,7 +1342,7 @@ static void *submit_work_thread(void *userdata)
/* submit solution to bitcoin via JSON-RPC */
while (!submit_upstream_work(work)) {
- if (stale_work(work, false)) {
+ if (stale_work(work)) {
applog(LOG_WARNING, "Stale share detected, discarding");
total_stale++;
pool->stale_shares++;
@@ -2435,7 +2432,7 @@ static inline bool should_roll(struct work *work)
static inline bool can_roll(struct work *work)
{
- return (work->pool && !stale_work(work, true) && work->rolltime &&
+ return (work->pool && !stale_work(work) && work->rolltime &&
work->rolls < 11 && !work->clone);
}
@@ -2545,7 +2542,7 @@ retry:
goto retry;
}
- if (stale_work(work_heap, false)) {
+ if (stale_work(work_heap)) {
dec_queued();
discard_work(work_heap);
goto retry;
@@ -2851,7 +2848,7 @@ static void *miner_thread(void *userdata)
decay_time(&hash_divfloat , (double)((MAXTHREADS / total_hashes) ? : 1));
hash_div = hash_divfloat;
needs_work = true;
- } else if (work_restart[thr_id].restart || stale_work(work, false) ||
+ } else if (work_restart[thr_id].restart || stale_work(work) ||
work->blk.nonce >= MAXTHREADS - hashes_done)
needs_work = true;
}
@@ -3076,7 +3073,7 @@ static void *gpuminer_thread(void *userdata)
if (diff.tv_sec > opt_scantime ||
work->blk.nonce >= MAXTHREADS - hashes ||
work_restart[thr_id].restart ||
- stale_work(work, false)) {
+ stale_work(work)) {
/* Ignore any reads since we're getting new work and queue a clean buffer */
status = clEnqueueWriteBuffer(clState->commandQueue, clState->outputBuffer, CL_FALSE, 0,
BUFFERSIZE, blank_res, 0, NULL, NULL);