GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-09 14:28:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #418 from bitbandi/diffbug

Browse Source 
store the next difficulty
This commit is contained in:
troky 2015-07-19 09:23:41 +02:00
commit 8bf1c1807c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
miner.h
View File

@ -1391,6 +1391,7 @@ struct pool {
unsigned char *coinbase; unsigned char *coinbase;
size_t nonce2_offset; size_t nonce2_offset;
unsigned char header_bin[128]; unsigned char header_bin[128];
double next_diff;
int merkle_offset; int merkle_offset;
struct timeval tv_lastwork; struct timeval tv_lastwork;

7
util.c
View File

@ -1560,6 +1560,7 @@ static bool parse_notify(struct pool *pool, json_t *val)
pool->swork.nbit = nbit; pool->swork.nbit = nbit;
pool->swork.ntime = ntime; pool->swork.ntime = ntime;
pool->swork.clean = clean; pool->swork.clean = clean;
pool->swork.diff = pool->next_diff;
alloc_len = pool->swork.cb_len = cb1_len + pool->n1_len + pool->n2size + cb2_len; alloc_len = pool->swork.cb_len = cb1_len + pool->n1_len + pool->n2size + cb2_len;
pool->nonce2_offset = cb1_len + pool->n1_len; pool->nonce2_offset = cb1_len + pool->n1_len;
@ -1668,8 +1669,8 @@ static bool parse_diff(struct pool *pool, json_t *val)
return false; return false;
cg_wlock(&pool->data_lock); cg_wlock(&pool->data_lock);
old_diff = pool->swork.diff; old_diff = pool->next_diff;
pool->swork.diff = diff; pool->next_diff = diff;
cg_wunlock(&pool->data_lock); cg_wunlock(&pool->data_lock);
if (old_diff != diff) { if (old_diff != diff) {
@ -2560,7 +2561,7 @@ out:
if (!pool->stratum_url) if (!pool->stratum_url)
pool->stratum_url = pool->sockaddr_url; pool->stratum_url = pool->sockaddr_url;
pool->stratum_active = true; pool->stratum_active = true;
pool->swork.diff = 1; pool->next_diff = pool->swork.diff = 1;
if (opt_protocol) { if (opt_protocol) {
applog(LOG_DEBUG, "%s confirmed mining.subscribe with extranonce1 %s extran2size %d", applog(LOG_DEBUG, "%s confirmed mining.subscribe with extranonce1 %s extran2size %d",
get_pool_name(pool), pool->nonce1, pool->n2size); get_pool_name(pool), pool->nonce1, pool->n2size);