diff options
author | Daniel Schemmel <daniel.schemmel@comsys.rwth-aachen.de> | 2019-11-09 19:44:35 +0100 |
---|---|---|
committer | dormando <dormando@rydia.net> | 2019-11-10 23:21:53 -0800 |
commit | 90306c539327f4e36b950c9f1a83e65d2ad44a4b (patch) | |
tree | 6e8e4d2d8a4a612062a5471903967437e3199fa3 | |
parent | 4575e1f9668a467aa4dc628101509f7f5a5a2efe (diff) | |
download | memcached-90306c539327f4e36b950c9f1a83e65d2ad44a4b.tar.gz |
Remove multiple double-initializations of condition variables and mutexes
- `slabs_rebalance_lock`
- `slab_rebalance_cond`
- `maintenance_lock`
- `lru_crawler_lock`
- `lru_crawler_cond`
- `lru_maintainer_lock`
-rw-r--r-- | assoc.c | 2 | ||||
-rw-r--r-- | crawler.c | 5 | ||||
-rw-r--r-- | items.c | 5 | ||||
-rw-r--r-- | slabs.c | 6 |
4 files changed, 2 insertions, 16 deletions
@@ -273,7 +273,7 @@ int start_assoc_maintenance_thread() { hash_bulk_move = DEFAULT_HASH_BULK_MOVE; } } - pthread_mutex_init(&maintenance_lock, NULL); + if ((ret = pthread_create(&maintenance_tid, NULL, assoc_maintenance_thread, NULL)) != 0) { fprintf(stderr, "Can't create thread: %s\n", strerror(ret)); @@ -696,11 +696,6 @@ int init_lru_crawler(void *arg) { #ifdef EXTSTORE storage = arg; #endif - if (pthread_cond_init(&lru_crawler_cond, NULL) != 0) { - fprintf(stderr, "Can't initialize lru crawler condition\n"); - return -1; - } - pthread_mutex_init(&lru_crawler_lock, NULL); active_crawler_mod.c.c = NULL; active_crawler_mod.mod = NULL; active_crawler_mod.data = NULL; @@ -1722,10 +1722,7 @@ void lru_maintainer_resume(void) { } int init_lru_maintainer(void) { - if (lru_maintainer_initialized == 0) { - pthread_mutex_init(&lru_maintainer_lock, NULL); - lru_maintainer_initialized = 1; - } + lru_maintainer_initialized = 1; return 0; } @@ -1316,12 +1316,6 @@ int start_slab_maintenance_thread(void) { } } - if (pthread_cond_init(&slab_rebalance_cond, NULL) != 0) { - fprintf(stderr, "Can't initialize rebalance condition\n"); - return -1; - } - pthread_mutex_init(&slabs_rebalance_lock, NULL); - if ((ret = pthread_create(&rebalance_tid, NULL, slab_rebalance_thread, NULL)) != 0) { fprintf(stderr, "Can't create rebal thread: %s\n", strerror(ret)); |