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

Put spacing around locking in util.c for clarity.

Browse Source
This commit is contained in:
Con Kolivas 2013-04-15 11:50:59 +10:00
parent 67ebf45c19
commit d248e7aafa
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util.c
View File

@ -710,9 +710,7 @@ void tq_free(struct thread_q *tq)
static void tq_freezethaw(struct thread_q *tq, bool frozen) static void tq_freezethaw(struct thread_q *tq, bool frozen)
{ {
mutex_lock(&tq->mutex); mutex_lock(&tq->mutex);
tq->frozen = frozen; tq->frozen = frozen;
pthread_cond_signal(&tq->cond); pthread_cond_signal(&tq->cond);
mutex_unlock(&tq->mutex); mutex_unlock(&tq->mutex);
} }
@ -740,14 +738,12 @@ bool tq_push(struct thread_q *tq, void *data)
INIT_LIST_HEAD(&ent->q_node); INIT_LIST_HEAD(&ent->q_node);
mutex_lock(&tq->mutex); mutex_lock(&tq->mutex);
if (!tq->frozen) { if (!tq->frozen) {
list_add_tail(&ent->q_node, &tq->q); list_add_tail(&ent->q_node, &tq->q);
} else { } else {
free(ent); free(ent);
rc = false; rc = false;
} }
pthread_cond_signal(&tq->cond); pthread_cond_signal(&tq->cond);
mutex_unlock(&tq->mutex); mutex_unlock(&tq->mutex);
@ -761,7 +757,6 @@ void *tq_pop(struct thread_q *tq, const struct timespec *abstime)
int rc; int rc;
mutex_lock(&tq->mutex); mutex_lock(&tq->mutex);
if (!list_empty(&tq->q)) if (!list_empty(&tq->q))
goto pop; goto pop;
@ -773,16 +768,15 @@ void *tq_pop(struct thread_q *tq, const struct timespec *abstime)
goto out; goto out;
if (list_empty(&tq->q)) if (list_empty(&tq->q))
goto out; goto out;
pop: pop:
ent = list_entry(tq->q.next, struct tq_ent, q_node); ent = list_entry(tq->q.next, struct tq_ent, q_node);
rval = ent->data; rval = ent->data;
list_del(&ent->q_node); list_del(&ent->q_node);
free(ent); free(ent);
out: out:
mutex_unlock(&tq->mutex); mutex_unlock(&tq->mutex);
return rval; return rval;
} }
@ -1441,6 +1435,7 @@ static bool setup_stratum_curl(struct pool *pool)
if (unlikely(!pool->stratum_curl)) if (unlikely(!pool->stratum_curl))
quit(1, "Failed to curl_easy_init in initiate_stratum"); quit(1, "Failed to curl_easy_init in initiate_stratum");
mutex_unlock(&pool->stratum_lock); mutex_unlock(&pool->stratum_lock);
curl = pool->stratum_curl; curl = pool->stratum_curl;
if (!pool->sockbuf) { if (!pool->sockbuf) {
@ -1517,6 +1512,7 @@ void suspend_stratum(struct pool *pool)
{ {
clear_sockbuf(pool); clear_sockbuf(pool);
applog(LOG_INFO, "Closing socket for stratum pool %d", pool->pool_no); applog(LOG_INFO, "Closing socket for stratum pool %d", pool->pool_no);
mutex_lock(&pool->stratum_lock); mutex_lock(&pool->stratum_lock);
pool->stratum_active = pool->stratum_notify = false; pool->stratum_active = pool->stratum_notify = false;
if (pool->stratum_curl) { if (pool->stratum_curl) {
@ -1654,6 +1650,7 @@ out:
free(pool->nonce1); free(pool->nonce1);
pool->sessionid = pool->nonce1 = NULL; pool->sessionid = pool->nonce1 = NULL;
cg_wunlock(&pool->data_lock); cg_wunlock(&pool->data_lock);
applog(LOG_DEBUG, "Failed to resume stratum, trying afresh"); applog(LOG_DEBUG, "Failed to resume stratum, trying afresh");
noresume = true; noresume = true;
goto resend; goto resend;