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

Restart longpoll under lock when we'll be reusing it on pool switch to prevent derefs.

Browse Source
This commit is contained in:
Con Kolivas 2011-09-15 14:51:04 +10:00
parent 3f10e80a93
commit 2cae5c1dc3
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
main.c
View File

@ -2455,11 +2455,12 @@ static struct pool *priority_pool(int choice)
return ret; return ret;
} }
static void restart_longpoll(void); static void __restart_longpoll(void);
static void switch_pools(struct pool *selected) static void switch_pools(struct pool *selected)
{ {
struct pool *pool, *last_pool; struct pool *pool, *last_pool;
bool new_pool = false;
int i, pool_no; int i, pool_no;
mutex_lock(&control_lock); mutex_lock(&control_lock);
@ -2507,13 +2508,23 @@ static void switch_pools(struct pool *selected)
currentpool = pools[pool_no]; currentpool = pools[pool_no];
pool = currentpool; pool = currentpool;
mutex_unlock(&control_lock);
if (pool != last_pool) { if (pool != last_pool) {
applog(LOG_WARNING, "Switching to %s", pool->rpc_url); new_pool = true;
/* Only switch longpoll if the new pool also supports LP */ /* Only switch longpoll if the new pool also supports LP */
if (pool->hdr_path) if (pool->hdr_path)
restart_longpoll(); __restart_longpoll();
}
mutex_unlock(&control_lock);
if (new_pool) {
applog(LOG_WARNING, "Switching to %s", pool->rpc_url);
if (want_longpoll) {
if (opt_debug)
applog(LOG_DEBUG, "Pushing ping to longpoll thread");
tq_push(thr_info[longpoll_thr_id].q, &ping);
}
} }
/* Reset the queued amount to allow more to be queued for the new pool */ /* Reset the queued amount to allow more to be queued for the new pool */
@ -3003,6 +3014,8 @@ retry:
opt_loginput = false; opt_loginput = false;
} }
static void restart_longpoll(void);
static void set_options(void) static void set_options(void)
{ {
int selected; int selected;
@ -4472,6 +4485,23 @@ static void restart_longpoll(void)
start_longpoll(); start_longpoll();
} }
/* Version for when we are holding a lock, grabs no other locks to prevent
* deadlock */
static void __restart_longpoll(void)
{
struct thr_info *thr = &thr_info[longpoll_thr_id];
thr_info_cancel(thr);
have_longpoll = false;
if (!want_longpoll)
return;
tq_thaw(thr->q);
if (unlikely(thr_info_create(thr, NULL, longpoll_thread, thr)))
quit(1, "longpoll thread create failed");
}
static void *reinit_cpu(void *userdata) static void *reinit_cpu(void *userdata)
{ {
pthread_detach(pthread_self()); pthread_detach(pthread_self());