Skip to content
This repository has been archived by the owner on May 27, 2020. It is now read-only.

store the next difficulty (round 2) #684

Merged
merged 2 commits into from
Sep 7, 2015
Merged

store the next difficulty (round 2) #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0faff61
store the next difficulty
bitbandi Jun 18, 2015
eef7ce9
Apply immediately the first set_difficulty
bitbandi Aug 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions miner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1338,6 +1338,7 @@ struct pool {
char bbversion[12];
char nbit[12];
char ntime[12];
double next_diff;
double sdiff;

struct timeval tv_lastwork;
Expand Down
13 changes: 11 additions & 2 deletions util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,6 +2008,9 @@ static bool parse_notify(struct pool *pool, json_t *val)
snprintf(pool->nbit, 9, "%s", nbit);
snprintf(pool->ntime, 9, "%s", ntime);
pool->swork.clean = clean;
if (pool->next_diff > 0) {
pool->sdiff = pool->next_diff;
}
alloc_len = pool->coinbase_len = cb1_len + pool->n1_len + pool->n2size + cb2_len;
pool->nonce2_offset = cb1_len + pool->n1_len;

Expand Down Expand Up @@ -2117,8 +2120,13 @@ static bool parse_diff(struct pool *pool, json_t *val)
return false;

cg_wlock(&pool->data_lock);
old_diff = pool->sdiff;
pool->sdiff = diff;
if (pool->next_diff > 0) {
old_diff = pool->next_diff;
pool->next_diff = diff;
} else {
old_diff = pool->sdiff;
pool->next_diff = pool->sdiff = diff;
}
cg_wunlock(&pool->data_lock);

if (old_diff != diff) {
Expand Down Expand Up @@ -2916,6 +2924,7 @@ bool initiate_stratum(struct pool *pool)
if (!pool->stratum_url)
pool->stratum_url = pool->sockaddr_url;
pool->stratum_active = true;
pool->next_diff = 0;
pool->sdiff = 1;
if (opt_protocol) {
applog(LOG_DEBUG, "Pool %d confirmed mining.subscribe with extranonce1 %s extran2size %d",
Expand Down