X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=dc560174bee561ca9f32fcec2d11d358ab040782;hp=1b03bc48943f5b24183c61cd372346a8f8a9b752;hb=7d4142d82bfa30baa4452430268a9a337eff3fbf;hpb=c1db87fb3d52c93feb22496fe1e8513e35320c3d

diff --git a/action.h b/action.h
index 1b03bc48..dc560174 100644
--- a/action.h
+++ b/action.h
@@ -5,7 +5,6 @@
 #ifndef __ACTION_H__
 #define __ACTION_H__
 
-#include <list>
 #include <cstddef>
 #include <inttypes.h>
 
@@ -13,10 +12,15 @@
 #include "memoryorder.h"
 #include "modeltypes.h"
 
+/* Forward declarations */
 class ClockVector;
 class Thread;
 class Promise;
 
+namespace std {
+	class mutex;
+}
+
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_acquire;
@@ -24,16 +28,15 @@ using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
 
-/** Note that this value can be legitimately used by a program, and
- *  hence by iteself does not indicate no value. */
+/**
+ * @brief A recognizable don't-care value for use in the ModelAction::value
+ * field
+ *
+ * Note that this value can be legitimately used by a program, and hence by
+ * iteself does not indicate no value.
+ */
 #define VALUE_NONE 0xdeadbeef
 
-/** 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 {
@@ -66,7 +69,12 @@ class Node;
 class ClockVector;
 
 /**
- * The ModelAction class encapsulates an atomic action.
+ * @brief Represents a single atomic action
+ *
+ * A ModelAction is always allocated as non-snapshotting, because it is used in
+ * multiple executions during backtracking. Except for fake uninitialized
+ * (ATOMIC_UNINIT) ModelActions, each action is assigned a unique sequence
+ * number.
  */
 class ModelAction {
 public:
@@ -85,6 +93,7 @@ public:
 	uint64_t get_return_value() const;
 	const ModelAction * get_reads_from() const { return reads_from; }
 	Promise * get_reads_from_promise() const { return reads_from_promise; }
+	std::mutex * get_mutex() const;
 
 	Node * get_node() const;
 	void set_node(Node *n) { node = n; }
@@ -102,6 +111,7 @@ public:
 	void set_seq_number(modelclock_t num);
 	void set_try_lock(bool obtainedlock);
 	bool is_thread_start() const;
+	bool is_thread_join() const;
 	bool is_relseq_fixup() const;
 	bool is_mutex_op() const;
 	bool is_lock() const;
@@ -116,6 +126,7 @@ public:
 	bool is_uninitialized() const;
 	bool is_read() const;
 	bool is_write() const;
+	bool is_yield() const;
 	bool could_be_write() const;
 	bool is_rmwr() const;
 	bool is_rmwc() const;
@@ -162,38 +173,61 @@ public:
 	MEMALLOC
 private:
 
-	/** Type of action (read, write, thread create, thread yield, thread join) */
+	/** @brief Type of action (read, write, RMW, fence, thread create, etc.) */
 	action_type type;
 
-	/** The memory order for this operation. */
+	/** @brief The memory order for this operation. */
 	memory_order order;
 
-	/** A pointer to the memory location for this action. */
+	/** @brief A pointer to the memory location for this action. */
 	void *location;
 
-	/** The thread id that performed this action. */
+	/** @brief The thread id that performed this action. */
 	thread_id_t tid;
 
-	/** The value written (for write or RMW; undefined for read) */
+	/** @brief The value written (for write or RMW; undefined for read) */
 	uint64_t value;
 
-	/** The action that this action reads from. Only valid for reads */
+	/**
+	 * @brief The store that this action reads from
+	 *
+	 * Only valid for reads
+	 */
 	const ModelAction *reads_from;
 
-	/** The promise that this action reads from. Only valid for reads */
+	/**
+	 * @brief The promise that this action reads from
+	 *
+	 * Only valid for reads
+	 */
 	Promise *reads_from_promise;
 
-	/** The last fence release from the same thread */
+	/** @brief The last fence release from the same thread */
 	const ModelAction *last_fence_release;
 
-	/** A back reference to a Node in NodeStack, if this ModelAction is
-	 * saved on the NodeStack. */
+	/**
+	 * @brief A back reference to a Node in NodeStack
+	 *
+	 * Only set if this ModelAction is saved on the NodeStack. (A
+	 * ModelAction can be thrown away before it ever enters the NodeStack.)
+	 */
 	Node *node;
 
+	/**
+	 * @brief The sequence number of this action
+	 *
+	 * Except for ATOMIC_UNINIT actions, this number should be unique and
+	 * should represent the action's position in the execution order.
+	 */
 	modelclock_t seq_number;
 
-	/** The clock vector stored with this action; only needed if this
-	 * action is a store release? */
+	/**
+	 * @brief The clock vector for this operation
+	 *
+	 * Technically, this is only needed for potentially synchronizing
+	 * (e.g., non-relaxed) operations, but it is very handy to have these
+	 * vectors for all operations.
+	 */
 	ClockVector *cv;
 
 	bool sleep_flag;