for (i = 0; i < MAX_FREELIST; i++) {
//unsigned int node = load_32(&free_lists[t][i]);
unsigned int node = free_lists[t][i];
- //unsigned int node = free_lists[t][i];
if (node) {
//store_32(&free_lists[t][i], 0);
free_lists[t][i] = 0;
- //free_lists[t][i] = 0;
return node;
}
}
/* Should never race with our own thread here */
//unsigned int idx = load_32(&free_lists[t][i]);
unsigned int idx = free_lists[t][i];
- //unsigned int idx = free_lists[t][i];
/* Found empty spot in free list */
if (idx == 0) {
- //store_32(&free_lists[t][i], node);
- free_lists[t][i] = node;
+ store_32(&free_lists[t][i], node);
//free_lists[t][i] = node;
return;
}
void init_queue(queue_t *q, int num_threads)
{
int i, j;
+ for (i = 0; i < MAX_NODES; i++) {
+ atomic_init(&q->nodes[i].next, MAKE_POINTER(POISON_IDX, 0));
+ }
/* Initialize each thread's free list with INITIAL_FREE pointers */
/* The actual nodes are initialized with poison indexes */
node = new_node();
//store_32(&q->nodes[node].value, val);
q->nodes[node].value = val;
- //q->nodes[node].value = val;
tmp = atomic_load_explicit(&q->nodes[node].next, relaxed);
set_ptr(&tmp, 0); // NULL
atomic_store_explicit(&q->nodes[node].next, tmp, relaxed);
while (!success) {
- /**** detected UL (2 threads, 1 enqueue & 1 dequeue) ****/
+
+ /**
+ @Begin
+ @Commit_point_clear: true
+ @Label: Enqueue_Clear
+ @End
+ */
+ /**** UL & inadmissible ****/
tail = atomic_load_explicit(&q->tail, acquire);
/****FIXME: miss ****/
next = atomic_load_explicit(&q->nodes[get_ptr(tail)].next, acquire);
+ //printf("miss1_enqueue\n");
if (tail == atomic_load_explicit(&q->tail, relaxed)) {
/* Check for uninitialized 'next' */
if (get_ptr(next) == 0) { // == NULL
pointer value = MAKE_POINTER(node, get_count(next) + 1);
- /**** correctness error (1 dequeue & 1 enqueue) ****/
+ /**** SPEC Error (testcase1.c) ****/
+ // Second release can be just relaxed
success = atomic_compare_exchange_strong_explicit(&q->nodes[get_ptr(tail)].next,
&next, value, release, relaxed);
/**
@Begin
- @Commit_point_define_check: success == true
- @Label: Enqueue_Success_Point
+ @Commit_point_define_check: success
+ @Label: EnqueueUpdateNext
@End
*/
}
if (!success) {
// This routine helps the other enqueue to update the tail
- /**** detected UL (2 threads, 1 enqueue & 1 dequeue) ****/
+ /**** UL & Inadmissible ****/
unsigned int ptr = get_ptr(atomic_load_explicit(&q->nodes[get_ptr(tail)].next, acquire));
pointer value = MAKE_POINTER(ptr,
get_count(tail) + 1);
/****FIXME: miss ****/
+ // Second release can be just relaxed
bool succ = false;
succ = atomic_compare_exchange_strong_explicit(&q->tail,
&tail, value, release, relaxed);
}
}
}
- /**** correctness error (1 dequeue & 1 enqueue) ****/
- atomic_compare_exchange_strong_explicit(&q->tail,
+ /**** UL & Inadmissible ****/
+ // Second release can be just relaxed
+ bool succ = atomic_compare_exchange_strong_explicit(&q->tail,
&tail,
MAKE_POINTER(node, get_count(tail) + 1),
release, relaxed);
@Interface_define: Dequeue
@End
*/
-bool dequeue(queue_t *q, unsigned int *retVal)
+bool dequeue(queue_t *q, int *retVal)
{
- unsigned int value;
+ unsigned int value = 0;
int success = 0;
pointer head;
pointer tail;
pointer next;
while (!success) {
- /**** FIXME: miss ****/
+ /**
+ @Begin
+ @Commit_point_clear: true
+ @Label: Dequeue_Clear
+ @End
+ */
+ /**** Inadmissible ****/
head = atomic_load_explicit(&q->head, acquire);
- // This must be acquire otherwise we have a bug with 1 enqueue &
- // 1 dequeue
- /**** correctness error (1 dequeue & 1 enqueue) ****/
+ /**
+ @Begin
+ @Commit_point_define_check: true
+ @Label: DequeueReadHead
+ @End
+ */
+
+ /** A new bug has been found here!!! It should be acquire instead of
+ * relaxed (it introduces a bug when there's two dequeuers and one
+ * enqueuer) correctness bug!!
+ */
+ /**** New bug ****/
tail = atomic_load_explicit(&q->tail, acquire);
- /**** correctness error (1 dequeue & 1 enqueue) ****/
+
+ /**** SPEC Error (testcase1.c) ****/
next = atomic_load_explicit(&q->nodes[get_ptr(head)].next, acquire);
- //printf("miss3_dequeue\n");
+ /**
+ @Begin
+ @Potential_commit_point_define: true
+ @Label: DequeueReadNext
+ @End
+ */
if (atomic_load_explicit(&q->head, relaxed) == head) {
if (get_ptr(head) == get_ptr(tail)) {
/* Check for uninitialized 'next' */
//MODEL_ASSERT(get_ptr(next) != POISON_IDX);
- if (get_ptr(next) == 0) { // NULL
- /**
- @Begin
- @Commit_point_define_check: true
- @Label: Dequeue_Empty_Point
- @End
- */
+ if (get_ptr(next) == 0) { // NULL
return false; // NULL
}
- /****FIXME: miss (not reached) ****/
+ /**** FIXME: miss ****/
+ // Second release can be just relaxed
bool succ = false;
succ = atomic_compare_exchange_strong_explicit(&q->tail,
&tail,
//printf("miss4_dequeue\n");
thrd_yield();
} else {
- //*retVal = load_32(&q->nodes[get_ptr(next)].value);
- *retVal = q->nodes[get_ptr(next)].value;
- //value = q->nodes[get_ptr(next)].value;
- /**** FIXME: miss (not reached) ****/
+ //value = load_32(&q->nodes[get_ptr(next)].value);
+ value = q->nodes[get_ptr(next)].value;
+ /**** inadmissibility ****/
success = atomic_compare_exchange_strong_explicit(&q->head,
&head,
MAKE_POINTER(get_ptr(next), get_count(head) + 1),
release, relaxed);
/**
@Begin
- @Commit_point_define_check: success == true
- @Label: Dequeue_Success_Point
+ @Commit_point_define_check: success
+ @Label: DequeueUpdateHead
+ @End
+ */
+
+ /**
+ @Begin
+ @Commit_point_define: success
+ @Potential_commit_point_label: DequeueReadNext
+ @Label: DequeueReadNextVerify
@End
*/
if (!success)
}
}
reclaim(get_ptr(head));
+ *retVal = value;
return true;
}
projects / cdsspec-compiler.git / blobdiff