X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Furcu-wait.h;h=1fa95c305dee77f944be5930b8dc7a092f66d17a;hb=2ea38794876c907639971035ed29c4e59964fd7f;hp=d922aeca2484fb14c096cb357904afd7624f556a;hpb=acdb82a20ba20467b89c67aa44ca03da610513a9;p=urcu.git

diff --git a/src/urcu-wait.h b/src/urcu-wait.h
index d922aec..1fa95c3 100644
--- a/src/urcu-wait.h
+++ b/src/urcu-wait.h
@@ -36,7 +36,7 @@ struct urcu_wait_node {
 };
 
 #define URCU_WAIT_NODE_INIT(name, _state)		\
-	{ .state = _state }
+	{ .node = { .next = NULL }, .state = _state }
 
 #define DEFINE_URCU_WAIT_NODE(name, state)		\
 	struct urcu_wait_node name = URCU_WAIT_NODE_INIT(name, state)
@@ -122,7 +122,7 @@ void urcu_adaptative_wake_up(struct urcu_wait_node *wait)
 			urcu_die(errno);
 	}
 	/* Allow teardown of struct urcu_wait memory. */
-	uatomic_or(&wait->state, URCU_WAIT_TEARDOWN);
+	uatomic_or_mo(&wait->state, URCU_WAIT_TEARDOWN, CMM_RELEASE);
 }
 
 /*
@@ -180,7 +180,7 @@ skip_futex_wait:
 			break;
 		caa_cpu_relax();
 	}
-	while (!(uatomic_read(&wait->state) & URCU_WAIT_TEARDOWN))
+	while (!(uatomic_load(&wait->state, CMM_ACQUIRE) & URCU_WAIT_TEARDOWN))
 		poll(NULL, 0, 10);
 	urcu_posix_assert(uatomic_read(&wait->state) & URCU_WAIT_TEARDOWN);
 }
@@ -196,7 +196,7 @@ void urcu_wake_all_waiters(struct urcu_waiters *waiters)
 			caa_container_of(iter, struct urcu_wait_node, node);
 
 		/* Don't wake already running threads */
-		if (wait_node->state & URCU_WAIT_RUNNING)
+		if (uatomic_load(&wait_node->state, CMM_RELAXED) & URCU_WAIT_RUNNING)
 			continue;
 		urcu_adaptative_wake_up(wait_node);
 	}