From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 1 Nov 2012 22:11:00 +0000 (-0700)
Subject: fix new bug
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=b927f3521995cdb7adab6059f1fa81b8d2e545f3

fix new bug
norris's makefile change breaks compile on mac
---

diff --git a/Makefile b/Makefile
index 657bad65..523709f0 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ $(LIB_SO): $(OBJECTS)
 	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
 
 malloc.o: malloc.c
-	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable -Wno-self-assign
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
 %.o: %.cc
 	$(CXX) -fPIC -c $< $(CPPFLAGS)
diff --git a/model.cc b/model.cc
index 52eab24c..f320b8fa 100644
--- a/model.cc
+++ b/model.cc
@@ -235,7 +235,7 @@ void ModelChecker::wake_up_sleeping_actions(ModelAction * curr) {
 		Thread *thr=get_thread(tid);
 		if ( scheduler->get_enabled(thr) == THREAD_SLEEP_SET ) {
 			ModelAction *pending_act=thr->get_pending();
-			if (pending_act->could_synchronize_with(curr)) {
+			if ((!curr->is_rmwr())&&pending_act->could_synchronize_with(curr)) {
 				//Remove this thread from sleep set
 				scheduler->remove_sleep(thr);
 			}