markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Every common use of the share lock uses only the write lock so convert it to a mutex

master
ckolivas 10 years ago
parent
cf516c96e7
commit
2574d44385
1 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/stratifier.c

20
src/stratifier.c
Unescape View File

@ -336,7 +336,7 @@ struct stratifier_data {
cklock_t instance_lock; cklock_t instance_lock;
share_t *shares; share_t *shares;
cklock_t share_lock; pthread_mutex_t share_lock;
int64_t shares_generated; int64_t shares_generated;
@ -548,7 +548,7 @@ static void purge_share_hashtable(sdata_t *sdata, int64_t wb_id)
share_t *share, *tmp; share_t *share, *tmp;
int purged = 0; int purged = 0;
ck_wlock(&sdata->share_lock); mutex_lock(&sdata->share_lock);
HASH_ITER(hh, sdata->shares, share, tmp) { HASH_ITER(hh, sdata->shares, share, tmp) {
if (share->workbase_id < wb_id) { if (share->workbase_id < wb_id) {
HASH_DEL(sdata->shares, share); HASH_DEL(sdata->shares, share);
@ -556,7 +556,7 @@ static void purge_share_hashtable(sdata_t *sdata, int64_t wb_id)
purged++; purged++;
} }
} }
ck_wunlock(&sdata->share_lock); mutex_unlock(&sdata->share_lock);
if (purged) if (purged)
LOGINFO("Cleared %d shares from share hashtable", purged); LOGINFO("Cleared %d shares from share hashtable", purged);
@ -568,7 +568,7 @@ static void age_share_hashtable(sdata_t *sdata, int64_t wb_id)
share_t *share, *tmp; share_t *share, *tmp;
int aged = 0; int aged = 0;
ck_wlock(&sdata->share_lock); mutex_lock(&sdata->share_lock);
HASH_ITER(hh, sdata->shares, share, tmp) { HASH_ITER(hh, sdata->shares, share, tmp) {
if (share->workbase_id == wb_id) { if (share->workbase_id == wb_id) {
HASH_DEL(sdata->shares, share); HASH_DEL(sdata->shares, share);
@ -576,7 +576,7 @@ static void age_share_hashtable(sdata_t *sdata, int64_t wb_id)
aged++; aged++;
} }
} }
ck_wunlock(&sdata->share_lock); mutex_unlock(&sdata->share_lock);
if (aged) if (aged)
LOGINFO("Aged %d shares from share hashtable", aged); LOGINFO("Aged %d shares from share hashtable", aged);
@ -1671,11 +1671,11 @@ static char *stratifier_stats(sdata_t *sdata)
JSON_CPACK(subval, "{si,si,si}", "count", objects, "memory", memsize, "generated", generated); JSON_CPACK(subval, "{si,si,si}", "count", objects, "memory", memsize, "generated", generated);
json_set_object(val, "dead", subval); json_set_object(val, "dead", subval);
ck_rlock(&sdata->share_lock); mutex_lock(&sdata->share_lock);
generated = sdata->shares_generated; generated = sdata->shares_generated;
objects = HASH_COUNT(sdata->shares); objects = HASH_COUNT(sdata->shares);
memsize = SAFE_HASH_OVERHEAD(sdata->shares) + sizeof(share_t) * objects; memsize = SAFE_HASH_OVERHEAD(sdata->shares) + sizeof(share_t) * objects;
ck_runlock(&sdata->share_lock); mutex_unlock(&sdata->share_lock);
JSON_CPACK(subval, "{si,si,si}", "count", objects, "memory", memsize, "generated", generated); JSON_CPACK(subval, "{si,si,si}", "count", objects, "memory", memsize, "generated", generated);
json_set_object(val, "shares", subval); json_set_object(val, "shares", subval);
@ -2765,12 +2765,12 @@ static bool new_share(sdata_t *sdata, const uchar *hash, int64_t wb_id)
memcpy(share->hash, hash, 32); memcpy(share->hash, hash, 32);
share->workbase_id = wb_id; share->workbase_id = wb_id;
ck_wlock(&sdata->share_lock); mutex_lock(&sdata->share_lock);
sdata->shares_generated++; sdata->shares_generated++;
HASH_FIND(hh, sdata->shares, hash, 32, match); HASH_FIND(hh, sdata->shares, hash, 32, match);
if (likely(!match)) if (likely(!match))
HASH_ADD(hh, sdata->shares, hash, 32, share); HASH_ADD(hh, sdata->shares, hash, 32, share);
ck_wunlock(&sdata->share_lock); mutex_unlock(&sdata->share_lock);
if (unlikely(match)) { if (unlikely(match)) {
dealloc(share); dealloc(share);
@ -4240,7 +4240,7 @@ int stratifier(proc_instance_t *pi)
mutex_init(&sdata->stats_lock); mutex_init(&sdata->stats_lock);
create_pthread(&pth_statsupdate, statsupdate, ckp); create_pthread(&pth_statsupdate, statsupdate, ckp);
cklock_init(&sdata->share_lock); mutex_init(&sdata->share_lock);
mutex_init(&sdata->block_lock); mutex_init(&sdata->block_lock);
LOGWARNING("%s stratifier ready", ckp->name); LOGWARNING("%s stratifier ready", ckp->name);

Write Preview
Loading…
Cancel
Save