X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=c8ad85bcc99bf1e051771d7a6779b99f58f0dae7;hb=refs%2Fheads%2Fmaster;hp=dc560174bee561ca9f32fcec2d11d358ab040782;hpb=4fa31aac91303266f4c87a6cd5d60cbab34135db;p=model-checker.git

diff --git a/action.h b/action.h
index dc56017..c8ad85b 100644
--- a/action.h
+++ b/action.h
@@ -37,6 +37,15 @@ using std::memory_order_seq_cst;
  */
 #define VALUE_NONE 0xdeadbeef
 
+/**
+ * @brief The "location" at which a fence occurs
+ *
+ * We need a non-zero memory location to associate with fences, since our hash
+ * tables don't handle NULL-pointer keys. HACK: Hopefully this doesn't collide
+ * with any legitimate memory locations.
+ */
+#define FENCE_LOCATION ((void *)0x7)
+
 /** @brief Represents an action type, identifying one of several types of
  * ModelAction */
 typedef enum action_type {
@@ -61,7 +70,9 @@ typedef enum action_type {
 	ATOMIC_UNLOCK,        /**< An unlock action */
 	ATOMIC_NOTIFY_ONE,    /**< A notify_one action */
 	ATOMIC_NOTIFY_ALL,    /**< A notify all action */
-	ATOMIC_WAIT           /**< A wait action */
+	ATOMIC_WAIT,          /**< A wait action */
+	ATOMIC_ANNOTATION     /**< An annotation action to pass information
+													 to a trace analysis */
 } action_type_t;
 
 /* Forward declaration */
@@ -85,6 +96,8 @@ public:
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
 	memory_order get_mo() const { return order; }
+	memory_order get_original_mo() const { return original_order; }
+	void set_mo(memory_order order) { this->order = order; }
 	void * get_location() const { return location; }
 	modelclock_t get_seq_number() const { return seq_number; }
 	uint64_t get_value() const { return value; }
@@ -133,6 +146,7 @@ public:
 	bool is_rmw() const;
 	bool is_fence() const;
 	bool is_initialization() const;
+	bool is_annotation() const;
 	bool is_relaxed() const;
 	bool is_acquire() const;
 	bool is_release() const;
@@ -173,12 +187,18 @@ public:
 	MEMALLOC
 private:
 
+	const char * get_type_str() const;
+	const char * get_mo_str() const;
+
 	/** @brief Type of action (read, write, RMW, fence, thread create, etc.) */
 	action_type type;
 
 	/** @brief The memory order for this operation. */
 	memory_order order;
 
+	/** @brief The original memory order parameter for this operation. */
+	memory_order original_order;
+
 	/** @brief A pointer to the memory location for this action. */
 	void *location;