From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 7 Mar 2013 03:33:14 +0000 (-0800)
Subject: do merge...push right code
X-Git-Tag: oopsla2013-final~27^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=391f44d47dad3cf21f18a858504b902ec48fe032;hp=ad2809cd62aeacf73e1bd4e5f57ef02b913190a5;p=model-checker-benchmarks.git

do merge...push right code
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker-benchmarks

Conflicts:
	chase-lev-deque/main.c
---

diff --git a/chase-lev-deque/main.c b/chase-lev-deque/main.c
index c744b47..424806f 100644
--- a/chase-lev-deque/main.c
+++ b/chase-lev-deque/main.c
@@ -12,11 +12,10 @@
 Deque *q;
 int a;
 int b;
+int c;
 
 static void task(void * param) {
-	do {
-		a=steal(q);
-	} while(a==EMPTY);
+	a=steal(q);
 }
 
 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);
+	push(q, 4);
 	b=take(q);
+	c=take(q);
 	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;
 }