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

Hook into various places to generate GBT work where appropriate.

Browse Source
This commit is contained in:
Con Kolivas 2012-11-04 02:07:45 +11:00
parent 875ca0fcc6
commit 5acb182ec1
1 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
cgminer.c
View File

@ -3028,6 +3028,19 @@ retry:
} }
if (pool->has_gbt) { if (pool->has_gbt) {
#if 0
while (pool->idle) {
struct pool *altpool = select_pool(true);
sleep(5);
if (altpool != pool) {
wc->pool = altpool;
inc_queued(altpool);
dec_queued(pool);
goto retry;
}
}
#endif
ret_work = make_work(); ret_work = make_work();
gen_gbt_work(pool, ret_work); gen_gbt_work(pool, ret_work);
if (unlikely(!stage_work(ret_work))) { if (unlikely(!stage_work(ret_work))) {
@ -4951,7 +4964,17 @@ static bool reuse_work(struct work *work, struct pool *pool)
if (!pool->stratum_active) if (!pool->stratum_active)
return false; return false;
applog(LOG_DEBUG, "Reusing stratum work"); applog(LOG_DEBUG, "Reusing stratum work");
gen_stratum_work(pool, work);; gen_stratum_work(pool, work);
return true;
}
if (pool->has_gbt) {
#if 0
if (pool->idle)
return false;
#endif
applog(LOG_DEBUG, "Reusing GBT work");
gen_gbt_work(pool, work);
return true; return true;
} }
@ -5602,7 +5625,7 @@ static struct pool *select_longpoll_pool(struct pool *cp)
{ {
int i; int i;
if (cp->hdr_path) if (cp->hdr_path || cp->has_gbt)
return cp; return cp;
for (i = 0; i < total_pools; i++) { for (i = 0; i < total_pools; i++) {
struct pool *pool = pools[i]; struct pool *pool = pools[i];
@ -5637,6 +5660,8 @@ static void *longpoll_thread(void *userdata)
struct timeval start, reply, end; struct timeval start, reply, end;
CURL *curl = NULL; CURL *curl = NULL;
int failures = 0; int failures = 0;
char lpreq[1024];
char *lp_url;
int rolltime; int rolltime;
curl = curl_easy_init(); curl = curl_easy_init();
@ -5660,10 +5685,21 @@ retry_pool:
wait_lpcurrent(cp); wait_lpcurrent(cp);
if (cp == pool) if (pool->has_gbt) {
applog(LOG_WARNING, "Long-polling activated for %s", pool->lp_url); sprintf(lpreq, "{\"id\": 0, \"method\": \"getblocktemplate\", \"params\": "
else "[{\"capabilities\": [\"coinbasetxn\", \"workid\", \"coinbase/append\"], "
applog(LOG_WARNING, "Long-polling activated for pool %s via %s", cp->rpc_url, pool->lp_url); "\"longpollid\": \"%s\"}]}\n", pool->longpollid);
lp_url = pool->rpc_url;
applog(LOG_WARNING, "GBT longpoll ID activated for %s", lp_url);
} else {
strcpy(lpreq, getwork_req);
lp_url = pool->lp_url;
if (cp == pool)
applog(LOG_WARNING, "Long-polling activated for %s", lp_url);
else
applog(LOG_WARNING, "Long-polling activated for pool %s via %s", cp->rpc_url, lp_url);
}
while (42) { while (42) {
json_t *val, *soval; json_t *val, *soval;
@ -5677,9 +5713,8 @@ retry_pool:
* so always establish a fresh connection instead of relying on * so always establish a fresh connection instead of relying on
* a persistent one. */ * a persistent one. */
curl_easy_setopt(curl, CURLOPT_FRESH_CONNECT, 1); curl_easy_setopt(curl, CURLOPT_FRESH_CONNECT, 1);
val = json_rpc_call(curl, pool->lp_url, pool->rpc_userpass, val = json_rpc_call(curl, lp_url, pool->rpc_userpass,
pool->rpc_req, false, true, &rolltime, lpreq, false, true, &rolltime, pool, false);
pool, false);
gettimeofday(&reply, NULL); gettimeofday(&reply, NULL);
@ -5701,7 +5736,7 @@ retry_pool:
if (end.tv_sec - start.tv_sec > 30) if (end.tv_sec - start.tv_sec > 30)
continue; continue;
if (failures == 1) if (failures == 1)
applog(LOG_WARNING, "longpoll failed for %s, retrying every 30s", pool->lp_url); applog(LOG_WARNING, "longpoll failed for %s, retrying every 30s", lp_url);
sleep(30); sleep(30);
} }
if (pool != cp) { if (pool != cp) {