Commit 9e5307fe26303a697c84cd407faea4999b0dc908
2014-01-12T16:25:42
bab add processed links which excludes expired links skipped
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/driver-bab.c b/driver-bab.c
index 81d3576..a4abe60 100644
--- a/driver-bab.c
+++ b/driver-bab.c
@@ -340,7 +340,9 @@ struct bab_info {
uint64_t total_tests;
uint64_t max_tests_per_nonce;
uint64_t total_links;
+ uint64_t total_proc_links;
uint64_t max_links;
+ uint64_t max_proc_links;
uint64_t total_work_links;
uint64_t fail;
@@ -1244,7 +1246,7 @@ static void bab_flush_work(struct cgpu_info *babcgpu)
static bool oknonce(struct thr_info *thr, struct cgpu_info *babcgpu, int chip, uint32_t nonce)
{
struct bab_info *babinfo = (struct bab_info *)(babcgpu->device_data);
- unsigned int links, work_links, tests;
+ unsigned int links, proc_links, work_links, tests;
K_ITEM *witem, *wtail, *wold;
struct timeval now;
int i;
@@ -1276,7 +1278,7 @@ static bool oknonce(struct thr_info *thr, struct cgpu_info *babcgpu, int chip, u
cgtime(&now);
tests = 0;
- links = 0;
+ links = proc_links = 0;
work_links = 0;
wtail = witem;
wold = NULL;
@@ -1291,9 +1293,10 @@ static bool oknonce(struct thr_info *thr, struct cgpu_info *babcgpu, int chip, u
babcgpu->device_id,
chip, links);
} else {
- if (ms_tdiff(&now, &(DATAW(wtail)->work_start)) >= BAB_WORK_EXPIRE_mS)
+ if (ms_tdiff(&now, &(DATAW(wtail)->work_start)) >= BAB_WORK_EXPIRE_mS) {
wold = wtail;
- else {
+ proc_links--;
+ } else {
for (i = 0; i < BAB_NONCE_OFFSETS; i++) {
tests++;
if (test_nonce(DATAW(wtail)->work, nonce + bab_nonce_offsets[i])) {
@@ -1312,8 +1315,11 @@ static bool oknonce(struct thr_info *thr, struct cgpu_info *babcgpu, int chip, u
if (babinfo->max_tests_per_nonce < tests)
babinfo->max_tests_per_nonce = tests;
babinfo->total_links += links;
+ babinfo->total_proc_links += proc_links;
if (babinfo->max_links < links)
babinfo->max_links = links;
+ if (babinfo->max_proc_links < proc_links)
+ babinfo->max_proc_links = proc_links;
babinfo->total_work_links += work_links;
return true;
}
@@ -1324,6 +1330,7 @@ static bool oknonce(struct thr_info *thr, struct cgpu_info *babcgpu, int chip, u
break;
wtail = wtail->prev;
links++;
+ proc_links++;
}
if (wold)
@@ -1790,11 +1797,16 @@ static struct api_data *bab_api_stats(struct cgpu_info *babcgpu)
root = api_add_uint64(root, "Untested", &(babinfo->untested_nonces), true);
root = api_add_uint64(root, "Work Links", &(babinfo->total_links), true);
+ root = api_add_uint64(root, "Work Processed Links", &(babinfo->total_proc_links), true);
root = api_add_uint64(root, "Max Links", &(babinfo->max_links), true);
+ root = api_add_uint64(root, "Max Processed Links", &(babinfo->max_proc_links), true);
root = api_add_uint64(root, "Total Work Links", &(babinfo->total_work_links), true);
avg = babinfo->ok_nonces ? (float)(babinfo->total_links) /
(float)(babinfo->ok_nonces) : 0;
root = api_add_avg(root, "Avg Links", &avg, true);
+ avg = babinfo->ok_nonces ? (float)(babinfo->total_proc_links) /
+ (float)(babinfo->ok_nonces) : 0;
+ root = api_add_avg(root, "Avg Proc Links", &avg, true);
avg = babinfo->ok_nonces ? (float)(babinfo->total_work_links) /
(float)(babinfo->ok_nonces) : 0;
root = api_add_avg(root, "Avg Work Links", &avg, true);