projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into urcu/ht-shrink
[userspace-rcu.git]
/
urcu.c
diff --git
a/urcu.c
b/urcu.c
index be6d4bdfc55b32d624011280c972d6f2772f2853..b4346551b2403127da9822f08223f875c991e4ca 100644
(file)
--- a/
urcu.c
+++ b/
urcu.c
@@
-25,6
+25,7
@@
#define _BSD_SOURCE
#define _GNU_SOURCE
#define _BSD_SOURCE
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
@@
-35,11
+36,15
@@
#include <errno.h>
#include <poll.h>
#include <errno.h>
#include <poll.h>
+#include "urcu/wfqueue.h"
#include "urcu/map/urcu.h"
#include "urcu/map/urcu.h"
-
#include "urcu/static/urcu.h"
#include "urcu/static/urcu.h"
+#include "urcu-pointer.h"
+
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
+#undef _LGPL_SOURCE
#include "urcu.h"
#include "urcu.h"
+#define _LGPL_SOURCE
/*
* If a reader is really non-cooperative and refuses to commit its
/*
* If a reader is really non-cooperative and refuses to commit its
@@
-139,7
+144,7
@@
static void mutex_unlock(pthread_mutex_t *mutex)
#ifdef RCU_MEMBARRIER
static void smp_mb_master(int group)
{
#ifdef RCU_MEMBARRIER
static void smp_mb_master(int group)
{
- if (likely(has_sys_membarrier))
+ if (
caa_
likely(has_sys_membarrier))
membarrier(MEMBARRIER_EXPEDITED);
else
cmm_smp_mb();
membarrier(MEMBARRIER_EXPEDITED);
else
cmm_smp_mb();
@@
-447,5
+452,7
@@
void rcu_exit(void)
#endif /* #ifdef RCU_SIGNAL */
#endif /* #ifdef RCU_SIGNAL */
+DEFINE_RCU_FLAVOR()
+
#include "urcu-call-rcu-impl.h"
#include "urcu-defer-impl.h"
#include "urcu-call-rcu-impl.h"
#include "urcu-defer-impl.h"
This page took
0.023345 seconds
and
4
git commands to generate.