X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=blobdiff_plain;f=ms-queue%2Fmy_queue.c;h=7966fb200969d41ceb0d27b17c3dbba1e69237b2;hp=67ec68090545aa2eabf2114dc1bfeed880d74d6d;hb=991978d306af445e74509a0ffef879505b115b94;hpb=febf9485db788b2be7f99e7c7d674188cdb89b3e

diff --git a/ms-queue/my_queue.c b/ms-queue/my_queue.c
index 67ec680..7966fb2 100644
--- a/ms-queue/my_queue.c
+++ b/ms-queue/my_queue.c
@@ -27,23 +27,26 @@ void init_queue(queue_t *q, int num_threads)
 	for (i = 0; i < num_threads; i++)
 		node_nums[i] = 2 + i;
 
+	/* Note: needed to add this init manually */
+	atomic_init(&q->nodes[0].next, 0);
+
 	/* initialize queue */
 	head = MAKE_POINTER(1, 0);
 	tail = MAKE_POINTER(1, 0);
 	next = MAKE_POINTER(0, 0); // (NULL, 0)
 
-	atomic_store(&q->head, head);
-	atomic_store(&q->tail, tail);
-	atomic_store(&q->nodes[1].next, next);
+	atomic_init(&q->head, head);
+	atomic_init(&q->tail, tail);
+	atomic_init(&q->nodes[1].next, next);
 
 	/* initialize avail list */
 	for (i = 2; i < MAX_NODES; i++) {
 		next = MAKE_POINTER(i + 1, 0);
-		atomic_store(&q->nodes[i].next, next);
+		atomic_init(&q->nodes[i].next, next);
 	}
 
 	next = MAKE_POINTER(0, 0); // (NULL, 0)
-	atomic_store(&q->nodes[MAX_NODES].next, next);
+	atomic_init(&q->nodes[MAX_NODES].next, next);
 }
 
 void enqueue(queue_t *q, unsigned int val)
@@ -56,18 +59,18 @@ void enqueue(queue_t *q, unsigned int val)
 
 	node = new_node();
 	store_32(&q->nodes[node].value, val);
-	tmp = atomic_load(&q->nodes[node].next);
+	tmp = atomic_load_explicit(&q->nodes[node].next, memory_order_relaxed);
 	set_ptr(&tmp, 0); // NULL
-	atomic_store(&q->nodes[node].next, tmp);
+	atomic_store_explicit(&q->nodes[node].next, tmp, memory_order_relaxed);
 
 	while (!success) {
-		tail = atomic_load(&q->tail);
-		next = atomic_load(&q->nodes[get_ptr(tail)].next);
+		tail = atomic_load_explicit(&q->tail, memory_order_relaxed);
+		next = atomic_load_explicit(&q->nodes[get_ptr(tail)].next, memory_order_relaxed);
 		if (tail == atomic_load(&q->tail)) {
 			if (get_ptr(next) == 0) { // == NULL
 				pointer value = MAKE_POINTER(node, get_count(next) + 1);
-				success = atomic_compare_exchange_weak(&q->nodes[get_ptr(tail)].next,
-						&next, value);
+				success = atomic_compare_exchange_weak_explicit(&q->nodes[get_ptr(tail)].next,
+						&next, value, memory_order_release, memory_order_release);
 			}
 			if (!success) {
 				unsigned int ptr = get_ptr(atomic_load(&q->nodes[get_ptr(tail)].next));
@@ -79,9 +82,10 @@ void enqueue(queue_t *q, unsigned int val)
 			}
 		}
 	}
-	atomic_compare_exchange_strong(&q->tail,
+	atomic_compare_exchange_strong_explicit(&q->tail,
 			&tail,
-			MAKE_POINTER(node, get_count(tail) + 1));
+			MAKE_POINTER(node, get_count(tail) + 1),
+			memory_order_release, memory_order_release);
 }
 
 unsigned int dequeue(queue_t *q)
@@ -93,9 +97,9 @@ unsigned int dequeue(queue_t *q)
 	pointer next;
 
 	while (!success) {
-		head = atomic_load(&q->head);
-		tail = atomic_load(&q->tail);
-		next = atomic_load(&q->nodes[get_ptr(head)].next);
+		head = atomic_load_explicit(&q->head, memory_order_relaxed);
+		tail = atomic_load_explicit(&q->tail, memory_order_relaxed);
+		next = atomic_load_explicit(&q->nodes[get_ptr(head)].next, memory_order_relaxed);
 		if (atomic_load(&q->head) == head) {
 			if (get_ptr(head) == get_ptr(tail)) {
 				if (get_ptr(next) == 0) { // NULL