From: Brian Demsky <bdemsky@uci.edu>
Date: Fri, 12 Oct 2012 05:01:33 +0000 (-0700)
Subject: Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker
X-Git-Tag: pldi2013~53
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a4090d03cc1a5f5bca8f10986d74b76a9bb45371;hp=55f3acdb4bec3b2879e189a82d23e112aba79aed;p=model-checker.git

Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker
---

diff --git a/Makefile b/Makefile
index 764b8ab..ff5c7d9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ include common.mk
 OBJECTS = libthreads.o schedule.o model.o threads.o librace.o action.o \
 	  nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o \
 	  datarace.o impatomic.o cmodelint.o \
-	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o
+	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o
 
 CPPFLAGS += -Iinclude -I. -rdynamic
 LDFLAGS = -ldl -lrt
diff --git a/action.h b/action.h
index dd7de7a..21fed0c 100644
--- a/action.h
+++ b/action.h
@@ -55,7 +55,10 @@ typedef enum action_type {
 	ATOMIC_FENCE,         /**< A fence action */
 	ATOMIC_LOCK,          /**< A lock action */
 	ATOMIC_TRYLOCK,       /**< A trylock action */
-	ATOMIC_UNLOCK         /**< An unlock action */
+	ATOMIC_UNLOCK,        /**< An unlock action */
+	ATOMIC_NOTIFY_ONE,    /**< A notify_one action */
+	ATOMIC_NOTIFY_ALL,    /**< A notify all action */
+	ATOMIC_WAIT           /**< A wait action */
 } action_type_t;
 
 /* Forward declaration */