Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks

[model-checker-benchmarks.git] / ms-queue / my_queue.c

diff --git a/ms-queue/my_queue.c b/ms-queue/my_queue.c
index 33a62925c7a6a195fc0002cd54b2d3ce8807553a..7966fb200969d41ceb0d27b17c3dbba1e69237b2 100644 (file)
--- a/ms-queue/my_queue.c
+++ b/ms-queue/my_queue.c
@@ -1,5 +1,6 @@
 #include <threads.h>
 #include <stdlib.h>
+#include "librace.h"
 
 #include "my_queue.h"
 
@@ -26,25 +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_init(&q->nodes[0].next, 0); // assumed inititalized in original example
-
-       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,19 +58,19 @@ void enqueue(queue_t *q, unsigned int val)
        pointer tmp;
 
        node = new_node();
-       q->nodes[node].value = val;
-       tmp = atomic_load(&q->nodes[node].next);
+       store_32(&q->nodes[node].value, val);
+       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));
@@ -80,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)
@@ -94,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
@@ -107,7 +110,7 @@ unsigned int dequeue(queue_t *q)
                                                MAKE_POINTER(get_ptr(next), get_count(tail) + 1));
                                thrd_yield();
                        } else {
-                               value = q->nodes[get_ptr(next)].value;
+                               value = load_32(&q->nodes[get_ptr(next)].value);
                                success = atomic_compare_exchange_weak(&q->head,
                                                &head,
                                                MAKE_POINTER(get_ptr(next), get_count(head) + 1));