projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup duplicated code
[userspace-rcu.git]
/
urcu-qsbr.c
diff --git
a/urcu-qsbr.c
b/urcu-qsbr.c
index 8d8a9cf05ced0fd18ef9943110dc22a2e6e05e87..06e81c7bbbbe47ad5eb4b0b40bf81be55d8bb9b7 100644
(file)
--- a/
urcu-qsbr.c
+++ b/
urcu-qsbr.c
@@
-24,6
+24,7
@@
*/
#define _GNU_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>
@@
-34,12
+35,16
@@
#include <errno.h>
#include <poll.h>
#include <errno.h>
#include <poll.h>
+#include "urcu/wfqueue.h"
#include "urcu/map/urcu-qsbr.h"
#include "urcu/map/urcu-qsbr.h"
-
#define BUILD_QSBR_LIB
#include "urcu/static/urcu-qsbr.h"
#define BUILD_QSBR_LIB
#include "urcu/static/urcu-qsbr.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-qsbr.h"
#include "urcu-qsbr.h"
+#define _LGPL_SOURCE
void __attribute__((destructor)) rcu_exit(void);
void __attribute__((destructor)) rcu_exit(void);
@@
-204,18
+209,17
@@
void synchronize_rcu(void)
was_online = rcu_reader.ctr;
/* All threads should read qparity before accessing data structure
was_online = rcu_reader.ctr;
/* All threads should read qparity before accessing data structure
- * where new ptr points to.
- */
- /* Write new ptr before changing the qparity */
- cmm_smp_mb();
-
- /*
+ * where new ptr points to. In the "then" case, rcu_thread_offline
+ * includes a memory barrier.
+ *
* Mark the writer thread offline to make sure we don't wait for
* our own quiescent state. This allows using synchronize_rcu()
* in threads registered as readers.
*/
if (was_online)
* Mark the writer thread offline to make sure we don't wait for
* our own quiescent state. This allows using synchronize_rcu()
* in threads registered as readers.
*/
if (was_online)
- CMM_STORE_SHARED(rcu_reader.ctr, 0);
+ rcu_thread_offline();
+ else
+ cmm_smp_mb();
mutex_lock(&rcu_gp_lock);
mutex_lock(&rcu_gp_lock);
@@
-256,9
+260,9
@@
out:
* freed.
*/
if (was_online)
* freed.
*/
if (was_online)
- _CMM_STORE_SHARED(rcu_reader.ctr,
- CMM_LOAD_SHARED(rcu_gp_ctr));
- cmm_smp_mb();
+ rcu_thread_online();
+ else
+
cmm_smp_mb();
}
#else /* !(CAA_BITS_PER_LONG < 64) */
void synchronize_rcu(void)
}
#else /* !(CAA_BITS_PER_LONG < 64) */
void synchronize_rcu(void)
@@
-272,9
+276,10
@@
void synchronize_rcu(void)
* our own quiescent state. This allows using synchronize_rcu()
* in threads registered as readers.
*/
* our own quiescent state. This allows using synchronize_rcu()
* in threads registered as readers.
*/
- cmm_smp_mb();
if (was_online)
if (was_online)
- CMM_STORE_SHARED(rcu_reader.ctr, 0);
+ rcu_thread_offline();
+ else
+ cmm_smp_mb();
mutex_lock(&rcu_gp_lock);
if (cds_list_empty(®istry))
mutex_lock(&rcu_gp_lock);
if (cds_list_empty(®istry))
@@
-284,9
+289,9
@@
out:
mutex_unlock(&rcu_gp_lock);
if (was_online)
mutex_unlock(&rcu_gp_lock);
if (was_online)
- _CMM_STORE_SHARED(rcu_reader.ctr,
- CMM_LOAD_SHARED(rcu_gp_ctr));
- cmm_smp_mb();
+ rcu_thread_online();
+ else
+
cmm_smp_mb();
}
#endif /* !(CAA_BITS_PER_LONG < 64) */
}
#endif /* !(CAA_BITS_PER_LONG < 64) */
@@
-344,8
+349,14
@@
void rcu_unregister_thread(void)
void rcu_exit(void)
{
void rcu_exit(void)
{
- assert(cds_list_empty(®istry));
+ /*
+ * Assertion disabled because call_rcu threads are now rcu
+ * readers, and left running at exit.
+ * assert(cds_list_empty(®istry));
+ */
}
}
+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.028453 seconds
and
4
git commands to generate.