ms-queue: fixups, add simple race detection

diff --git a/ms-queue/main.c b/ms-queue/main.c
index 51e0e79c478e64c0267ba794b074115b7f69d822..210c57a1e208518c6dca9558d0c9d9357e88ca19 100644 (file)
--- a/ms-queue/main.c
+++ b/ms-queue/main.c
@@ -63,7 +63,6 @@ int user_main(int argc, char **argv)
        int *param;
 
        parse_args(argc, argv);
        int *param;
 
        parse_args(argc, argv);

-       iterations = (iterations + (procs >> 1)) / procs;

 
        queue = calloc(1, sizeof(*queue));
        assert(queue);
 
        queue = calloc(1, sizeof(*queue));
        assert(queue);

diff --git a/ms-queue/my_queue.c b/ms-queue/my_queue.c
index 498fb42b1188bb344bde560c6bd570f468558dbf..67ec68090545aa2eabf2114dc1bfeed880d74d6d 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 <threads.h>
 #include <stdlib.h>

+#include "librace.h"

 
 #include "my_queue.h"
 
 
 #include "my_queue.h"
 


@@ -54,7 +55,7 @@ void enqueue(queue_t *q, unsigned int val)
        pointer tmp;
 
        node = new_node();
        pointer tmp;
 
        node = new_node();

-       q->nodes[node].value = val;
+       store_32(&q->nodes[node].value, val);

        tmp = atomic_load(&q->nodes[node].next);
        set_ptr(&tmp, 0); // NULL
        atomic_store(&q->nodes[node].next, tmp);
        tmp = atomic_load(&q->nodes[node].next);
        set_ptr(&tmp, 0); // NULL
        atomic_store(&q->nodes[node].next, tmp);


@@ -105,7 +106,7 @@ unsigned int dequeue(queue_t *q)
                                                MAKE_POINTER(get_ptr(next), get_count(tail) + 1));
                                thrd_yield();
                        } else {
                                                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));
                                success = atomic_compare_exchange_weak(&q->head,
                                                &head,
                                                MAKE_POINTER(get_ptr(next), get_count(head) + 1));