ms-queue: remove more externs and unintended shared data

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

diff --git a/ms-queue/my_queue.c b/ms-queue/my_queue.c
index eb5d54ad7352f9be434bd9b76b06063963d81727..9ffb343dd3174ec970da9685c2e203ad1c38f242 100644 (file)
--- a/ms-queue/my_queue.c
+++ b/ms-queue/my_queue.c
@@ -1,31 +1,31 @@
 #include <threads.h>
+#include <stdlib.h>
 
 #include "my_queue.h"
 
-extern private_t private;
-
-void init_private(int pid)
-{
-       private.node = 2 + pid;
-}
+static unsigned int *node_nums;
 
 static unsigned int new_node()
 {
-       return private.node;
+       return node_nums[get_thread_num()];
 }
 
 static void reclaim(unsigned int node)
 {
-       private.node = node;
+       node_nums[get_thread_num()] = node;
 }
 
-void init_queue(queue_t *q)
+void init_queue(queue_t *q, int num_threads)
 {
        unsigned int i;
        pointer head;
        pointer tail;
        pointer next;
 
+       node_nums = malloc(num_threads * sizeof(*node_nums));
+       for (i = 0; i < num_threads; i++)
+               node_nums[i] = 2 + i;
+
        /* initialize queue */
        head = MAKE_POINTER(1, 0);
        tail = MAKE_POINTER(1, 0);