GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-03-13 06:01:03 +00:00
Code Issues Releases Wiki Activity

Only perform the bin2hex on nonce2 data if it's required for stratum submission, thereby removing the last conversion of that type from stratum work generation.

Browse Source
This commit is contained in:
Con Kolivas 2013-08-13 06:09:42 +10:00
parent 87ae66c7e6
commit c8aac74114
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cgminer.c
View File

@ -1550,7 +1550,6 @@ static struct work *make_work(void)
void clean_work(struct work *work) void clean_work(struct work *work)
{ {
free(work->job_id); free(work->job_id);
free(work->nonce2);
free(work->ntime); free(work->ntime);
free(work->coinbase); free(work->coinbase);
free(work->nonce1); free(work->nonce1);
@ -3184,8 +3183,6 @@ void __copy_work(struct work *work, struct work *base_work)
work->job_id = strdup(base_work->job_id); work->job_id = strdup(base_work->job_id);
if (base_work->nonce1) if (base_work->nonce1)
work->nonce1 = strdup(base_work->nonce1); work->nonce1 = strdup(base_work->nonce1);
if (base_work->nonce2)
work->nonce2 = strdup(base_work->nonce2);
if (base_work->ntime) if (base_work->ntime)
work->ntime = strdup(base_work->ntime); work->ntime = strdup(base_work->ntime);
if (base_work->coinbase) if (base_work->coinbase)
@ -5154,9 +5151,9 @@ static void *stratum_sthread(void *userdata)
while (42) { while (42) {
struct stratum_share *sshare; struct stratum_share *sshare;
uint32_t *hash32, nonce; uint32_t *hash32, nonce;
char *noncehex, *nonce2;
struct work *work; struct work *work;
bool submitted; bool submitted;
char *noncehex;
char s[1024]; char s[1024];
if (unlikely(pool->removed)) if (unlikely(pool->removed))
@ -5182,9 +5179,17 @@ static void *stratum_sthread(void *userdata)
sshare->id = swork_id++; sshare->id = swork_id++;
mutex_unlock(&sshare_lock); mutex_unlock(&sshare_lock);
/* nonce2 length can be bigger than uint32_t but we only use
* the 4 bytes so avoid potential overflow if a pool has set a
* large length by allocating the ram ourselves and using the
* low level __bin2hex function. */
align_len(&work->nonce2_len);
nonce2 = alloca(work->nonce2_len);
__bin2hex(nonce2, (const unsigned char *)&work->nonce2, sizeof(uint32_t));
snprintf(s, sizeof(s), snprintf(s, sizeof(s),
"{\"params\": [\"%s\", \"%s\", \"%s\", \"%s\", \"%s\"], \"id\": %d, \"method\": \"mining.submit\"}", "{\"params\": [\"%s\", \"%s\", \"%s\", \"%s\", \"%s\"], \"id\": %d, \"method\": \"mining.submit\"}",
pool->rpc_user, work->job_id, work->nonce2, work->ntime, noncehex, sshare->id); pool->rpc_user, work->job_id, nonce2, work->ntime, noncehex, sshare->id);
free(noncehex); free(noncehex);
applog(LOG_INFO, "Submitting share %08lx to pool %d", applog(LOG_INFO, "Submitting share %08lx to pool %d",
@ -5587,16 +5592,15 @@ void set_target(unsigned char *dest_target, double diff)
static void gen_stratum_work(struct pool *pool, struct work *work) static void gen_stratum_work(struct pool *pool, struct work *work)
{ {
unsigned char merkle_root[32], merkle_sha[64]; unsigned char merkle_root[32], merkle_sha[64];
uint32_t *data32, *swap32, nonce2; uint32_t *data32, *swap32;
size_t nonce2_len;
int i; int i;
cg_wlock(&pool->data_lock); cg_wlock(&pool->data_lock);
/* Update coinbase */ /* Update coinbase */
memcpy(pool->coinbase + pool->nonce2_offset, &pool->nonce2, sizeof(uint32_t)); memcpy(pool->coinbase + pool->nonce2_offset, &pool->nonce2, sizeof(uint32_t));
nonce2 = pool->nonce2++; work->nonce2 = pool->nonce2++;
nonce2_len = pool->n2size; work->nonce2_len = pool->n2size;
/* Downgrade to a read lock to read off the pool variables */ /* Downgrade to a read lock to read off the pool variables */
cg_dwlock(&pool->data_lock); cg_dwlock(&pool->data_lock);
@ -5627,14 +5631,6 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
work->ntime = strdup(pool->swork.ntime); work->ntime = strdup(pool->swork.ntime);
cg_runlock(&pool->data_lock); cg_runlock(&pool->data_lock);
/* nonce2 length can be bigger than uint32_t but we only use the 4
* bytes so avoid potential overflow if a pool has set a large length */
align_len(&nonce2_len);
work->nonce2 = calloc(nonce2_len, 1);
if (unlikely(!work->nonce2))
quit(1, "Failed to calloc work nonce2 in gen_stratum_work");
__bin2hex(work->nonce2, (const unsigned char *)&nonce2, sizeof(uint32_t));
if (opt_debug) { if (opt_debug) {
char *header, *merkle_hash; char *header, *merkle_hash;
@ -5642,7 +5638,7 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
merkle_hash = bin2hex((const unsigned char *)merkle_root, 32); merkle_hash = bin2hex((const unsigned char *)merkle_root, 32);
applog(LOG_DEBUG, "Generated stratum merkle %s", merkle_hash); applog(LOG_DEBUG, "Generated stratum merkle %s", merkle_hash);
applog(LOG_DEBUG, "Generated stratum header %s", header); applog(LOG_DEBUG, "Generated stratum header %s", header);
applog(LOG_DEBUG, "Work job_id %s nonce2 %s ntime %s", work->job_id, work->nonce2, work->ntime); applog(LOG_DEBUG, "Work job_id %s nonce2 %d ntime %s", work->job_id, work->nonce2, work->ntime);
free(header); free(header);
free(merkle_hash); free(merkle_hash);
} }

3
miner.h
View File

@ -1258,7 +1258,8 @@ struct work {
bool stratum; bool stratum;
char *job_id; char *job_id;
char *nonce2; uint32_t nonce2;
size_t nonce2_len;
char *ntime; char *ntime;
double sdiff; double sdiff;
char *nonce1; char *nonce1;