X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=4903f37b7720c4116943f5c542bcfa06ae92c8a8;hb=1667e1f8017bd3f4bf5b1ef5712e3156577f99a2;hp=ae4afb29d27f928cbe63a34d79629a6d6310b28b;hpb=cb9b254332794ea63d0089b21b498f4a5301f08b;p=c11tester.git

diff --git a/action.h b/action.h
index ae4afb29..4903f37b 100644
--- a/action.h
+++ b/action.h
@@ -11,6 +11,8 @@
 #include "threads.h"
 #include "libatomic.h"
 #include "mymemory.h"
+#include "clockvector.h"
+
 #define VALUE_NONE -1
 
 typedef enum action_type {
@@ -31,18 +33,20 @@ class ClockVector;
  */
 class ModelAction {
 public:
-	ModelAction(action_type_t type, memory_order order, void *loc, int value);
+	ModelAction(action_type_t type, memory_order order, void *loc, int value = VALUE_NONE);
 	~ModelAction();
-	void print(void);
+	void print(void) const;
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
 	memory_order get_mo() const { return order; }
 	void * get_location() const { return location; }
-	int get_seq_number() const { return seq_number; }
+	modelclock_t get_seq_number() const { return seq_number; }
+	int get_value() const { return value; }
 
 	Node * get_node() const { return node; }
 	void set_node(Node *n) { node = n; }
+	void set_value(int val) { value = val; }
 
 	bool is_read() const;
 	bool is_write() const;
@@ -54,11 +58,11 @@ public:
 	bool same_thread(const ModelAction *act) const;
 	bool is_synchronizing(const ModelAction *act) const;
 
-	void create_cv(ModelAction *parent = NULL);
+	void create_cv(const ModelAction *parent = NULL);
 	ClockVector * get_cv() const { return cv; }
-	void read_from(ModelAction *act);
+	void read_from(const ModelAction *act);
 
-	bool happens_before(ModelAction *act);
+	bool happens_before(const ModelAction *act) const;
 
 	inline bool operator <(const ModelAction& act) const {
 		return get_seq_number() < act.get_seq_number();
@@ -90,13 +94,13 @@ private:
 	 * saved on the NodeStack. */
 	Node *node;
 	
-	int seq_number;
+	modelclock_t seq_number;
 
 	/** The clock vector stored with this action; only needed if this
 	 * action is a store release? */
 	ClockVector *cv;
 };
 
-typedef std::list<class ModelAction *> action_list_t;
+typedef std::list<ModelAction *> action_list_t;
 
 #endif /* __ACTION_H__ */