X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=b0b3d51a78dd361ca127a80e7767743c1de3b49f;hp=46e8273e467ab3950bedd71adffbf46ce259860f;hb=89ef4da995bb7b70079cd25089e884ad1e68bc9d;hpb=f5305a99cba598d0de55358df103439831dd1eb2 diff --git a/action.h b/action.h index 46e8273e..b0b3d51a 100644 --- a/action.h +++ b/action.h @@ -11,26 +11,43 @@ #include "mymemory.h" #include "memoryorder.h" #include "modeltypes.h" +#include "pthread.h" +/* Forward declarations */ class ClockVector; class Thread; class Promise; -namespace std { +namespace cdsc { class mutex; } using std::memory_order; using std::memory_order_relaxed; +using std::memory_order_consume; using std::memory_order_acquire; 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 +/** + * @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 { @@ -41,6 +58,9 @@ typedef enum action_type { THREAD_YIELD, /**< A thread yield action */ THREAD_JOIN, /**< A thread join action */ THREAD_FINISH, /**< A thread completion action */ + PTHREAD_CREATE, /**< A pthread creation action */ + PTHREAD_JOIN, /**< A pthread join action */ + ATOMIC_UNINIT, /**< Represents an uninitialized atomic */ ATOMIC_READ, /**< An atomic read action */ ATOMIC_WRITE, /**< An atomic write action */ @@ -55,7 +75,10 @@ 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 */ + NOOP } action_type_t; /* Forward declaration */ @@ -63,7 +86,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: @@ -74,6 +102,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; } @@ -82,7 +112,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; + cdsc::mutex * get_mutex() const; Node * get_node() const; void set_node(Node *n) { node = n; } @@ -122,6 +152,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; @@ -160,40 +191,75 @@ public: bool may_read_from(const ModelAction *write) const; bool may_read_from(const Promise *promise) const; MEMALLOC + + void set_value(uint64_t val) { value = val; } + + /* to accomodate pthread create and join */ + Thread * thread_operand; + void set_thread_operand(Thread *th) { thread_operand = th; } private: - /** Type of action (read, write, thread create, thread yield, thread join) */ + 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; - /** 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 The original memory order parameter for this operation. */ + memory_order original_order; + + /** @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;