ms-queue: cleanups, convert to C11 atomics

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

diff --git a/ms-queue/main.c b/ms-queue/main.c
index 015fbd4..30d9da9 100644 (file)
--- a/ms-queue/main.c
+++ b/ms-queue/main.c
@@ -1,78 +1,52 @@
 #include "main.h"
 #include <stdlib.h>
 
 #include "main.h"
 #include <stdlib.h>
 

-#define NUM_PROCESSORS                 12
-
-struct tms tim;
-struct tms tim1;
-
-int shmid;
-
-unsigned pid;
-char* name = "";
-unsigned procs = 1;
-unsigned multi = 1;
+unsigned procs = 2;

 unsigned iterations = 1;
 unsigned iterations = 1;

-unsigned initial_nodes = 0;
-unsigned repetitions = 1;
-unsigned work = 0;

 private_t private;
 shared_mem_t *smp;
 
 private_t private;
 shared_mem_t *smp;
 

-void time_test()
+static void main_task(void *param)

 {
 {

-       unsigned i,j;
-       struct tms time_val;
-       clock_t t1, t2;
+       unsigned i, j;

        unsigned val;
        unsigned val;

+       int pid = *((int *)param);

 
 

-       if(pid==0) {
-               init_queue();
-       }

        init_memory();
        init_memory();

-       init_private();
-       for(i=0;i<iterations;i++) {
+       init_private(pid);
+       for (i = 0; i < iterations; i++) {

                val = private.value;
                enqueue(val);
                val = private.value;
                enqueue(val);

-               for(j=0; j<work;) j++;

                val = dequeue();
                val = dequeue();

-               for(j=0; j<work;) j++;

                private.value++;
        }
 }
 
                private.value++;
        }
 }
 

-void main_task()
-{
-       unsigned processor;
-       unsigned i;
-
-       processor = (pid/multi)+1;
-       processor %= NUM_PROCESSORS;
-       for (i=0; i<repetitions; i++) {
-               time_test();
-       }
-}
-

 int user_main(int argc, char **argv)
 {
        int i, num_threads;
        thrd_t *t;
 int user_main(int argc, char **argv)
 {
        int i, num_threads;
        thrd_t *t;

+       int *param;

 
        parse_args(argc, argv);
 
        parse_args(argc, argv);

-       name = argv[0];
-       iterations = (iterations + ((procs*multi)>>1))/(procs*multi);
+       iterations = (iterations + (procs >> 1)) / procs;

 
        smp = (shared_mem_t *)calloc(1, sizeof(shared_mem_t));
        assert(smp);
 
 
        smp = (shared_mem_t *)calloc(1, sizeof(shared_mem_t));
        assert(smp);
 

-       num_threads = procs * multi;
+       num_threads = procs;

        t = malloc(num_threads * sizeof(thrd_t));
        t = malloc(num_threads * sizeof(thrd_t));

+       param = malloc(num_threads * sizeof(*param));

 
 

-       for (i = 0; i < num_threads; i++)
-               thrd_create(&t[i], main_task, NULL);
+       init_queue();
+       for (i = 0; i < num_threads; i++) {
+               param[i] = i;
+               thrd_create(&t[i], main_task, &param[i]);
+       }

        for (i = 0; i < num_threads; i++)
                thrd_join(t[i]);
 
        for (i = 0; i < num_threads; i++)
                thrd_join(t[i]);
 

+       free(param);

        free(t);
        free(smp);
 
        free(t);
        free(smp);