ms-queue: finally, the correct (?) memory orderings

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

diff --git a/ms-queue/main.c b/ms-queue/main.c
index fefb3861834f0f237aa6ad6f3e7c3b9d903d8d8c..b541b010c2837d04e798b6db73a2eb4d3dbc4f31 100644 (file)
--- a/ms-queue/main.c
+++ b/ms-queue/main.c
@@ -1,75 +1,79 @@
 #include <stdlib.h>
-#include <assert.h>
 #include <stdio.h>
 #include <threads.h>
 
 #include "my_queue.h"
+#include "model-assert.h"
 
 static int procs = 2;
-static int iterations = 1;
-private_t private;
 static queue_t *queue;
+static thrd_t *threads;
+static unsigned int *input;
+static unsigned int *output;
+static int num_threads;
 
-static void parse_args(int argc, char **argv)
+int get_thread_num()
 {
-       extern char *optarg;
-       int c;
-
-       while ((c = getopt(argc, argv, "i:p:")) != EOF) {
-               switch (c) {
-               case 'i':
-                       iterations = atoi(optarg);
-                       break;
-               case 'p':
-                       procs = atoi(optarg);
-                       break;
-               default:
-                       assert(0);
-               }
-       }
+       thrd_t curr = thrd_current();
+       int i;
+       for (i = 0; i < num_threads; i++)
+               if (curr.priv == threads[i].priv)
+                       return i;
+       MODEL_ASSERT(0);
+       return -1;
 }
 
 static void main_task(void *param)
 {
-       unsigned i, j;
-       unsigned val;
+       unsigned int val;
        int pid = *((int *)param);
 
-       init_private(pid);
-       for (i = 0; i < iterations; i++) {
-               val = 1 + pid * iterations + i;
-               enqueue(queue, val);
-
-               val = dequeue(queue);
+       if (!pid) {
+               input[0] = 17;
+               enqueue(queue, input[0]);
+               output[0] = dequeue(queue);
+       } else {
+               input[1] = 37;
+               enqueue(queue, input[1]);
+               output[1] = dequeue(queue);
        }
 }
 
 int user_main(int argc, char **argv)
 {
-       int i, num_threads;
-       thrd_t *t;
+       int i;
        int *param;
-
-       parse_args(argc, argv);
-       iterations = (iterations + (procs >> 1)) / procs;
+       unsigned int in_sum = 0, out_sum = 0;
 
        queue = calloc(1, sizeof(*queue));
-       assert(queue);
+       MODEL_ASSERT(queue);
 
        num_threads = procs;
-       t = malloc(num_threads * sizeof(thrd_t));
+       threads = malloc(num_threads * sizeof(thrd_t));
        param = malloc(num_threads * sizeof(*param));
+       input = calloc(num_threads, sizeof(*input));
+       output = calloc(num_threads, sizeof(*output));
 
-       init_queue(queue);
+       init_queue(queue, num_threads);
        for (i = 0; i < num_threads; i++) {
                param[i] = i;
-               thrd_create(&t[i], main_task, &param[i]);
+               thrd_create(&threads[i], main_task, &param[i]);
        }
        for (i = 0; i < num_threads; i++)
-               thrd_join(t[i]);
+               thrd_join(threads[i]);
+
+       for (i = 0; i < num_threads; i++) {
+               in_sum += input[i];
+               out_sum += output[i];
+       }
+       for (i = 0; i < num_threads; i++)
+               printf("input[%d] = %u\n", i, input[i]);
+       for (i = 0; i < num_threads; i++)
+               printf("output[%d] = %u\n", i, output[i]);
+       MODEL_ASSERT(in_sum == out_sum);
 
        free(param);
-       free(t);
+       free(threads);
        free(queue);
 
        return 0;