deque: add test driver, add print messages for now for resize method and if we pull...

test case exposes model checker bugs :(

diff --git a/Makefile b/Makefile
index f97463a82d89b580cb74e492e2fc3c9cd905aa9e..326c00c0fbdfd602ddc02c217eee78566923f214 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DIRS := barrier mcs-lock mpmc-queue spsc-queue spsc-bugfix linuxrwlocks dekker-fences
+DIRS := barrier mcs-lock mpmc-queue spsc-queue spsc-bugfix linuxrwlocks dekker-fences chase-lev-deque
 
 .PHONY: $(DIRS)
 

diff --git a/chase-lev-deque/Makefile b/chase-lev-deque/Makefile
index 3f0fc86fdf3e86689fb9a16ade4c92b4e06e27fc..91ff999c9d5163e3d22e0f4754b3a1cdc08bcc0e 100644 (file)
--- a/chase-lev-deque/Makefile
+++ b/chase-lev-deque/Makefile
@@ -2,8 +2,8 @@ include ../benchmarks.mk
 
 TESTNAME = main
 
-HEADERS = 
-OBJECTS = deque.o
+HEADERS = deque.h
+OBJECTS = main.o deque.o
 
 all: $(TESTNAME)
 

diff --git a/chase-lev-deque/deque.c b/chase-lev-deque/deque.c
index c6631ff703bc17ff823cf1b6b5979bb18a32e745..b74907fb5de5a73606bdc7cc9eda1a46ae1705ef 100644 (file)
--- a/chase-lev-deque/deque.c
+++ b/chase-lev-deque/deque.c
@@ -50,6 +50,7 @@ void resize(Deque *q) {
                atomic_store_explicit(&new_a->buffer[i % new_size], atomic_load_explicit(&a->buffer[i % size], memory_order_relaxed), memory_order_relaxed);
        }
        atomic_store_explicit(&q->array, new_a, memory_order_relaxed);
+       printf("resize\n");
 }
 
 void push(Deque *q, int x) {

diff --git a/chase-lev-deque/main.c b/chase-lev-deque/main.c
new file mode 100644 (file)
index 0000000..64d0444
--- /dev/null
+++ b/chase-lev-deque/main.c
@@ -0,0 +1,29 @@
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+#include <threads.h>
+#include <stdatomic.h>
+
+#include "deque.h"
+
+Deque *q;
+int a;
+int b;
+
+static void task(void * param) {
+       a=steal(q);
+}
+
+int user_main(int argc, char **argv)
+{
+       thrd_t t;
+       q=create();
+       thrd_create(&t, task, 0);
+       push(q, 1);
+       push(q, 2);
+       b=take(q);
+       thrd_join(t);
+       if (a+b!=3)
+               printf("a=%d b=%d\n",a,b);
+       return 0;
+}