GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-05 19:44:21 +00:00
Code Issues Releases Wiki Activity

Use the stratum thread to detect when a stratum pool has died based on no message for 2 minutes.

Browse Source
This commit is contained in:
Con Kolivas 2012-10-06 14:33:51 +10:00
parent 0cddd1ab54
commit 8a32f381b4
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cgminer.c
View File

@ -4134,6 +4134,8 @@ out:
return ret; return ret;
} }
static void pool_resus(struct pool *pool);
/* One stratum thread per pool that has stratum waits on the socket checking /* One stratum thread per pool that has stratum waits on the socket checking
* for new messages and for the integrity of the socket connection. We reset * for new messages and for the integrity of the socket connection. We reset
* the connection based on the integrity of the receive side only as the send * the connection based on the integrity of the receive side only as the send
@ -4145,24 +4147,36 @@ static void *stratum_thread(void *userdata)
pthread_detach(pthread_self()); pthread_detach(pthread_self());
while (42) { while (42) {
struct timeval timeout;
fd_set rd; fd_set rd;
char *s; char *s;
if (unlikely(pool->removed))
break;
FD_ZERO(&rd); FD_ZERO(&rd);
FD_SET(pool->sock, &rd); FD_SET(pool->sock, &rd);
timeout.tv_sec = 120;
timeout.tv_usec = 0;
if (select(pool->sock + 1, &rd, NULL, NULL, NULL) < 0) { /* The protocol specifies that notify messages should be sent
pool->stratum_active = false; * every minute so if we fail to receive any for 2 minutes we
applog(LOG_WARNING, "Stratum connection to pool %d interrupted", pool->pool_no); * assume the connection has been dropped and treat this pool
* as dead */
if (select(pool->sock + 1, &rd, NULL, NULL, &timeout) < 1) {
applog(LOG_INFO, "Stratum connection to pool %d interrupted", pool->pool_no);
pool->getfail_occasions++; pool->getfail_occasions++;
total_go++; total_go++;
pool_died(pool);
while (!initiate_stratum(pool) || !auth_stratum(pool)) { while (!initiate_stratum(pool) || !auth_stratum(pool)) {
if (!pool->idle)
pool_died(pool);
if (pool->removed) if (pool->removed)
goto out; goto out;
sleep(5); sleep(5);
} }
applog(LOG_INFO, "Stratum connection to pool %d resumed", pool->pool_no);
pool_resus(pool);
continue;
} }
s = recv_line(pool); s = recv_line(pool);
if (unlikely(!s)) if (unlikely(!s))
@ -4188,10 +4202,6 @@ static void *stratum_thread(void *userdata)
applog(LOG_NOTICE, "Stratum from pool %d detected new block", pool->pool_no); applog(LOG_NOTICE, "Stratum from pool %d detected new block", pool->pool_no);
} }
if (unlikely(pool->removed)) {
CLOSESOCKET(pool->sock);
goto out;
}
} }
out: out:
@ -4241,6 +4251,7 @@ retry_stratum:
return false; return false;
if (!auth_stratum(pool)) if (!auth_stratum(pool))
return false; return false;
pool->idle = false;
init_stratum_thread(pool); init_stratum_thread(pool);
return true; return true;
} }
@ -4527,6 +4538,9 @@ static void set_work_target(struct work *work, int diff)
memcpy(work->target, target, 32); memcpy(work->target, target, 32);
} }
/* Generates stratum based work based on the most recent notify information
* from the pool. This will keep generating work while a pool is down so we use
* other means to detect when the pool has died in stratum_thread */
static void gen_stratum_work(struct pool *pool, struct work *work) static void gen_stratum_work(struct pool *pool, struct work *work)
{ {
unsigned char *coinbase, merkle_root[33], merkle_sha[65], *merkle_hash; unsigned char *coinbase, merkle_root[33], merkle_sha[65], *merkle_hash;
@ -5256,7 +5270,8 @@ static void *watchpool_thread(void __maybe_unused *userdata)
if (!opt_benchmark) if (!opt_benchmark)
reap_curl(pool); reap_curl(pool);
if (pool->enabled == POOL_DISABLED)
if (pool->enabled == POOL_DISABLED || pool->has_stratum)
continue; continue;
/* Test pool is idle once every minute */ /* Test pool is idle once every minute */