projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: move transparent union attribute after union declaration for clang
[urcu.git]
/
urcu
/
static
/
lfstack.h
diff --git
a/urcu/static/lfstack.h
b/urcu/static/lfstack.h
index fe9e8abe1fe266eeae3d5a3a8fd91187fb8b8d17..41895a6087a95daee07a7247786c77bd16d706b8 100644
(file)
--- a/
urcu/static/lfstack.h
+++ b/
urcu/static/lfstack.h
@@
-78,6
+78,15
@@
void _cds_lfs_init(struct cds_lfs_stack *s)
assert(!ret);
}
assert(!ret);
}
+/*
+ * ___cds_lfs_init: initialize lock-free stack.
+ */
+static inline
+void ___cds_lfs_init(struct __cds_lfs_stack *s)
+{
+ s->head = NULL;
+}
+
static inline
bool ___cds_lfs_empty_head(struct cds_lfs_head *head)
{
static inline
bool ___cds_lfs_empty_head(struct cds_lfs_head *head)
{
@@
-90,9
+99,9
@@
bool ___cds_lfs_empty_head(struct cds_lfs_head *head)
* No memory barrier is issued. No mutual exclusion is required.
*/
static inline
* No memory barrier is issued. No mutual exclusion is required.
*/
static inline
-bool _cds_lfs_empty(
struct cds_lfs_stack *
s)
+bool _cds_lfs_empty(
cds_lfs_stack_ptr_t
s)
{
{
- return ___cds_lfs_empty_head(CMM_LOAD_SHARED(s->head));
+ return ___cds_lfs_empty_head(CMM_LOAD_SHARED(s
._s
->head));
}
/*
}
/*
@@
-118,16
+127,17
@@
bool _cds_lfs_empty(struct cds_lfs_stack *s)
* always performing an exclusive cacheline access, rather than doing
* non-exclusive followed by exclusive cacheline access (which would be
* required if we first read the old head value). This design decision
* always performing an exclusive cacheline access, rather than doing
* non-exclusive followed by exclusive cacheline access (which would be
* required if we first read the old head value). This design decision
- * might be revisited after more th
r
orough benchmarking on various
+ * might be revisited after more thorough benchmarking on various
* platforms.
*
* Returns 0 if the stack was empty prior to adding the node.
* Returns non-zero otherwise.
*/
static inline
* platforms.
*
* Returns 0 if the stack was empty prior to adding the node.
* Returns non-zero otherwise.
*/
static inline
-bool _cds_lfs_push(
struct cds_lfs_stack *
s,
+bool _cds_lfs_push(
cds_lfs_stack_ptr_t u_
s,
struct cds_lfs_node *node)
{
struct cds_lfs_node *node)
{
+ struct __cds_lfs_stack *s = u_s._s;
struct cds_lfs_head *head = NULL;
struct cds_lfs_head *new_head =
caa_container_of(node, struct cds_lfs_head, node);
struct cds_lfs_head *head = NULL;
struct cds_lfs_head *new_head =
caa_container_of(node, struct cds_lfs_head, node);
@@
-148,7
+158,7
@@
bool _cds_lfs_push(struct cds_lfs_stack *s,
if (old_head == head)
break;
}
if (old_head == head)
break;
}
- return ___cds_lfs_empty_head(head);
+ return
!
___cds_lfs_empty_head(head);
}
/*
}
/*
@@
-168,8
+178,10
@@
bool _cds_lfs_push(struct cds_lfs_stack *s,
* __cds_lfs_pop_all(). (multi-provider/single-consumer scheme).
*/
static inline
* __cds_lfs_pop_all(). (multi-provider/single-consumer scheme).
*/
static inline
-struct cds_lfs_node *___cds_lfs_pop(
struct cds_lfs_stack *
s)
+struct cds_lfs_node *___cds_lfs_pop(
cds_lfs_stack_ptr_t u_
s)
{
{
+ struct __cds_lfs_stack *s = u_s._s;
+
for (;;) {
struct cds_lfs_head *head, *next_head;
struct cds_lfs_node *next;
for (;;) {
struct cds_lfs_head *head, *next_head;
struct cds_lfs_node *next;
@@
-211,8
+223,10
@@
struct cds_lfs_node *___cds_lfs_pop(struct cds_lfs_stack *s)
* __cds_lfs_pop_all(). (multi-provider/single-consumer scheme).
*/
static inline
* __cds_lfs_pop_all(). (multi-provider/single-consumer scheme).
*/
static inline
-struct cds_lfs_head *___cds_lfs_pop_all(
struct cds_lfs_stack *
s)
+struct cds_lfs_head *___cds_lfs_pop_all(
cds_lfs_stack_ptr_t u_
s)
{
{
+ struct __cds_lfs_stack *s = u_s._s;
+
/*
* Implicit memory barrier after uatomic_xchg() matches implicit
* memory barrier before uatomic_cmpxchg() in cds_lfs_push. It
/*
* Implicit memory barrier after uatomic_xchg() matches implicit
* memory barrier before uatomic_cmpxchg() in cds_lfs_push. It
This page took
0.024945 seconds
and
4
git commands to generate.