/** @brief Constructor */
ModelExecution::ModelExecution(ModelChecker *m,
- struct model_params *params,
+ const struct model_params *params,
Scheduler *scheduler,
NodeStack *node_stack) :
model(m),
params(params),
scheduler(scheduler),
- action_trace(new action_list_t()),
- thread_map(new HashTable<int, Thread *, int>()),
- obj_map(new HashTable<const void *, action_list_t *, uintptr_t, 4>()),
- condvar_waiters_map(new HashTable<const void *, action_list_t *, uintptr_t, 4>()),
- obj_thrd_map(new HashTable<void *, SnapVector<action_list_t> *, uintptr_t, 4 >()),
- promises(new SnapVector<Promise *>()),
- futurevalues(new SnapVector<struct PendingFutureValue>()),
- pending_rel_seqs(new SnapVector<struct release_seq *>()),
- thrd_last_action(new SnapVector<ModelAction *>(1)),
- thrd_last_fence_release(new SnapVector<ModelAction *>()),
+ action_trace(),
+ thread_map(2), /* We'll always need at least 2 threads */
+ obj_map(),
+ condvar_waiters_map(),
+ obj_thrd_map(),
+ promises(),
+ futurevalues(),
+ pending_rel_seqs(),
+ thrd_last_action(1),
+ thrd_last_fence_release(),
node_stack(node_stack),
priv(new struct model_snapshot_members()),
mo_graph(new CycleGraph())
{
/* Initialize a model-checker thread, for special ModelActions */
model_thread = new Thread(get_next_id());
- thread_map->put(id_to_int(model_thread->get_id()), model_thread);
+ add_thread(model_thread);
scheduler->register_engine(this);
+ node_stack->register_engine(this);
}
/** @brief Destructor */
ModelExecution::~ModelExecution()
{
for (unsigned int i = 0; i < get_num_threads(); i++)
- delete thread_map->get(i);
- delete thread_map;
+ delete get_thread(int_to_id(i));
- delete obj_thrd_map;
- delete obj_map;
- delete condvar_waiters_map;
- delete action_trace;
+ for (unsigned int i = 0; i < promises.size(); i++)
+ delete promises[i];
- for (unsigned int i = 0; i < promises->size(); i++)
- delete (*promises)[i];
- delete promises;
-
- delete pending_rel_seqs;
-
- delete thrd_last_action;
- delete thrd_last_fence_release;
delete mo_graph;
delete priv;
}
action_list_t * ModelExecution::get_actions_on_obj(void * obj, thread_id_t tid) const
{
- SnapVector<action_list_t> *wrv=obj_thrd_map->get(obj);
+ SnapVector<action_list_t> *wrv = obj_thrd_map.get(obj);
if (wrv==NULL)
return NULL;
unsigned int thread=id_to_int(tid);
return blocking_threads;
}
+/**
+ * @brief Check if we are yield-blocked
+ *
+ * A program can be "yield-blocked" if all threads are ready to execute a
+ * yield.
+ *
+ * @return True if the program is yield-blocked; false otherwise
+ */
+bool ModelExecution::is_yieldblocked() const
+{
+ if (!params->yieldblock)
+ return false;
+
+ for (unsigned int i = 0; i < get_num_threads(); i++) {
+ thread_id_t tid = int_to_id(i);
+ Thread *t = get_thread(tid);
+ if (t->get_pending() && t->get_pending()->is_yield())
+ return true;
+ }
+ return false;
+}
+
/**
* Check if this is a complete execution. That is, have all thread completed
* execution (rather than exiting because sleep sets have forced a redundant
*/
bool ModelExecution::is_complete_execution() const
{
+ if (is_yieldblocked())
+ return false;
for (unsigned int i = 0; i < get_num_threads(); i++)
if (is_enabled(int_to_id(i)))
return false;
return NULL;
/* Skip past the release */
- action_list_t *list = action_trace;
- action_list_t::reverse_iterator rit;
+ const action_list_t *list = &action_trace;
+ action_list_t::const_reverse_iterator rit;
for (rit = list->rbegin(); rit != list->rend(); rit++)
if (*rit == last_release)
break;
ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const
{
switch (act->get_type()) {
- /* case ATOMIC_FENCE: fences don't directly cause backtracking */
+ case ATOMIC_FENCE:
+ /* Only seq-cst fences can (directly) cause backtracking */
+ if (!act->is_seqcst())
+ break;
case ATOMIC_READ:
case ATOMIC_WRITE:
case ATOMIC_RMW: {
ModelAction *ret = NULL;
/* linear search: from most recent to oldest */
- action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+ action_list_t *list = obj_map.get(act->get_location());
action_list_t::reverse_iterator rit;
for (rit = list->rbegin(); rit != list->rend(); rit++) {
ModelAction *prev = *rit;
+ if (prev == act)
+ continue;
if (prev->could_synchronize_with(act)) {
ret = prev;
break;
case ATOMIC_LOCK:
case ATOMIC_TRYLOCK: {
/* linear search: from most recent to oldest */
- action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+ action_list_t *list = obj_map.get(act->get_location());
action_list_t::reverse_iterator rit;
for (rit = list->rbegin(); rit != list->rend(); rit++) {
ModelAction *prev = *rit;
}
case ATOMIC_UNLOCK: {
/* linear search: from most recent to oldest */
- action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+ action_list_t *list = obj_map.get(act->get_location());
action_list_t::reverse_iterator rit;
for (rit = list->rbegin(); rit != list->rend(); rit++) {
ModelAction *prev = *rit;
}
case ATOMIC_WAIT: {
/* linear search: from most recent to oldest */
- action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+ action_list_t *list = obj_map.get(act->get_location());
action_list_t::reverse_iterator rit;
for (rit = list->rbegin(); rit != list->rend(); rit++) {
ModelAction *prev = *rit;
case ATOMIC_NOTIFY_ALL:
case ATOMIC_NOTIFY_ONE: {
/* linear search: from most recent to oldest */
- action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+ action_list_t *list = obj_map.get(act->get_location());
action_list_t::reverse_iterator rit;
for (rit = list->rbegin(); rit != list->rend(); rit++) {
ModelAction *prev = *rit;
struct future_value fv = node->get_future_value();
Promise *promise = new Promise(this, curr, fv);
curr->set_read_from_promise(promise);
- promises->push_back(promise);
+ promises.push_back(promise);
mo_graph->startChanges();
updated = r_modification_order(curr, promise);
mo_graph->commitChanges();
/* Should we go to sleep? (simulate spurious failures) */
if (curr->get_node()->get_misc() == 0) {
- get_safe_ptr_action(condvar_waiters_map, curr->get_location())->push_back(curr);
+ get_safe_ptr_action(&condvar_waiters_map, curr->get_location())->push_back(curr);
/* disable us */
scheduler->sleep(get_thread(curr));
}
break;
}
case ATOMIC_NOTIFY_ALL: {
- action_list_t *waiters = get_safe_ptr_action(condvar_waiters_map, curr->get_location());
+ action_list_t *waiters = get_safe_ptr_action(&condvar_waiters_map, curr->get_location());
//activate all the waiting threads
for (action_list_t::iterator rit = waiters->begin(); rit != waiters->end(); rit++) {
scheduler->wake(get_thread(*rit));
break;
}
case ATOMIC_NOTIFY_ONE: {
- action_list_t *waiters = get_safe_ptr_action(condvar_waiters_map, curr->get_location());
+ action_list_t *waiters = get_safe_ptr_action(&condvar_waiters_map, curr->get_location());
int wakeupthread = curr->get_node()->get_misc();
action_list_t::iterator it = waiters->begin();
advance(it, wakeupthread);
bool ModelExecution::promises_may_allow(const ModelAction *writer,
const ModelAction *reader) const
{
- if (promises->empty())
+ if (promises.empty())
return true;
- for(int i=promises->size()-1;i>=0;i--) {
- ModelAction *pr=(*promises)[i]->get_reader(0);
+ for (int i = promises.size() - 1; i >= 0; i--) {
+ ModelAction *pr = promises[i]->get_reader(0);
//reader is after promise...doesn't cross any promise
if (*reader > *pr)
return true;
if (promises_may_allow(curr, read)) {
add_future_value(curr, read);
} else {
- futurevalues->push_back(PendingFutureValue(curr, read));
+ futurevalues.push_back(PendingFutureValue(curr, read));
}
}
}
/* Check the pending future values */
- for (int i = (int)futurevalues->size() - 1; i >= 0; i--) {
- struct PendingFutureValue pfv = (*futurevalues)[i];
+ for (int i = (int)futurevalues.size() - 1; i >= 0; i--) {
+ struct PendingFutureValue pfv = futurevalues[i];
if (promises_may_allow(pfv.writer, pfv.reader)) {
add_future_value(pfv.writer, pfv.reader);
- futurevalues->erase(futurevalues->begin() + i);
+ futurevalues.erase(futurevalues.begin() + i);
}
}
*/
bool updated = false;
if (curr->is_acquire()) {
- action_list_t *list = action_trace;
+ action_list_t *list = &action_trace;
action_list_t::reverse_iterator rit;
/* Find X : is_read(X) && X --sb-> curr */
for (rit = list->rbegin(); rit != list->rend(); rit++) {
add_thread(th);
th->set_creation(curr);
/* Promises can be satisfied by children */
- for (unsigned int i = 0; i < promises->size(); i++) {
- Promise *promise = (*promises)[i];
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ Promise *promise = promises[i];
if (promise->thread_is_available(curr->get_tid()))
promise->add_thread(th->get_id());
}
}
th->complete();
/* Completed thread can't satisfy promises */
- for (unsigned int i = 0; i < promises->size(); i++) {
- Promise *promise = (*promises)[i];
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ Promise *promise = promises[i];
if (promise->thread_is_available(th->get_id()))
if (promise->eliminate_thread(th->get_id()))
priv->failed_promise = true;
void ModelExecution::process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue)
{
const ModelAction *write = curr->get_node()->get_relseq_break();
- struct release_seq *sequence = pending_rel_seqs->back();
- pending_rel_seqs->pop_back();
+ struct release_seq *sequence = pending_rel_seqs.back();
+ pending_rel_seqs.pop_back();
ASSERT(sequence);
ModelAction *acquire = sequence->acquire;
const ModelAction *rf = sequence->rf;
work_queue->push_back(MOEdgeWorkEntry(acquire));
/* propagate synchronization to later actions */
- action_list_t::reverse_iterator rit = action_trace->rbegin();
+ action_list_t::reverse_iterator rit = action_trace.rbegin();
for (; (*rit) != acquire; rit++) {
ModelAction *propagate = *rit;
if (acquire->happens_before(propagate)) {
else if (newcurr->is_wait())
newcurr->get_node()->set_misc_max(2);
else if (newcurr->is_notify_one()) {
- newcurr->get_node()->set_misc_max(get_safe_ptr_action(condvar_waiters_map, newcurr->get_location())->size());
+ newcurr->get_node()->set_misc_max(get_safe_ptr_action(&condvar_waiters_map, newcurr->get_location())->size());
}
return true; /* This was a new ModelAction */
}
*/
void ModelExecution::thread_blocking_check_promises(Thread *blocker, Thread *waiting)
{
- for (unsigned int i = 0; i < promises->size(); i++) {
- Promise *promise = (*promises)[i];
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ Promise *promise = promises[i];
if (!promise->thread_is_available(waiting->get_id()))
continue;
for (unsigned int j = 0; j < promise->get_num_readers(); j++) {
/**
* @brief Check whether a model action is enabled.
*
- * Checks whether a lock or join operation would be successful (i.e., is the
- * lock already locked, or is the joined thread already complete). If not, put
- * the action in a waiter list.
+ * Checks whether an operation would be successful (i.e., is a lock already
+ * locked, or is the joined thread already complete).
+ *
+ * For yield-blocking, yields are never enabled.
*
* @param curr is the ModelAction to check whether it is enabled.
* @return a bool that indicates whether the action is enabled.
thread_blocking_check_promises(blocking, get_thread(curr));
return false;
}
+ } else if (params->yieldblock && curr->is_yield()) {
+ return false;
}
return true;
*
* @param curr The current action to process
* @return The ModelAction that is actually executed; may be different than
- * curr; may be NULL, if the current action is not enabled to run
+ * curr
*/
ModelAction * ModelExecution::check_current_action(ModelAction *curr)
{
bool ModelExecution::promises_expired() const
{
- for (unsigned int i = 0; i < promises->size(); i++) {
- Promise *promise = (*promises)[i];
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ Promise *promise = promises[i];
if (promise->get_expiration() < priv->used_sequence_numbers)
return true;
}
*/
bool ModelExecution::isfeasibleprefix() const
{
- return pending_rel_seqs->size() == 0 && is_feasible_prefix_ignore_relseq();
+ return pending_rel_seqs.size() == 0 && is_feasible_prefix_ignore_relseq();
}
/**
ptr += sprintf(ptr, "[bad sw ordering]");
if (promises_expired())
ptr += sprintf(ptr, "[promise expired]");
- if (promises->size() != 0)
+ if (promises.size() != 0)
ptr += sprintf(ptr, "[unresolved promise]");
if (ptr != buf)
model_print("%s: %s\n", prefix ? prefix : "Infeasible", buf);
*/
bool ModelExecution::is_feasible_prefix_ignore_relseq() const
{
- return !is_infeasible() && promises->size() == 0;
+ return !is_infeasible() && promises.size() == 0;
}
/**
if (!mo_graph->checkReachable(rf, other_rf))
return false;
- SnapVector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
+ SnapVector<action_list_t> *thrd_lists = obj_thrd_map.get(curr->get_location());
action_list_t *list = &(*thrd_lists)[id_to_int(curr->get_tid())];
action_list_t::reverse_iterator rit = list->rbegin();
ASSERT((*rit) == curr);
curr->get_node()->get_read_from_promise_size() <= 1)
return true;
- SnapVector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
+ SnapVector<action_list_t> *thrd_lists = obj_thrd_map.get(curr->get_location());
int tid = id_to_int(curr->get_tid());
ASSERT(tid < (int)thrd_lists->size());
action_list_t *list = &(*thrd_lists)[tid];
template <typename rf_type>
bool ModelExecution::r_modification_order(ModelAction *curr, const rf_type *rf)
{
- SnapVector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
+ SnapVector<action_list_t> *thrd_lists = obj_thrd_map.get(curr->get_location());
unsigned int i;
bool added = false;
ASSERT(curr->is_read());
* All compatible, thread-exclusive promises must be ordered after any
* concrete loads from the same thread
*/
- for (unsigned int i = 0; i < promises->size(); i++)
- if ((*promises)[i]->is_compatible_exclusive(curr))
- added = mo_graph->addEdge(rf, (*promises)[i]) || added;
+ for (unsigned int i = 0; i < promises.size(); i++)
+ if (promises[i]->is_compatible_exclusive(curr))
+ added = mo_graph->addEdge(rf, promises[i]) || added;
return added;
}
*/
bool ModelExecution::w_modification_order(ModelAction *curr, ModelVector<ModelAction *> *send_fv)
{
- SnapVector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
+ SnapVector<action_list_t> *thrd_lists = obj_thrd_map.get(curr->get_location());
unsigned int i;
bool added = false;
ASSERT(curr->is_write());
* concrete stores to the same thread, or else they can be merged with
* this store later
*/
- for (unsigned int i = 0; i < promises->size(); i++)
- if ((*promises)[i]->is_compatible_exclusive(curr))
- added = mo_graph->addEdge(curr, (*promises)[i]) || added;
+ for (unsigned int i = 0; i < promises.size(); i++)
+ if (promises[i]->is_compatible_exclusive(curr))
+ added = mo_graph->addEdge(curr, promises[i]) || added;
return added;
}
*/
bool ModelExecution::mo_may_allow(const ModelAction *writer, const ModelAction *reader)
{
- SnapVector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, reader->get_location());
+ SnapVector<action_list_t> *thrd_lists = obj_thrd_map.get(reader->get_location());
unsigned int i;
/* Iterate over all threads */
for (i = 0; i < thrd_lists->size(); i++) {
release_heads->push_back(fence_release);
int tid = id_to_int(rf->get_tid());
- SnapVector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, rf->get_location());
+ SnapVector<action_list_t> *thrd_lists = obj_thrd_map.get(rf->get_location());
action_list_t *list = &(*thrd_lists)[tid];
action_list_t::const_reverse_iterator rit;
if (!release_seq_heads(rf, release_heads, sequence)) {
/* add act to 'lazy checking' list */
- pending_rel_seqs->push_back(sequence);
+ pending_rel_seqs.push_back(sequence);
} else {
snapshot_free(sequence);
}
bool ModelExecution::resolve_release_sequences(void *location, work_queue_t *work_queue)
{
bool updated = false;
- SnapVector<struct release_seq *>::iterator it = pending_rel_seqs->begin();
- while (it != pending_rel_seqs->end()) {
+ SnapVector<struct release_seq *>::iterator it = pending_rel_seqs.begin();
+ while (it != pending_rel_seqs.end()) {
struct release_seq *pending = *it;
ModelAction *acquire = pending->acquire;
const ModelAction *read = pending->read;
work_queue->push_back(MOEdgeWorkEntry(acquire));
/* propagate synchronization to later actions */
- action_list_t::reverse_iterator rit = action_trace->rbegin();
+ action_list_t::reverse_iterator rit = action_trace.rbegin();
for (; (*rit) != acquire; rit++) {
ModelAction *propagate = *rit;
if (acquire->happens_before(propagate)) {
}
}
if (complete) {
- it = pending_rel_seqs->erase(it);
+ it = pending_rel_seqs.erase(it);
snapshot_free(pending);
} else {
it++;
int tid = id_to_int(act->get_tid());
ModelAction *uninit = NULL;
int uninit_id = -1;
- action_list_t *list = get_safe_ptr_action(obj_map, act->get_location());
+ action_list_t *list = get_safe_ptr_action(&obj_map, act->get_location());
if (list->empty() && act->is_atomic_var()) {
uninit = get_uninitialized_action(act);
uninit_id = id_to_int(uninit->get_tid());
}
list->push_back(act);
- action_trace->push_back(act);
+ action_trace.push_back(act);
if (uninit)
- action_trace->push_front(uninit);
+ action_trace.push_front(uninit);
- SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(obj_thrd_map, act->get_location());
+ SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_thrd_map, act->get_location());
if (tid >= (int)vec->size())
vec->resize(priv->next_thread_id);
(*vec)[tid].push_back(act);
if (uninit)
(*vec)[uninit_id].push_front(uninit);
- if ((int)thrd_last_action->size() <= tid)
- thrd_last_action->resize(get_num_threads());
- (*thrd_last_action)[tid] = act;
+ if ((int)thrd_last_action.size() <= tid)
+ thrd_last_action.resize(get_num_threads());
+ thrd_last_action[tid] = act;
if (uninit)
- (*thrd_last_action)[uninit_id] = uninit;
+ thrd_last_action[uninit_id] = uninit;
if (act->is_fence() && act->is_release()) {
- if ((int)thrd_last_fence_release->size() <= tid)
- thrd_last_fence_release->resize(get_num_threads());
- (*thrd_last_fence_release)[tid] = act;
+ if ((int)thrd_last_fence_release.size() <= tid)
+ thrd_last_fence_release.resize(get_num_threads());
+ thrd_last_fence_release[tid] = act;
}
if (act->is_wait()) {
void *mutex_loc = (void *) act->get_value();
- get_safe_ptr_action(obj_map, mutex_loc)->push_back(act);
+ get_safe_ptr_action(&obj_map, mutex_loc)->push_back(act);
- SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(obj_thrd_map, mutex_loc);
+ SnapVector<action_list_t> *vec = get_safe_ptr_vect_action(&obj_thrd_map, mutex_loc);
if (tid >= (int)vec->size())
vec->resize(priv->next_thread_id);
(*vec)[tid].push_back(act);
ModelAction * ModelExecution::get_last_action(thread_id_t tid) const
{
int threadid = id_to_int(tid);
- if (threadid < (int)thrd_last_action->size())
- return (*thrd_last_action)[id_to_int(tid)];
+ if (threadid < (int)thrd_last_action.size())
+ return thrd_last_action[id_to_int(tid)];
else
return NULL;
}
ModelAction * ModelExecution::get_last_fence_release(thread_id_t tid) const
{
int threadid = id_to_int(tid);
- if (threadid < (int)thrd_last_fence_release->size())
- return (*thrd_last_fence_release)[id_to_int(tid)];
+ if (threadid < (int)thrd_last_fence_release.size())
+ return thrd_last_fence_release[id_to_int(tid)];
else
return NULL;
}
ModelAction * ModelExecution::get_last_seq_cst_write(ModelAction *curr) const
{
void *location = curr->get_location();
- action_list_t *list = get_safe_ptr_action(obj_map, location);
+ action_list_t *list = obj_map.get(location);
/* Find: max({i in dom(S) | seq_cst(t_i) && isWrite(t_i) && samevar(t_i, t)}) */
action_list_t::reverse_iterator rit;
for (rit = list->rbegin(); (*rit) != curr; rit++)
*/
ModelAction * ModelExecution::get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const
{
- /* All fences should have NULL location */
- action_list_t *list = get_safe_ptr_action(obj_map, NULL);
+ /* All fences should have location FENCE_LOCATION */
+ action_list_t *list = obj_map.get(FENCE_LOCATION);
+
+ if (!list)
+ return NULL;
+
action_list_t::reverse_iterator rit = list->rbegin();
if (before_fence) {
ModelAction * ModelExecution::get_last_unlock(ModelAction *curr) const
{
void *location = curr->get_location();
- action_list_t *list = get_safe_ptr_action(obj_map, location);
+ action_list_t *list = obj_map.get(location);
/* Find: max({i in dom(S) | isUnlock(t_i) && samevar(t_i, t)}) */
action_list_t::reverse_iterator rit;
for (rit = list->rbegin(); rit != list->rend(); rit++)
*/
Promise * ModelExecution::pop_promise_to_resolve(const ModelAction *curr)
{
- for (unsigned int i = 0; i < promises->size(); i++)
+ for (unsigned int i = 0; i < promises.size(); i++)
if (curr->get_node()->get_promise(i)) {
- Promise *ret = (*promises)[i];
- promises->erase(promises->begin() + i);
+ Promise *ret = promises[i];
+ promises.erase(promises.begin() + i);
return ret;
}
return NULL;
*/
void ModelExecution::compute_promises(ModelAction *curr)
{
- for (unsigned int i = 0; i < promises->size(); i++) {
- Promise *promise = (*promises)[i];
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ Promise *promise = promises[i];
if (!promise->is_compatible(curr) || !promise->same_value(curr))
continue;
/** Checks promises in response to change in ClockVector Threads. */
void ModelExecution::check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv)
{
- for (unsigned int i = 0; i < promises->size(); i++) {
- Promise *promise = (*promises)[i];
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ Promise *promise = promises[i];
if (!promise->thread_is_available(tid))
continue;
for (unsigned int j = 0; j < promise->get_num_readers(); j++) {
void ModelExecution::check_promises_thread_disabled()
{
- for (unsigned int i = 0; i < promises->size(); i++) {
- Promise *promise = (*promises)[i];
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ Promise *promise = promises[i];
if (promise->has_failed()) {
priv->failed_promise = true;
return;
{
const ModelAction *write = is_read_check ? act->get_reads_from() : act;
- for (unsigned int i = 0; i < promises->size(); i++) {
- Promise *promise = (*promises)[i];
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ Promise *promise = promises[i];
// Is this promise on the same location?
if (!promise->same_location(write))
*/
void ModelExecution::compute_relseq_breakwrites(ModelAction *curr)
{
- if (pending_rel_seqs->empty())
+ if (pending_rel_seqs.empty())
return;
- struct release_seq *pending = pending_rel_seqs->back();
+ struct release_seq *pending = pending_rel_seqs.back();
for (unsigned int i = 0; i < pending->writes.size(); i++) {
const ModelAction *write = pending->writes[i];
curr->get_node()->add_relseq_break(write);
*/
void ModelExecution::build_may_read_from(ModelAction *curr)
{
- SnapVector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
+ SnapVector<action_list_t> *thrd_lists = obj_thrd_map.get(curr->get_location());
unsigned int i;
ASSERT(curr->is_read());
}
/* Inherit existing, promised future values */
- for (i = 0; i < promises->size(); i++) {
- const Promise *promise = (*promises)[i];
+ for (i = 0; i < promises.size(); i++) {
+ const Promise *promise = promises[i];
const ModelAction *promise_read = promise->get_reader(0);
if (promise_read->same_var(curr)) {
/* Only add feasible future-values */
return act;
}
-static void print_list(action_list_t *list)
+static void print_list(const action_list_t *list)
{
- action_list_t::iterator it;
+ action_list_t::const_iterator it;
model_print("---------------------------------------------------------------------\n");
mo_graph->dumpNodes(file);
ModelAction **thread_array = (ModelAction **)model_calloc(1, sizeof(ModelAction *) * get_num_threads());
- for (action_list_t::iterator it = action_trace->begin(); it != action_trace->end(); it++) {
+ for (action_list_t::const_iterator it = action_trace.begin(); it != action_trace.end(); it++) {
ModelAction *act = *it;
if (act->is_read()) {
mo_graph->dot_print_node(file, act);
model_print("Execution %d:", get_execution_number());
if (isfeasibleprefix()) {
+ if (is_yieldblocked())
+ model_print(" YIELD BLOCKED");
if (scheduler->all_threads_sleeping())
model_print(" SLEEP-SET REDUNDANT");
model_print("\n");
} else
print_infeasibility(" INFEASIBLE");
- print_list(action_trace);
+ print_list(&action_trace);
model_print("\n");
- if (!promises->empty()) {
+ if (!promises.empty()) {
model_print("Pending promises:\n");
- for (unsigned int i = 0; i < promises->size(); i++) {
+ for (unsigned int i = 0; i < promises.size(); i++) {
model_print(" [P%u] ", i);
- (*promises)[i]->print();
+ promises[i]->print();
}
model_print("\n");
}
*/
void ModelExecution::add_thread(Thread *t)
{
- thread_map->put(id_to_int(t->get_id()), t);
+ unsigned int i = id_to_int(t->get_id());
+ if (i >= thread_map.size())
+ thread_map.resize(i + 1);
+ thread_map[i] = t;
if (!t->is_model_thread())
scheduler->add_thread(t);
}
*/
Thread * ModelExecution::get_thread(thread_id_t tid) const
{
- return thread_map->get(id_to_int(tid));
+ unsigned int i = id_to_int(tid);
+ if (i < thread_map.size())
+ return thread_map[i];
+ return NULL;
}
/**
*/
int ModelExecution::get_promise_number(const Promise *promise) const
{
- for (unsigned int i = 0; i < promises->size(); i++)
- if ((*promises)[i] == promise)
+ for (unsigned int i = 0; i < promises.size(); i++)
+ if (promises[i] == promise)
return i;
/* Not found */
return -1;
*/
void ModelExecution::fixup_release_sequences()
{
- while (!pending_rel_seqs->empty() &&
+ while (!pending_rel_seqs.empty() &&
is_feasible_prefix_ignore_relseq() &&
- !unrealizedraces.empty()) {
+ haveUnrealizedRaces()) {
model_print("*** WARNING: release sequence fixup action "
"(%zu pending release seuqence(s)) ***\n",
- pending_rel_seqs->size());
+ pending_rel_seqs.size());
ModelAction *fixup = new ModelAction(MODEL_FIXUP_RELSEQ,
std::memory_order_seq_cst, NULL, VALUE_NONE,
model_thread);
projects / model-checker.git / blobdiff