X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-defer.c;h=92635ed3cca4c1f45390bfac5348714722f56547;hp=a38b5c0b9418af76287b3e552fd089f278cb5e55;hb=0ecb3fde04135d76545ce55d80abea9aef465b54;hpb=dbc6128f26035b2903e3278c6c41990c90831511

diff --git a/urcu-defer.c b/urcu-defer.c
index a38b5c0..92635ed 100644
--- a/urcu-defer.c
+++ b/urcu-defer.c
@@ -32,22 +32,19 @@
 #include <syscall.h>
 #include <unistd.h>
 
+#include "urcu/urcu-futex.h"
 #include "urcu-defer-static.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu-defer.h"
 
-#define futex(...)	syscall(__NR_futex, __VA_ARGS__)
-#define FUTEX_WAIT		0
-#define FUTEX_WAKE		1
-
-void __attribute__((destructor)) urcu_defer_exit(void);
+void __attribute__((destructor)) rcu_defer_exit(void);
 
 extern void synchronize_rcu(void);
 
 /*
- * urcu_defer_mutex nests inside defer_thread_mutex.
+ * rcu_defer_mutex nests inside defer_thread_mutex.
  */
-static pthread_mutex_t urcu_defer_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t rcu_defer_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t defer_thread_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static int defer_thread_futex;
@@ -60,7 +57,7 @@ static struct defer_queue __thread defer_queue;
 static LIST_HEAD(registry);
 static pthread_t tid_defer;
 
-static void internal_urcu_lock(pthread_mutex_t *mutex)
+static void mutex_lock(pthread_mutex_t *mutex)
 {
 	int ret;
 
@@ -83,7 +80,7 @@ static void internal_urcu_lock(pthread_mutex_t *mutex)
 #endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */
 }
 
-static void internal_urcu_unlock(pthread_mutex_t *mutex)
+static void mutex_unlock(pthread_mutex_t *mutex)
 {
 	int ret;
 
@@ -101,7 +98,7 @@ static void wake_up_defer(void)
 {
 	if (unlikely(uatomic_read(&defer_thread_futex) == -1)) {
 		uatomic_set(&defer_thread_futex, 0);
-		futex(&defer_thread_futex, FUTEX_WAKE, 1,
+		futex_noasync(&defer_thread_futex, FUTEX_WAKE, 1,
 		      NULL, NULL, 0);
 	}
 }
@@ -111,12 +108,12 @@ static unsigned long rcu_defer_num_callbacks(void)
 	unsigned long num_items = 0, head;
 	struct defer_queue *index;
 
-	internal_urcu_lock(&urcu_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_urcu_unlock(&urcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 	return num_items;
 }
 
@@ -134,7 +131,7 @@ static void wait_defer(void)
 	} else {
 		smp_rmb();	/* Read queue before read futex */
 		if (uatomic_read(&defer_thread_futex) == -1)
-			futex(&defer_thread_futex, FUTEX_WAIT, -1,
+			futex_noasync(&defer_thread_futex, FUTEX_WAIT, -1,
 			      NULL, NULL, 0);
 	}
 }
@@ -187,9 +184,9 @@ static void _rcu_defer_barrier_thread(void)
 
 void rcu_defer_barrier_thread(void)
 {
-	internal_urcu_lock(&urcu_defer_mutex);
+	mutex_lock(&rcu_defer_mutex);
 	_rcu_defer_barrier_thread();
-	internal_urcu_unlock(&urcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 }
 
 /*
@@ -213,7 +210,7 @@ void rcu_defer_barrier(void)
 	if (list_empty(&registry))
 		return;
 
-	internal_urcu_lock(&urcu_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;
@@ -229,13 +226,13 @@ void rcu_defer_barrier(void)
 	list_for_each_entry(index, &registry, list)
 		rcu_defer_barrier_queue(index, index->last_head);
 end:
-	internal_urcu_unlock(&urcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 }
 
 /*
- * _rcu_defer_queue - Queue a RCU callback.
+ * _defer_rcu - Queue a RCU callback.
  */
-void _rcu_defer_queue(void (*fct)(void *p), void *p)
+void _defer_rcu(void (*fct)(void *p), void *p)
 {
 	unsigned long head, tail;
 
@@ -247,7 +244,7 @@ void _rcu_defer_queue(void (*fct)(void *p), void *p)
 	tail = LOAD_SHARED(defer_queue.tail);
 
 	/*
-	 * If queue is full, empty it ourself.
+	 * If queue is full, or reached threshold. Empty queue ourself.
 	 * Worse-case: must allow 2 supplementary entries for fct pointer.
 	 */
 	if (unlikely(head - tail >= DEFER_QUEUE_SIZE - 2)) {
@@ -318,9 +315,9 @@ void *thr_defer(void *args)
  * library wrappers to be used by non-LGPL compatible source code.
  */
 
-void rcu_defer_queue(void (*fct)(void *p), void *p)
+void defer_rcu(void (*fct)(void *p), void *p)
 {
-	_rcu_defer_queue(fct, p);
+	_defer_rcu(fct, p);
 }
 
 static void start_defer_thread(void)
@@ -350,36 +347,36 @@ void rcu_defer_register_thread(void)
 	assert(defer_queue.q == NULL);
 	defer_queue.q = malloc(sizeof(void *) * DEFER_QUEUE_SIZE);
 
-	internal_urcu_lock(&defer_thread_mutex);
-	internal_urcu_lock(&urcu_defer_mutex);
+	mutex_lock(&defer_thread_mutex);
+	mutex_lock(&rcu_defer_mutex);
 	was_empty = list_empty(&registry);
 	list_add(&defer_queue.list, &registry);
-	internal_urcu_unlock(&urcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 
 	if (was_empty)
 		start_defer_thread();
-	internal_urcu_unlock(&defer_thread_mutex);
+	mutex_unlock(&defer_thread_mutex);
 }
 
 void rcu_defer_unregister_thread(void)
 {
 	int is_empty;
 
-	internal_urcu_lock(&defer_thread_mutex);
-	internal_urcu_lock(&urcu_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_urcu_unlock(&urcu_defer_mutex);
+	mutex_unlock(&rcu_defer_mutex);
 
 	if (is_empty)
 		stop_defer_thread();
-	internal_urcu_unlock(&defer_thread_mutex);
+	mutex_unlock(&defer_thread_mutex);
 }
 
-void urcu_defer_exit(void)
+void rcu_defer_exit(void)
 {
 	assert(list_empty(&registry));
 }