Commit e872e7d66348a862b82384d43b8faab5fd845493
2013-11-04T02:47:08
Revert "Only count successful nonces as hashrate in the knc driver." The original hashrate calculation is more correct, counting hashing completed notifications, not found shares, even if slightly inflated by hw errors in some cases. A perhaps better way to show effective hash rate is to present WU as a hash rate. If WU and hardware reported hash rate differs too much over a reasonable period of time then something is not right. This reverts commit 32ec3628219bfcbf1d964019302a9f420a7a9cab.
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
diff --git a/driver-knc-spi-fpga.c b/driver-knc-spi-fpga.c
index f848856..ae5876b 100644
--- a/driver-knc-spi-fpga.c
+++ b/driver-knc-spi-fpga.c
@@ -384,7 +384,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
struct spi_rx_t *rxbuf)
{
struct knc_state *knc = cgpu->device_data;
- int submitted, successful, i, num_sent;
+ int submitted, completed, i, num_sent;
int next_read_q, next_read_a;
struct timeval now;
struct work *work;
@@ -430,7 +430,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
/* check for completed works and calculated nonces */
gettimeofday(&now, NULL);
- successful = 0;
+ completed = 0;
for (i = 0; i < (int)MAX_RESPONSES_IN_BATCH; ++i) {
if ((rxbuf->responses[i].type != RESPONSE_TYPE_NONCE_FOUND) &&
@@ -493,7 +493,6 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
knc->disa_cnt[cidx] = 0;
knc->hwerr_work_id[cidx] = 0xFFFFFFFF;
}
- successful++;
} else {
if ((cidx < (int)sizeof(knc->hwerrs)) &&
(knc->hwerr_work_id[cidx] != rxbuf->responses[i].work_id)) {
@@ -531,9 +530,10 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
sizeof(struct active_work));
}
knc->active_fifo[knc->read_a].work = NULL;
+ ++completed;
}
- return ((uint64_t)successful) * 0x100000000UL;
+ return ((uint64_t)completed) * 0x100000000UL;
}
/* Send flush command via SPI */