From 47a98cde9fcefffc6f892f75aa1449474b4635d5 Mon Sep 17 00:00:00 2001 From: Noel Maersk Date: Sat, 29 Mar 2014 19:30:08 +0200 Subject: [PATCH] core: use pool->name instead of pool->poolname in code merged from `port-ckolivas`. --- sgminer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sgminer.c b/sgminer.c index 83fcea0a..cac013da 100644 --- a/sgminer.c +++ b/sgminer.c @@ -7189,7 +7189,7 @@ static void *watchpool_thread(void __maybe_unused *userdata) /* Get a rolling utility per pool over 10 mins */ if (intervals > 19) { - applog(LOG_DEBUG, "Getting rolling utility for %s", pool->poolname); + applog(LOG_DEBUG, "Getting rolling utility for %s", pool->name); int shares = pool->diff1 - pool->last_shares; pool->last_shares = pool->diff1; @@ -7198,21 +7198,21 @@ static void *watchpool_thread(void __maybe_unused *userdata) } if (pool->state == POOL_DISABLED) { - applog(LOG_DEBUG, "Skipping disabled %s", pool->poolname); + applog(LOG_DEBUG, "Skipping disabled %s", pool->name); continue; } /* Don't start testing any pools if the test threads * from startup are still doing their first attempt. */ if (unlikely(pool->testing)) { - applog(LOG_DEBUG, "Testing %s", pool->poolname); + applog(LOG_DEBUG, "Testing %s", pool->name); pthread_join(pool->test_thread, NULL); pool->testing = false; } /* Test pool is idle once every minute */ if (pool->idle && now.tv_sec - pool->tv_idle.tv_sec > 30) { - applog(LOG_DEBUG, "Testing idle %s", pool->poolname); + applog(LOG_DEBUG, "Testing idle %s", pool->name); cgtime(&pool->tv_idle); if (pool_active(pool, true) && pool_tclear(pool, &pool->idle)) pool_resus(pool); @@ -7230,7 +7230,7 @@ static void *watchpool_thread(void __maybe_unused *userdata) } if (current_pool()->idle) { - applog(LOG_DEBUG, "%s is idle, switching pools", current_pool()->poolname); + applog(LOG_DEBUG, "%s is idle, switching pools", current_pool()->name); switch_pools(NULL); }