GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 20:44:19 +00:00
Code Issues Releases Wiki Activity

klondike - report mh/s based on nonces found + put old estimate into API stats

Browse Source
This commit is contained in:
Kano 2013-09-22 22:56:24 +10:00 committed by Con Kolivas
parent ef54de1dd3
commit 577f1a2043
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
driver-klondike.c
View File

@ -107,6 +107,8 @@ struct klondike_info {
WORKCFG *cfg; WORKCFG *cfg;
char *replies; char *replies;
int nextreply; int nextreply;
int noncecount;
uint64_t hashcount;
}; };
IDENTITY KlondikeID; IDENTITY KlondikeID;
@ -316,6 +318,7 @@ static void klondike_check_nonce(struct cgpu_info *klncgpu, WORKRESULT *result)
wr_lock(&(klninfo->stat_lock)); wr_lock(&(klninfo->stat_lock));
klninfo->devinfo[result->device].noncecount++; klninfo->devinfo[result->device].noncecount++;
klninfo->noncecount++;
wr_unlock(&(klninfo->stat_lock)); wr_unlock(&(klninfo->stat_lock));
result->nonce = le32toh(result->nonce - 0xC0); result->nonce = le32toh(result->nonce - 0xC0);
@ -515,7 +518,8 @@ static int64_t klondike_scanwork(struct thr_info *thr)
newhashdev += klninfo->status[dev].maxcount; // hash counter wrapped newhashdev += klninfo->status[dev].maxcount; // hash counter wrapped
newhashdev += klninfo->status[dev].hashcount - klninfo->devinfo[dev].lasthashcount; newhashdev += klninfo->status[dev].hashcount - klninfo->devinfo[dev].lasthashcount;
klninfo->devinfo[dev].lasthashcount = klninfo->status[dev].hashcount; klninfo->devinfo[dev].lasthashcount = klninfo->status[dev].hashcount;
newhashcount += (newhashdev << 32) / klninfo->status[dev].maxcount; klninfo->hashcount += (newhashdev << 32) / klninfo->status[dev].maxcount;
newhashcount += 0xffffffffull * (uint64_t)klninfo->noncecount;
// todo: check stats for critical conditions // todo: check stats for critical conditions
} }
@ -594,6 +598,9 @@ static struct api_data *klondike_api_stats(struct cgpu_info *klncgpu)
root = api_add_string(root, buf, data, true); root = api_add_string(root, buf, data, true);
} }
} }
root = api_add_uint64(root, "Hash Count", &(klninfo->hashcount), true);
rd_unlock(&(klninfo->stat_lock)); rd_unlock(&(klninfo->stat_lock));
return root; return root;