projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version to 0.3.0
[urcu.git]
/
urcu-defer.c
diff --git
a/urcu-defer.c
b/urcu-defer.c
index a38b5c0b9418af76287b3e552fd089f278cb5e55..b7b3c51f2c0eed98562b1a0b8c726c5daf30a3cc 100644
(file)
--- a/
urcu-defer.c
+++ b/
urcu-defer.c
@@
-32,14
+32,11
@@
#include <syscall.h>
#include <unistd.h>
#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"
#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);
extern void synchronize_rcu(void);
void __attribute__((destructor)) urcu_defer_exit(void);
extern void synchronize_rcu(void);
@@
-101,7
+98,7
@@
static void wake_up_defer(void)
{
if (unlikely(uatomic_read(&defer_thread_futex) == -1)) {
uatomic_set(&defer_thread_futex, 0);
{
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);
}
}
NULL, NULL, 0);
}
}
@@
-134,7
+131,7
@@
static void wait_defer(void)
} else {
smp_rmb(); /* Read queue before read futex */
if (uatomic_read(&defer_thread_futex) == -1)
} 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);
}
}
NULL, NULL, 0);
}
}
@@
-233,9
+230,9
@@
end:
}
/*
}
/*
- * _
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;
{
unsigned long head, tail;
@@
-247,10
+244,10
@@
void _rcu_defer_queue(void (*fct)(void *p), void *p)
tail = LOAD_SHARED(defer_queue.tail);
/*
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.
*/
* Worse-case: must allow 2 supplementary entries for fct pointer.
*/
- if (unlikely(
head - tail >= DEFER_QUEUE_SIZE - 2
)) {
+ if (unlikely(
sync || (head - tail >= DEFER_QUEUE_SIZE - 2)
)) {
assert(head - tail <= DEFER_QUEUE_SIZE);
rcu_defer_barrier_thread();
assert(head - LOAD_SHARED(defer_queue.tail) == 0);
assert(head - tail <= DEFER_QUEUE_SIZE);
rcu_defer_barrier_thread();
assert(head - LOAD_SHARED(defer_queue.tail) == 0);
@@
-318,9
+315,9
@@
void *thr_defer(void *args)
* library wrappers to be used by non-LGPL compatible source code.
*/
* 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)
}
static void start_defer_thread(void)
This page took
0.024104 seconds
and
4
git commands to generate.