Commit 376fcd3c02df9b934ab739e8ec7916c27d12bc29
2012-05-04T13:10:18
Fix the benchmark feature by bypassing the new networking code.
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
diff --git a/cgminer.c b/cgminer.c
index d1713cc..a409797 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2043,25 +2043,30 @@ static void *get_work_thread(void *userdata)
else
ret_work->thr = NULL;
- pool = ret_work->pool = select_pool(wc->lagging);
- ce = pop_curl_entry(pool);
+ if (opt_benchmark)
+ get_benchmark_work(ret_work);
+ else {
+ pool = ret_work->pool = select_pool(wc->lagging);
+
+ ce = pop_curl_entry(pool);
+
+ /* obtain new work from bitcoin via JSON-RPC */
+ while (!get_upstream_work(ret_work, ce->curl)) {
+ if (unlikely((opt_retries >= 0) && (++failures > opt_retries))) {
+ applog(LOG_ERR, "json_rpc_call failed, terminating workio thread");
+ free_work(ret_work);
+ kill_work();
+ goto out;
+ }
- /* obtain new work from bitcoin via JSON-RPC */
- while (!get_upstream_work(ret_work, ce->curl)) {
- if (unlikely((opt_retries >= 0) && (++failures > opt_retries))) {
- applog(LOG_ERR, "json_rpc_call failed, terminating workio thread");
- free_work(ret_work);
- kill_work();
- goto out;
+ /* pause, then restart work-request loop */
+ applog(LOG_DEBUG, "json_rpc_call failed on get work, retry after %d seconds",
+ fail_pause);
+ sleep(fail_pause);
+ fail_pause += opt_fail_pause;
}
-
- /* pause, then restart work-request loop */
- applog(LOG_DEBUG, "json_rpc_call failed on get work, retry after %d seconds",
- fail_pause);
- sleep(fail_pause);
- fail_pause += opt_fail_pause;
+ fail_pause = opt_fail_pause;
}
- fail_pause = opt_fail_pause;
applog(LOG_DEBUG, "Pushing work to requesting thread");
@@ -2074,7 +2079,8 @@ static void *get_work_thread(void *userdata)
out:
workio_cmd_free(wc);
- push_curl_entry(ce, pool);
+ if (!opt_benchmark)
+ push_curl_entry(ce, pool);
return NULL;
}