Browse Source

Add share to stratum database before sending it again in case we get a response from the pool before it's added.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
843fa3397e
  1. 21
      cgminer.c

21
cgminer.c

@ -2915,15 +2915,21 @@ static void *submit_work_thread(void *userdata)
} }
if (work->stratum) { if (work->stratum) {
struct stratum_share *sshare = calloc(sizeof(struct stratum_share), 1);
uint32_t *hash32 = (uint32_t *)work->hash, nonce; uint32_t *hash32 = (uint32_t *)work->hash, nonce;
char *noncehex; char *noncehex;
char s[1024]; char s[1024];
/* Give the stratum share a unique id */ /* Give the stratum share a unique id */
swork_id++; swork_id++;
memcpy(&sshare->work, work, sizeof(struct work));
mutex_lock(&sshare_lock);
sshare->id = swork_id;
HASH_ADD_INT(stratum_shares, id, sshare);
mutex_unlock(&sshare_lock);
nonce = *((uint32_t *)(work->data + 76)); nonce = *((uint32_t *)(work->data + 76));
noncehex = bin2hex((const unsigned char *)&nonce, 4); noncehex = bin2hex((const unsigned char *)&nonce, 4);
memset(s, 0, 1024); memset(s, 0, 1024);
sprintf(s, "{\"params\": [\"%s\", \"%s\", \"%s\", \"%s\", \"%s\"], \"id\": %d, \"method\": \"mining.submit\"}", sprintf(s, "{\"params\": [\"%s\", \"%s\", \"%s\", \"%s\", \"%s\"], \"id\": %d, \"method\": \"mining.submit\"}",
pool->rpc_user, work->job_id, work->nonce2, work->ntime, noncehex, swork_id); pool->rpc_user, work->job_id, work->nonce2, work->ntime, noncehex, swork_id);
@ -2932,19 +2938,16 @@ static void *submit_work_thread(void *userdata)
applog(LOG_INFO, "Submitting share %08lx to pool %d", (unsigned long)(hash32[6]), pool->pool_no); applog(LOG_INFO, "Submitting share %08lx to pool %d", (unsigned long)(hash32[6]), pool->pool_no);
if (likely(stratum_send(pool, s, strlen(s)))) { if (likely(stratum_send(pool, s, strlen(s)))) {
struct stratum_share *sshare = calloc(sizeof(struct stratum_share), 1);
if (pool_tclear(pool, &pool->submit_fail)) if (pool_tclear(pool, &pool->submit_fail))
applog(LOG_WARNING, "Pool %d communication resumed, submitting work", pool->pool_no); applog(LOG_WARNING, "Pool %d communication resumed, submitting work", pool->pool_no);
applog(LOG_DEBUG, "Successfully submitted, adding to stratum_shares db"); applog(LOG_DEBUG, "Successfully submitted, adding to stratum_shares db");
memcpy(&sshare->work, work, sizeof(struct work));
mutex_lock(&sshare_lock);
sshare->id = swork_id;
HASH_ADD_INT(stratum_shares, id, sshare);
mutex_unlock(&sshare_lock);
} else { } else {
applog(LOG_INFO, "Failed to submit stratum share"); applog(LOG_INFO, "Failed to submit stratum share");
mutex_lock(&sshare_lock);
HASH_DEL(stratum_shares, sshare);
mutex_unlock(&sshare_lock);
free(sshare);
if (!pool_tset(pool, &pool->submit_fail)) { if (!pool_tset(pool, &pool->submit_fail)) {
total_ro++; total_ro++;
pool->remotefail_occasions++; pool->remotefail_occasions++;

Loading…
Cancel
Save