X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-defer.c;h=6dc08a383f0f310ee0d71358242ed3a1bf081a20;hp=50aa066053850be20f4ac254e81296600fad79b7;hb=5481ddb381061bda64aebc039900d21cac6a6caf;hpb=02be55611d3b1c7bf4fdfcb3a9c98f621882d417

diff --git a/urcu-defer.c b/urcu-defer.c
index 50aa066..6dc08a3 100644
--- a/urcu-defer.c
+++ b/urcu-defer.c
@@ -3,7 +3,7 @@
  *
  * Userspace RCU library - batch memory reclamation
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -57,7 +57,7 @@ static struct defer_queue __thread defer_queue;
 static LIST_HEAD(registry);
 static pthread_t tid_defer;
 
-static void internal_rcu_lock(pthread_mutex_t *mutex)
+static void mutex_lock(pthread_mutex_t *mutex)
 {
 	int ret;
 
@@ -80,7 +80,7 @@ static void internal_rcu_lock(pthread_mutex_t *mutex)
 #endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */
 }
 
-static void internal_rcu_unlock(pthread_mutex_t *mutex)
+static void mutex_unlock(pthread_mutex_t *mutex)
 {
 	int ret;
 
@@ -108,12 +108,12 @@ static unsigned long rcu_defer_num_callbacks(void)
 	unsigned long num_items = 0, head;
 	struct defer_queue *index;
 
-	internal_rcu_lock(&rcu_defer_mutex);
+	mutex_lock(&rcu_defer_mutex);
 	list_for_each_entry(index, &registry, list) {
 		head = LOAD_SHARED(index->head);
 		num_items += head - index->tail;
 	}
-	internal_rcu_unlock(&rcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 	return num_items;
 }
 
@@ -123,13 +123,13 @@ static unsigned long rcu_defer_num_callbacks(void)
 static void wait_defer(void)
 {
 	uatomic_dec(&defer_thread_futex);
-	smp_mb();	/* Write futex before read queue */
+	cmm_smp_mb();	/* Write futex before read queue */
 	if (rcu_defer_num_callbacks()) {
-		smp_mb();	/* Read queue before write futex */
+		cmm_smp_mb();	/* Read queue before write futex */
 		/* Callbacks are queued, don't wait. */
 		uatomic_set(&defer_thread_futex, 0);
 	} else {
-		smp_rmb();	/* Read queue before read futex */
+		cmm_smp_rmb();	/* Read queue before read futex */
 		if (uatomic_read(&defer_thread_futex) == -1)
 			futex_noasync(&defer_thread_futex, FUTEX_WAIT, -1,
 			      NULL, NULL, 0);
@@ -152,7 +152,7 @@ static void rcu_defer_barrier_queue(struct defer_queue *queue,
 	 */
 
 	for (i = queue->tail; i != head;) {
-		smp_rmb();       /* read head before q[]. */
+		cmm_smp_rmb();       /* read head before q[]. */
 		p = LOAD_SHARED(queue->q[i++ & DEFER_QUEUE_MASK]);
 		if (unlikely(DQ_IS_FCT_BIT(p))) {
 			DQ_CLEAR_FCT_BIT(p);
@@ -166,7 +166,7 @@ static void rcu_defer_barrier_queue(struct defer_queue *queue,
 		fct = queue->last_fct_out;
 		fct(p);
 	}
-	smp_mb();	/* push tail after having used q[] */
+	cmm_smp_mb();	/* push tail after having used q[] */
 	STORE_SHARED(queue->tail, i);
 }
 
@@ -184,9 +184,9 @@ static void _rcu_defer_barrier_thread(void)
 
 void rcu_defer_barrier_thread(void)
 {
-	internal_rcu_lock(&rcu_defer_mutex);
+	mutex_lock(&rcu_defer_mutex);
 	_rcu_defer_barrier_thread();
-	internal_rcu_unlock(&rcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 }
 
 /*
@@ -210,7 +210,7 @@ void rcu_defer_barrier(void)
 	if (list_empty(&registry))
 		return;
 
-	internal_rcu_lock(&rcu_defer_mutex);
+	mutex_lock(&rcu_defer_mutex);
 	list_for_each_entry(index, &registry, list) {
 		index->last_head = LOAD_SHARED(index->head);
 		num_items += index->last_head - index->tail;
@@ -226,7 +226,7 @@ void rcu_defer_barrier(void)
 	list_for_each_entry(index, &registry, list)
 		rcu_defer_barrier_queue(index, index->last_head);
 end:
-	internal_rcu_unlock(&rcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 }
 
 /*
@@ -247,7 +247,7 @@ void _defer_rcu(void (*fct)(void *p), void *p)
 	 * If queue is full, or reached threshold. Empty queue ourself.
 	 * Worse-case: must allow 2 supplementary entries for fct pointer.
 	 */
-	if (unlikely(sync || (head - tail >= DEFER_QUEUE_SIZE - 2))) {
+	if (unlikely(head - tail >= DEFER_QUEUE_SIZE - 2)) {
 		assert(head - tail <= DEFER_QUEUE_SIZE);
 		rcu_defer_barrier_thread();
 		assert(head - LOAD_SHARED(defer_queue.tail) == 0);
@@ -283,10 +283,10 @@ void _defer_rcu(void (*fct)(void *p), void *p)
 		}
 	}
 	_STORE_SHARED(defer_queue.q[head++ & DEFER_QUEUE_MASK], p);
-	smp_wmb();	/* Publish new pointer before head */
+	cmm_smp_wmb();	/* Publish new pointer before head */
 			/* Write q[] before head. */
 	STORE_SHARED(defer_queue.head, head);
-	smp_mb();	/* Write queue head before read futex */
+	cmm_smp_mb();	/* Write queue head before read futex */
 	/*
 	 * Wake-up any waiting defer thread.
 	 */
@@ -347,33 +347,33 @@ void rcu_defer_register_thread(void)
 	assert(defer_queue.q == NULL);
 	defer_queue.q = malloc(sizeof(void *) * DEFER_QUEUE_SIZE);
 
-	internal_rcu_lock(&defer_thread_mutex);
-	internal_rcu_lock(&rcu_defer_mutex);
+	mutex_lock(&defer_thread_mutex);
+	mutex_lock(&rcu_defer_mutex);
 	was_empty = list_empty(&registry);
 	list_add(&defer_queue.list, &registry);
-	internal_rcu_unlock(&rcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 
 	if (was_empty)
 		start_defer_thread();
-	internal_rcu_unlock(&defer_thread_mutex);
+	mutex_unlock(&defer_thread_mutex);
 }
 
 void rcu_defer_unregister_thread(void)
 {
 	int is_empty;
 
-	internal_rcu_lock(&defer_thread_mutex);
-	internal_rcu_lock(&rcu_defer_mutex);
+	mutex_lock(&defer_thread_mutex);
+	mutex_lock(&rcu_defer_mutex);
 	list_del(&defer_queue.list);
 	_rcu_defer_barrier_thread();
 	free(defer_queue.q);
 	defer_queue.q = NULL;
 	is_empty = list_empty(&registry);
-	internal_rcu_unlock(&rcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 
 	if (is_empty)
 		stop_defer_thread();
-	internal_rcu_unlock(&defer_thread_mutex);
+	mutex_unlock(&defer_thread_mutex);
 }
 
 void rcu_defer_exit(void)