summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assoc.c2
-rw-r--r--crawler.c5
-rw-r--r--items.c5
-rw-r--r--slabs.c6
4 files changed, 2 insertions, 16 deletions
diff --git a/assoc.c b/assoc.c
index 68235d5..1a6b845 100644
--- a/assoc.c
+++ b/assoc.c
@@ -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));
diff --git a/crawler.c b/crawler.c
index eaaf9a5..ba0daa5 100644
--- a/crawler.c
+++ b/crawler.c
@@ -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;
diff --git a/items.c b/items.c
index 7c964ce..f8250a8 100644
--- a/items.c
+++ b/items.c
@@ -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;
}
diff --git a/slabs.c b/slabs.c
index e85fb26..eb9d19b 100644
--- a/slabs.c
+++ b/slabs.c
@@ -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));