do merge...push right code

[model-checker-benchmarks.git] / chase-lev-deque / main.c

diff --git a/chase-lev-deque/main.c b/chase-lev-deque/main.c
index c744b47020c25872f7fb4947cdff32cd1cb5cc75..424806f3edab28eaa272071f9321bb0217e47c6a 100644 (file)
--- a/chase-lev-deque/main.c
+++ b/chase-lev-deque/main.c
@@ -12,11 +12,10 @@
 Deque *q;
 int a;
 int b;
 Deque *q;
 int a;
 int b;

+int c;

 
 static void task(void * param) {
 
 static void task(void * param) {

-       do {
-               a=steal(q);
-       } while(a==EMPTY);
+       a=steal(q);

 }
 
 int user_main(int argc, char **argv)
 }
 
 int user_main(int argc, char **argv)


@@ -26,11 +25,22 @@ int user_main(int argc, char **argv)
        thrd_create(&t, task, 0);
        push(q, 1);
        push(q, 2);
        thrd_create(&t, task, 0);
        push(q, 1);
        push(q, 2);

+       push(q, 4);

        b=take(q);
        b=take(q);

+       c=take(q);

        thrd_join(t);
 
        thrd_join(t);
 

-       printf("a=%d b=%d\n",a,b);
-       MODEL_ASSERT(a + b == 3);
+       bool correct=true;
+       if (a!=1 && a!=2 && a!=4 && a!= EMPTY)
+               correct=false;
+       if (b!=1 && b!=2 && b!=4 && b!= EMPTY)
+               correct=false;
+       if (c!=1 && c!=2 && c!=4 && a!= EMPTY)
+               correct=false;
+       if (a!=EMPTY && b!=EMPTY && c!=EMPTY && (a+b+c)!=7)
+               correct=false;
+       if (!correct)
+               printf("a=%d b=%d c=%d\n",a,b,c);

 
        return 0;
 }
 
        return 0;
 }