#include <threads.h>
+#include <stdlib.h>
+#include "librace.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);
next = MAKE_POINTER(0, 0); // (NULL, 0)
- atomic_init(&q->nodes[0].next, 0); // assumed inititalized in original example
-
atomic_store(&q->head, head);
atomic_store(&q->tail, tail);
atomic_store(&q->nodes[1].next, next);
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);
next = atomic_load(&q->nodes[get_ptr(tail)].next);
if (tail == atomic_load(&q->tail)) {
if (get_ptr(next) == 0) { // == NULL
- pointer val = MAKE_POINTER(node, get_count(next) + 1);
+ pointer value = MAKE_POINTER(node, get_count(next) + 1);
success = atomic_compare_exchange_weak(&q->nodes[get_ptr(tail)].next,
- &next,
- val);
+ &next, value);
}
if (!success) {
unsigned int ptr = get_ptr(atomic_load(&q->nodes[get_ptr(tail)].next));
- pointer val = MAKE_POINTER(ptr,
+ pointer value = MAKE_POINTER(ptr,
get_count(tail) + 1);
atomic_compare_exchange_strong(&q->tail,
- &tail,
- val);
+ &tail, value);
thrd_yield();
}
}
if (get_ptr(next) == 0) { // NULL
return 0; // NULL
}
- atomic_compare_exchange_weak(&q->tail,
+ atomic_compare_exchange_strong(&q->tail,
&tail,
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));