mempool/ckpool
mempool/ckpool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Use doubles for per client diffs and display the total accepted hashes in the console log

Browse Source
This commit is contained in:
Con Kolivas 2014-05-19 22:02:37 +10:00
parent 228ec71055
commit 21e6b2704e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/stratifier.c
View File

@ -175,8 +175,8 @@ struct stratum_instance {
char enonce1var[12];
uint64_t enonce1_64;
int diff; /* Current diff */
int old_diff; /* Previous diff */
double diff; /* Current diff */
double old_diff; /* Previous diff */
uint64_t diff_change_job_id; /* Last job_id we changed diff */
double dsps5; /* Diff shares per second, 5 minute rolling average */
tv_t ldc; /* Last diff change */
@ -184,7 +184,7 @@ struct stratum_instance {
tv_t first_share;
tv_t last_share;
int absolute_shares;
int diff_shares;
double diff_shares;
bool authorised;
@ -1017,9 +1017,8 @@ static double time_bias(double tdiff, double period)
static void add_submit(stratum_instance_t *client, int diff, bool valid)
{
double tdiff, bdiff, dsps, drr, network_diff, bias;
double optimal, tdiff, bdiff, dsps, drr, network_diff, bias;
uint64_t next_blockid;
int optimal;
tv_t now_t;
if (valid) {
@ -1061,8 +1060,9 @@ static void add_submit(stratum_instance_t *client, int diff, bool valid)
/* FIXME For now show the hashrate every ~1m when the diff is
* stable */
if (!(client->ssdc % 18)) {
LOGNOTICE("Client %d worker %s hashrate %.1fGH/s", client->id,
client->workername, dsps * 4.294967296);
LOGNOTICE("Client %d worker %s DiffAcc: %.0f hashrate %.1fGH/s",
client->id, client->workername, client->diff_shares,
dsps * 4.294967296);
}
return;
}
@ -1091,7 +1091,7 @@ static void add_submit(stratum_instance_t *client, int diff, bool valid)
client->ssdc = 0;
LOGINFO("Client %d biased dsps %.2f dsps %.2f drr %.2f adjust diff from %d to: %d ",
LOGINFO("Client %d biased dsps %.2f dsps %.2f drr %.2f adjust diff from %.0f to: %.0f ",
client->id, dsps, client->dsps5, drr, client->diff, optimal);
copy_tv(&client->ldc, &now_t);