ms-queue: cleanups

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

diff --git a/ms-queue/main.c b/ms-queue/main.c
index 015fbd4c7737175294b9952b697558dca7bf66af..51e0e79c478e64c0267ba794b074115b7f69d822 100644 (file)
--- a/ms-queue/main.c
+++ b/ms-queue/main.c
@@ -1,80 +1,88 @@
-#include "main.h"
 #include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+#include <threads.h>
 
-#define NUM_PROCESSORS                 12
+#include "my_queue.h"
 
-struct tms tim;
-struct tms tim1;
+static int procs = 2;
+static int iterations = 1;
+static queue_t *queue;
+static thrd_t *threads;
+static int num_threads;
 
-int shmid;
-
-unsigned pid;
-char* name = "";
-unsigned procs = 1;
-unsigned multi = 1;
-unsigned iterations = 1;
-unsigned initial_nodes = 0;
-unsigned repetitions = 1;
-unsigned work = 0;
-private_t private;
-shared_mem_t *smp;
+int get_thread_num()
+{
+       thrd_t curr = thrd_current();
+       int i;
+       for (i = 0; i < num_threads; i++)
+               if (curr.priv == threads[i].priv)
+                       return i;
+       assert(0);
+       return -1;
+}
 
-void time_test()
+static void parse_args(int argc, char **argv)
 {
-       unsigned i,j;
-       struct tms time_val;
-       clock_t t1, t2;
-       unsigned val;
+       extern char *optarg;
+       int c;
 
-       if(pid==0) {
-               init_queue();
-       }
-       init_memory();
-       init_private();
-       for(i=0;i<iterations;i++) {
-               val = private.value;
-               enqueue(val);
-               for(j=0; j<work;) j++;
-               val = dequeue();
-               for(j=0; j<work;) j++;
-               private.value++;
+       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);
+               }
        }
 }
 
-void main_task()
+static void main_task(void *param)
 {
-       unsigned processor;
-       unsigned i;
+       unsigned int i, j;
+       unsigned int val;
+       int pid = *((int *)param);
+
+       for (i = 0; i < iterations; i++) {
+               val = 1 + pid * iterations + i;
+               printf("worker %d, enqueueing: %u\n", pid, val);
+               enqueue(queue, val);
 
-       processor = (pid/multi)+1;
-       processor %= NUM_PROCESSORS;
-       for (i=0; i<repetitions; i++) {
-               time_test();
+               val = dequeue(queue);
+               printf("worker %d, dequeued: %u\n", pid, val);
        }
 }
 
 int user_main(int argc, char **argv)
 {
-       int i, num_threads;
-       thrd_t *t;
+       int i;
+       int *param;
 
        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);
+       queue = calloc(1, sizeof(*queue));
+       assert(queue);
 
-       num_threads = procs * multi;
-       t = malloc(num_threads * sizeof(thrd_t));
+       num_threads = procs;
+       threads = malloc(num_threads * sizeof(thrd_t));
+       param = malloc(num_threads * sizeof(*param));
 
+       init_queue(queue, num_threads);
+       for (i = 0; i < num_threads; i++) {
+               param[i] = i;
+               thrd_create(&threads[i], main_task, &param[i]);
+       }
        for (i = 0; i < num_threads; i++)
-               thrd_create(&t[i], main_task, NULL);
-       for (i = 0; i < num_threads; i++)
-               thrd_join(t[i]);
+               thrd_join(threads[i]);
 
-       free(t);
-       free(smp);
+       free(param);
+       free(threads);
+       free(queue);
 
        return 0;
 }