Commit 09d7aff047c26f7035c7eacd306340bf96797657
2014-03-21T23:07:11
Make sure to only start the lognpoll thread once on gbt solo.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/cgminer.c b/cgminer.c
index bcc5061..1f347bc 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -6443,6 +6443,15 @@ out:
return ret;
}
+static void pool_start_lp(struct pool *pool)
+{
+ if (!pool->lp_started) {
+ pool->lp_started = true;
+ if (unlikely(pthread_create(&pool->longpoll_thread, NULL, longpoll_thread, (void *)pool)))
+ quit(1, "Failed to create pool longpoll thread");
+ }
+}
+
static bool pool_active(struct pool *pool, bool pinging)
{
struct timeval tv_getwork, tv_getwork_reply;
@@ -6562,9 +6571,7 @@ retry_stratum:
if (rc) {
if (pool->gbt_solo) {
ret = setup_gbt_solo(curl, pool);
- pool->lp_started = true;
- if (unlikely(pthread_create(&pool->longpoll_thread, NULL, longpoll_thread, (void *)pool)))
- quit(1, "Failed to create pool longpoll thread");
+ pool_start_lp(pool);
goto out;
}
applog(LOG_DEBUG, "Successfully retrieved and deciphered work from pool %u %s",
@@ -6619,11 +6626,7 @@ retry_stratum:
} else
pool->lp_url = NULL;
- if (!pool->lp_started) {
- pool->lp_started = true;
- if (unlikely(pthread_create(&pool->longpoll_thread, NULL, longpoll_thread, (void *)pool)))
- quit(1, "Failed to create pool longpoll thread");
- }
+ pool_start_lp(pool);
} else {
/* If we failed to parse a getwork, this could be a stratum
* url without the prefix stratum+tcp:// so let's check it */