Commit 6464dbfc65de804ec47f409328de695f7aaa26f5
2011-07-10T00:53:48
Implement per-device request count to have a per-device efficiency and request status.
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
diff --git a/main.c b/main.c
index 2b8c0fb..43b67ed 100644
--- a/main.c
+++ b/main.c
@@ -157,7 +157,7 @@ static int accepted, rejected;
int hw_errors;
static int total_queued, total_staged, lp_staged;
static bool localgen = false;
-static unsigned int getwork_requested = 0;
+static unsigned int getwork_requested;
static char current_block[37];
static char longpoll_block[37];
static char blank[37];
@@ -563,17 +563,17 @@ static bool submit_upstream_work(const struct work *work)
}
utility = accepted / ( total_secs ? total_secs : 1 ) * 60;
- efficiency = getwork_requested ? cgpu->accepted * 100.0 / getwork_requested : 0.0;
+ efficiency = cgpu->getworks ? cgpu->accepted * 100.0 / cgpu->getworks : 0.0;
if (!opt_quiet) {
printf("[%sPU %d] [%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m] \n",
cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, cgpu->total_mhashes / total_secs,
- getwork_requested, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
+ cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
efficiency, utility);
print_status();
}
applog(LOG_INFO, "%sPU %d Requested:%d Accepted:%d Rejected:%d HW errors:%d Efficiency:%.0f%% Utility:%.2f/m",
- cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, getwork_requested, cgpu->accepted, cgpu->rejected, cgpu->hw_errors, efficiency, utility
+ cgpu->is_gpu? "G" : "C", cgpu->cpu_gpu, cgpu->getworks, cgpu->accepted, cgpu->rejected, cgpu->hw_errors, efficiency, utility
);
json_decref(val);
@@ -1061,6 +1061,8 @@ static bool get_work(struct work *work, bool queued)
bool ret = false;
int failures = 0;
+ getwork_requested++;
+
retry:
if (unlikely(!queued && !queue_request())) {
applog(LOG_WARNING, "Failed to queue_request in get_work");
@@ -1194,9 +1196,10 @@ static void *miner_thread(void *userdata)
/* obtain new work from internal workio thread */
if (unlikely(!get_work(&work, requested))) {
applog(LOG_ERR, "work retrieval failed, exiting "
- "mining thread %d", mythr->id);
+ "mining thread %d", thr_id);
goto out;
}
+ mythr->cgpu->getworks++;
work.thr_id = thr_id;
needs_work = requested = false;
work.blk.nonce = 0;
@@ -1439,11 +1442,10 @@ static void *gpuminer_thread(void *userdata)
"gpu mining thread %d", mythr->id);
goto out;
}
+ mythr->cgpu->getworks++;
work->thr_id = thr_id;
requested = false;
- getwork_requested++;
-
precalc_hash(&work->blk, (uint32_t *)(work->midstate), (uint32_t *)(work->data + 64));
work->blk.nonce = 0;
work_restart[thr_id].restart = 0;
diff --git a/miner.h b/miner.h
index 657ca74..a83553f 100644
--- a/miner.h
+++ b/miner.h
@@ -134,6 +134,7 @@ struct cgpu_info {
int hw_errors;
double local_mhashes;
double total_mhashes;
+ unsigned int getworks;
};
struct thr_info {