X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu-bp.c;h=59cc4bc8c76b7833d3e7573b4bb7f53802a28f8f;hb=48bf2f76e0f1fe9a778359a8291134f80ce3e79a;hp=71474bcbcb6fe85494635c004bfdeb0d5f7a3aae;hpb=e038e286679be66f3d8096ea9c7224a1f282a9c3;p=userspace-rcu.git

diff --git a/urcu-bp.c b/urcu-bp.c
index 71474bc..59cc4bc 100644
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -91,6 +91,9 @@ void *mremap_wrapper(void *old_address, size_t old_size,
  */
 #define RCU_QS_ACTIVE_ATTEMPTS 100
 
+static
+int rcu_bp_refcount;
+
 static
 void __attribute__((constructor)) rcu_bp_init(void);
 static
@@ -105,7 +108,7 @@ static pthread_key_t urcu_bp_key;
 
 #ifdef DEBUG_YIELD
 unsigned int yield_active;
-DEFINE_URCU_TLS(unsigned int, rand_yield);
+__DEFINE_URCU_TLS_GLOBAL(unsigned int, rand_yield);
 #endif
 
 /*
@@ -120,7 +123,7 @@ long rcu_gp_ctr = RCU_GP_COUNT;
  * Pointer to registry elements. Written to only by each individual reader. Read
  * by both the reader and the writers.
  */
-DEFINE_URCU_TLS(struct rcu_reader *, rcu_reader);
+__DEFINE_URCU_TLS_GLOBAL(struct rcu_reader *, rcu_reader);
 
 static CDS_LIST_HEAD(registry);
 
@@ -429,11 +432,8 @@ struct registry_chunk *find_chunk(struct rcu_reader *rcu_reader_reg)
 
 /* Called with signals off and mutex locked */
 static
-void remove_thread(void)
+void remove_thread(struct rcu_reader *rcu_reader_reg)
 {
-	struct rcu_reader *rcu_reader_reg;
-
-	rcu_reader_reg = URCU_TLS(rcu_reader);
 	cleanup_thread(find_chunk(rcu_reader_reg), rcu_reader_reg);
 	URCU_TLS(rcu_reader) = NULL;
 }
@@ -474,7 +474,7 @@ end:
 
 /* Disable signals, take mutex, remove from registry */
 static
-void rcu_bp_unregister(void)
+void rcu_bp_unregister(struct rcu_reader *rcu_reader_reg)
 {
 	sigset_t newmask, oldmask;
 	int ret;
@@ -487,11 +487,12 @@ void rcu_bp_unregister(void)
 		abort();
 
 	mutex_lock(&rcu_gp_lock);
-	remove_thread();
+	remove_thread(rcu_reader_reg);
 	mutex_unlock(&rcu_gp_lock);
 	ret = pthread_sigmask(SIG_SETMASK, &oldmask, NULL);
 	if (ret)
 		abort();
+	rcu_bp_exit();
 }
 
 /*
@@ -501,15 +502,14 @@ void rcu_bp_unregister(void)
 static
 void urcu_bp_thread_exit_notifier(void *rcu_key)
 {
-	assert(rcu_key == URCU_TLS(rcu_reader));
-	rcu_bp_unregister();
+	rcu_bp_unregister(rcu_key);
 }
 
 static
 void rcu_bp_init(void)
 {
 	mutex_lock(&init_lock);
-	if (!initialized) {
+	if (!rcu_bp_refcount++) {
 		int ret;
 
 		ret = pthread_key_create(&urcu_bp_key,
@@ -524,16 +524,21 @@ void rcu_bp_init(void)
 static
 void rcu_bp_exit(void)
 {
-	struct registry_chunk *chunk, *tmp;
-	int ret;
+	mutex_lock(&init_lock);
+	if (!--rcu_bp_refcount) {
+		struct registry_chunk *chunk, *tmp;
+		int ret;
 
-	cds_list_for_each_entry_safe(chunk, tmp,
-			&registry_arena.chunk_list, node) {
-		munmap(chunk, chunk->data_len + sizeof(struct registry_chunk));
+		cds_list_for_each_entry_safe(chunk, tmp,
+				&registry_arena.chunk_list, node) {
+			munmap(chunk, chunk->data_len
+					+ sizeof(struct registry_chunk));
+		}
+		ret = pthread_key_delete(urcu_bp_key);
+		if (ret)
+			abort();
 	}
-	ret = pthread_key_delete(urcu_bp_key);
-	if (ret)
-		abort();
+	mutex_unlock(&init_lock);
 }
 
 /*