Browse Source

Only add stratum share to database if we succeeded in submitting it, with a debug output saying it succeeded.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
cafe9aac54
  1. 22
      cgminer.c

22
cgminer.c

@ -2915,34 +2915,32 @@ static void *submit_work_thread(void *userdata) @@ -2915,34 +2915,32 @@ static void *submit_work_thread(void *userdata)
}
if (work->stratum) {
struct stratum_share *sshare = calloc(sizeof(struct stratum_share), 1);
uint32_t *hash32 = (uint32_t *)work->hash, nonce;
char *noncehex;
char s[1024];
memcpy(&sshare->work, work, sizeof(struct work));
/* Give the stratum share a unique id */
mutex_lock(&sshare_lock);
sshare->id = swork_id++;
HASH_ADD_INT(stratum_shares, id, sshare);
mutex_unlock(&sshare_lock);
swork_id++;
nonce = *((uint32_t *)(work->data + 76));
noncehex = bin2hex((const unsigned char *)&nonce, 4);
memset(s, 0, 1024);
sprintf(s, "{\"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, work->nonce2, work->ntime, noncehex, swork_id);
free(noncehex);
applog(LOG_INFO, "Submitting share %08lx to pool %d", (unsigned long)(hash32[6]), pool->pool_no);
if (unlikely(!stratum_send(pool, s, strlen(s)))) {
if (likely(stratum_send(pool, s, strlen(s)))) {
struct stratum_share *sshare = calloc(sizeof(struct stratum_share), 1);
applog(LOG_DEBUG, "Successfully submitted, adding to stratum_shares db");
memcpy(&sshare->work, work, sizeof(struct work));
mutex_lock(&sshare_lock);
HASH_DEL(stratum_shares, sshare);
sshare->id = swork_id;
HASH_ADD_INT(stratum_shares, id, sshare);
mutex_unlock(&sshare_lock);
free(sshare);
}
goto out;

Loading…
Cancel
Save