X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=dfe2102d47b4ced0879f25509fd7ef1f7c7850f5;hb=27a6b2d336785fa3d30d937a397242c0a6823cfc;hp=f83aec9583e230fd9fddbf10676b7b73113faa8e;hpb=70525635cea4c0622d30571c7028c1c293950bb5;p=model-checker.git

diff --git a/action.h b/action.h
index f83aec9..dfe2102 100644
--- a/action.h
+++ b/action.h
@@ -7,11 +7,13 @@
 
 #include <list>
 #include <cstddef>
+#include <inttypes.h>
 
-#include "threads.h"
 #include "mymemory.h"
-#include "clockvector.h"
 #include "memoryorder.h"
+#include "modeltypes.h"
+
+class ClockVector;
 
 using std::memory_order;
 using std::memory_order_relaxed;
@@ -24,12 +26,19 @@ using std::memory_order_seq_cst;
 		hence by iteself does not indicate no value. */
 
 #define VALUE_NONE 1234567890
+
+/** A special value to represent a successful trylock */
+
 #define VALUE_TRYSUCCESS 1
+
+/** A special value to represent a failed trylock */
 #define VALUE_TRYFAILED 0
 
 /** @brief Represents an action type, identifying one of several types of
  * ModelAction */
 typedef enum action_type {
+	MODEL_FIXUP_RELSEQ,   /**< Special ModelAction: finalize a release
+	                       *   sequence */
 	THREAD_CREATE,        /**< A thread creation action */
 	THREAD_START,         /**< First action in each thread */
 	THREAD_YIELD,         /**< A thread yield action */
@@ -42,10 +51,10 @@ typedef enum action_type {
 	ATOMIC_RMWC,          /**< Convert an atomic RMW action into a READ */
 	ATOMIC_INIT,          /**< Initialization of an atomic object (e.g.,
 	                       *   atomic_init()) */
-	ATOMIC_FENCE,
-	ATOMIC_LOCK,
-	ATOMIC_TRYLOCK,
-	ATOMIC_UNLOCK
+	ATOMIC_FENCE,         /**< A fence action */
+	ATOMIC_LOCK,          /**< A lock action */
+	ATOMIC_TRYLOCK,       /**< A trylock action */
+	ATOMIC_UNLOCK         /**< An unlock action */
 } action_type_t;
 
 /* Forward declaration */
@@ -59,7 +68,7 @@ class ModelAction {
 public:
 	ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE);
 	~ModelAction();
-	void print(void) const;
+	void print() const;
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
@@ -73,7 +82,9 @@ public:
 	void set_node(Node *n) { node = n; }
 
 	void copy_from_new(ModelAction *newaction);
+	void set_seq_number(modelclock_t num);
 	void set_try_lock(bool obtainedlock);
+	bool is_relseq_fixup() const;
 	bool is_mutex_op() const;
 	bool is_lock() const;
 	bool is_trylock() const;
@@ -93,12 +104,12 @@ public:
 	bool same_var(const ModelAction *act) const;
 	bool same_thread(const ModelAction *act) const;
 	bool is_conflicting_lock(const ModelAction *act) const;
-	bool is_synchronizing(const ModelAction *act) const;
+	bool could_synchronize_with(const ModelAction *act) const;
 
 	void create_cv(const ModelAction *parent = NULL);
 	ClockVector * get_cv() const { return cv; }
-	void read_from(const ModelAction *act);
-	void synchronize_with(const ModelAction *act);
+	bool read_from(const ModelAction *act);
+	bool synchronize_with(const ModelAction *act);
 
 	bool has_synchronized_with(const ModelAction *act) const;
 	bool happens_before(const ModelAction *act) const;