From 88e6ab1f325b2b67695f20954b5d1f1746d13c8a Mon Sep 17 00:00:00 2001 From: Brian Demsky Date: Thu, 11 Oct 2012 16:54:20 -0700 Subject: [PATCH] compiles with condition variables file added... still need model checker support --- Makefile | 2 +- action.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 */ -- 2.34.1