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

diff --git a/Makefile b/Makefile
index 764b8abf1bd2050641b498b06736f8990ca14ad3..ff5c7d9d26c4e28ff2a1ce8f2e1b9eed3c5790d0 100644 (file)
--- 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 dd7de7a1ec2ca17f6081708d77758577e74777d7..21fed0c16950195e1692af65db0d540b960b9b7d 100644 (file)
--- 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 */