position(NULL),
reads_from(NULL),
last_fence_release(NULL),
- uninitaction(NULL),
cv(NULL),
rf_cv(NULL),
+ trace_ref(NULL),
+ thrdmap_ref(NULL),
+ action_ref(NULL),
+ func_ref_count(0),
value(value),
type(type),
+ original_type(ATOMIC_NOP),
+ swap_flag(false),
order(order),
original_order(order),
seq_number(ACTION_INITIAL_CLOCK)
{
/* References to NULL atomic variables can end up here */
- ASSERT(loc || type == ATOMIC_FENCE || type == NOOP);
+ ASSERT(loc || type == ATOMIC_FENCE || type == ATOMIC_NOP);
Thread *t = thread ? thread : thread_current();
this->tid = t!= NULL ? t->get_id() : -1;
/**
- * @brief Construct a new ModelAction
+ * @brief Construct a new ModelAction for sleep actions
*
- * @param type The type of action
+ * @param type The type of action: THREAD_SLEEP
* @param order The memory order of this action. A "don't care" for non-ATOMIC
* actions (e.g., THREAD_* or MODEL_* actions).
* @param loc The location that this action acts upon
- * @param value (optional) A value associated with the action (e.g., the value
- * read or written). Defaults to a given macro constant, for debugging purposes.
- * @param thread (optional) The Thread in which this action occurred. If NULL
- * (default), then a Thread is assigned according to the scheduler.
+ * @param value The time duration a thread is scheduled to sleep.
+ * @param _time The this sleep action is constructed
*/
ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value, uint64_t _time) :
location(NULL),
position(NULL),
time(_time),
last_fence_release(NULL),
- uninitaction(NULL),
cv(NULL),
rf_cv(NULL),
+ trace_ref(NULL),
+ thrdmap_ref(NULL),
+ action_ref(NULL),
+ func_ref_count(0),
value(value),
type(type),
+ original_type(ATOMIC_NOP),
+ swap_flag(false),
order(order),
original_order(order),
seq_number(ACTION_INITIAL_CLOCK)
position(NULL),
reads_from(NULL),
last_fence_release(NULL),
- uninitaction(NULL),
cv(NULL),
rf_cv(NULL),
+ trace_ref(NULL),
+ thrdmap_ref(NULL),
+ action_ref(NULL),
+ func_ref_count(0),
value(value),
type(type),
+ original_type(ATOMIC_NOP),
+ swap_flag(false),
order(order),
original_order(order),
seq_number(ACTION_INITIAL_CLOCK)
position(position),
reads_from(NULL),
last_fence_release(NULL),
- uninitaction(NULL),
cv(NULL),
rf_cv(NULL),
+ trace_ref(NULL),
+ thrdmap_ref(NULL),
+ action_ref(NULL),
+ func_ref_count(0),
value(value),
type(type),
+ original_type(ATOMIC_NOP),
+ swap_flag(false),
order(order),
original_order(order),
seq_number(ACTION_INITIAL_CLOCK)
position(position),
reads_from(NULL),
last_fence_release(NULL),
- uninitaction(NULL),
cv(NULL),
rf_cv(NULL),
+ trace_ref(NULL),
+ thrdmap_ref(NULL),
+ action_ref(NULL),
+ func_ref_count(0),
value(value),
type(type),
+ original_type(ATOMIC_NOP),
+ swap_flag(false),
order(order),
original_order(order),
seq_number(ACTION_INITIAL_CLOCK)
Thread *t = thread ? thread : thread_current();
this->tid = t->get_id();
- // model_print("position: %s\n", position);
}
void ModelAction::set_seq_number(modelclock_t num)
{
- /* ATOMIC_UNINIT actions should never have non-zero clock */
- ASSERT(!is_uninitialized());
ASSERT(seq_number == ACTION_INITIAL_CLOCK);
seq_number = num;
}
+void ModelAction::reset_seq_number()
+{
+ seq_number = 0;
+}
+
bool ModelAction::is_thread_start() const
{
return type == THREAD_START;
bool ModelAction::is_mutex_op() const
{
- return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL;
+ return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL;
}
bool ModelAction::is_lock() const
}
bool ModelAction::is_wait() const {
- return type == ATOMIC_WAIT;
+ return type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT;
}
bool ModelAction::is_notify() const {
return is_read() || could_be_write();
}
-bool ModelAction::is_uninitialized() const
-{
- return type == ATOMIC_UNINIT;
-}
-
bool ModelAction::is_read() const
{
return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW;
bool ModelAction::is_write() const
{
- return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT || type == NONATOMIC_WRITE;
+ return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == NONATOMIC_WRITE;
+}
+
+bool ModelAction::is_create() const
+{
+ return type == THREAD_CREATE || type == PTHREAD_CREATE;
+}
+
+bool ModelAction::is_free() const
+{
+ return type == READY_FREE;
}
bool ModelAction::could_be_write() const
ASSERT(act);
reads_from = act;
-
- if (act->is_uninitialized()) { // WL
- uint64_t val = *((uint64_t *) location);
- ModelAction * act_uninitialized = (ModelAction *)act;
- act_uninitialized->set_value(val);
- reads_from = act_uninitialized;
-
-// disabled by WL, because LLVM IR is unable to detect atomic init
-/* model->assert_bug("May read from uninitialized atomic:\n"
- " action %d, thread %d, location %p (%s, %s)",
- seq_number, id_to_int(tid), location,
- get_type_str(), get_mo_str());
- */
- }
}
/**
case PTHREAD_CREATE: return "pthread create";
case PTHREAD_JOIN: return "pthread join";
- case ATOMIC_UNINIT: return "uninitialized";
case NONATOMIC_WRITE: return "nonatomic write";
case ATOMIC_READ: return "atomic read";
case ATOMIC_WRITE: return "atomic write";
case ATOMIC_UNLOCK: return "unlock";
case ATOMIC_TRYLOCK: return "trylock";
case ATOMIC_WAIT: return "wait";
+ case ATOMIC_TIMEDWAIT: return "timed wait";
case ATOMIC_NOTIFY_ONE: return "notify one";
case ATOMIC_NOTIFY_ALL: return "notify all";
case ATOMIC_ANNOTATION: return "annotation";
else
return NULL;
}
+
+/** @brief Swap type with original type */
+void ModelAction::use_original_type()
+{
+ action_type_t tmp = type;
+ type = original_type;
+ original_type = tmp;
+
+ if (swap_flag)
+ swap_flag = false;
+ else
+ swap_flag = true;
+}
projects / c11tester.git / blobdiff