execution: add const
[c11tester.git] / execution.cc
index f0288d2e7de1eb2d23bc32c95a3c01fb8c7d1683..74fa43ef90f26861455a196d53fec6c3b4b6bf14 100644 (file)
@@ -4,6 +4,7 @@
 #include <new>
 #include <stdarg.h>
 
+#include "model.h"
 #include "execution.h"
 #include "action.h"
 #include "nodestack.h"
@@ -56,27 +57,30 @@ struct model_snapshot_members {
 };
 
 /** @brief Constructor */
-ModelExecution::ModelExecution(struct model_params *params, Scheduler *scheduler, NodeStack *node_stack) :
+ModelExecution::ModelExecution(ModelChecker *m,
+               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>()),
+       thread_map(),
        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 *>()),
+       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()),
-       execution_number(1)
+       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);
+       thread_map.put(id_to_int(model_thread->get_id()), model_thread);
        scheduler->register_engine(this);
 }
 
@@ -84,26 +88,23 @@ ModelExecution::ModelExecution(struct model_params *params, Scheduler *scheduler
 ModelExecution::~ModelExecution()
 {
        for (unsigned int i = 0; i < get_num_threads(); i++)
-               delete thread_map->get(i);
-       delete thread_map;
+               delete thread_map.get(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];
-       delete promises;
+       for (unsigned int i = 0; i < promises.size(); i++)
+               delete promises[i];
 
-       delete pending_rel_seqs;
-
-       delete thrd_last_action;
-       delete thrd_last_fence_release;
        delete mo_graph;
        delete priv;
 }
 
+int ModelExecution::get_execution_number() const
+{
+       return model->get_execution_number();
+}
+
 static action_list_t * get_safe_ptr_action(HashTable<const void *, action_list_t *, uintptr_t, 4> * hash, void * ptr)
 {
        action_list_t *tmp = hash->get(ptr);
@@ -126,7 +127,7 @@ static SnapVector<action_list_t> * get_safe_ptr_vect_action(HashTable<void *, Sn
 
 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);
@@ -308,8 +309,8 @@ ModelAction * ModelExecution::get_last_fence_conflict(ModelAction *act) const
                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;
@@ -614,7 +615,7 @@ bool ModelExecution::process_read(ModelAction *curr)
                        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();
@@ -693,14 +694,14 @@ bool ModelExecution::process_mutex(ModelAction *curr)
 
                /* 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));
@@ -709,7 +710,7 @@ bool ModelExecution::process_mutex(ModelAction *curr)
                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);
@@ -741,10 +742,10 @@ bool ModelExecution::process_mutex(ModelAction *curr)
 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;
@@ -817,17 +818,17 @@ bool ModelExecution::process_write(ModelAction *curr)
                        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);
                }
        }
 
@@ -911,8 +912,8 @@ bool ModelExecution::process_thread_action(ModelAction *curr)
                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());
                }
@@ -936,8 +937,8 @@ bool ModelExecution::process_thread_action(ModelAction *curr)
                }
                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;
@@ -972,8 +973,8 @@ bool ModelExecution::process_thread_action(ModelAction *curr)
 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;
@@ -1088,7 +1089,7 @@ bool ModelExecution::initialize_curr_action(ModelAction **curr)
                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 */
        }
@@ -1155,8 +1156,8 @@ bool ModelExecution::synchronize(const ModelAction *first, ModelAction *second)
  */
 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++) {
@@ -1327,8 +1328,8 @@ void ModelExecution::check_curr_backtracking(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;
        }
@@ -1342,7 +1343,7 @@ bool ModelExecution::promises_expired() const
  */
 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();
 }
 
 /**
@@ -1366,7 +1367,7 @@ void ModelExecution::print_infeasibility(const char *prefix) const
                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);
@@ -1378,7 +1379,7 @@ void ModelExecution::print_infeasibility(const char *prefix) const
  */
 bool ModelExecution::is_feasible_prefix_ignore_relseq() const
 {
-       return !is_infeasible() && promises->size() == 0;
+       return !is_infeasible() && promises.size() == 0;
 }
 
 /**
@@ -1433,7 +1434,7 @@ bool ModelExecution::should_read_instead(const ModelAction *curr, const T *rf, c
        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);
@@ -1476,7 +1477,7 @@ bool ModelExecution::check_recency(ModelAction *curr, const T *rf) const
                        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];
@@ -1533,7 +1534,7 @@ bool ModelExecution::check_recency(ModelAction *curr, const T *rf) const
 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());
@@ -1626,9 +1627,9 @@ bool ModelExecution::r_modification_order(ModelAction *curr, const rf_type *rf)
         * 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;
 }
@@ -1659,7 +1660,7 @@ bool ModelExecution::r_modification_order(ModelAction *curr, const rf_type *rf)
  */
 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());
@@ -1765,9 +1766,9 @@ bool ModelExecution::w_modification_order(ModelAction *curr, ModelVector<ModelAc
         * 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;
 }
@@ -1803,7 +1804,7 @@ bool ModelExecution::thin_air_constraint_may_allow(const ModelAction *writer, co
  */
 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++) {
@@ -1904,7 +1905,7 @@ bool ModelExecution::release_seq_heads(const ModelAction *rf,
                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;
 
@@ -2025,7 +2026,7 @@ void ModelExecution::get_release_seq_heads(ModelAction *acquire,
 
        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);
        }
@@ -2047,8 +2048,8 @@ void ModelExecution::get_release_seq_heads(ModelAction *acquire,
 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;
@@ -2087,7 +2088,7 @@ bool ModelExecution::resolve_release_sequences(void *location, work_queue_t *wor
                        }
                }
                if (complete) {
-                       it = pending_rel_seqs->erase(it);
+                       it = pending_rel_seqs.erase(it);
                        snapshot_free(pending);
                } else {
                        it++;
@@ -2124,30 +2125,30 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
        if (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);
 
-               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);
@@ -2162,8 +2163,8 @@ void ModelExecution::add_action_to_lists(ModelAction *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;
 }
@@ -2176,8 +2177,8 @@ ModelAction * ModelExecution::get_last_action(thread_id_t tid) const
 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;
 }
@@ -2280,10 +2281,10 @@ ClockVector * ModelExecution::get_cv(thread_id_t tid) const
  */
 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;
@@ -2338,8 +2339,8 @@ bool ModelExecution::resolve_promise(ModelAction *write, Promise *promise)
  */
 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;
 
@@ -2360,8 +2361,8 @@ void ModelExecution::compute_promises(ModelAction *curr)
 /** 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++) {
@@ -2380,8 +2381,8 @@ void ModelExecution::check_promises(thread_id_t tid, ClockVector *old_cv, ClockV
 
 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;
@@ -2407,8 +2408,8 @@ void ModelExecution::mo_check_promises(const ModelAction *act, bool is_read_chec
 {
        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))
@@ -2448,10 +2449,10 @@ void ModelExecution::mo_check_promises(const ModelAction *act, bool is_read_chec
  */
 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);
@@ -2470,7 +2471,7 @@ void ModelExecution::compute_relseq_breakwrites(ModelAction *curr)
  */
 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());
 
@@ -2515,8 +2516,8 @@ void ModelExecution::build_may_read_from(ModelAction *curr)
        }
 
        /* 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 */
@@ -2580,9 +2581,9 @@ ModelAction * ModelExecution::get_uninitialized_action(const ModelAction *curr)
        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");
 
@@ -2643,13 +2644,13 @@ void ModelExecution::print_summary() const
 {
 #if SUPPORT_MOD_ORDER_DUMP
        char buffername[100];
-       sprintf(buffername, "exec%04u", execution_number);
+       sprintf(buffername, "exec%04u", get_execution_number());
        mo_graph->dumpGraphToFile(buffername);
-       sprintf(buffername, "graph%04u", execution_number);
+       sprintf(buffername, "graph%04u", get_execution_number());
        dumpGraph(buffername);
 #endif
 
-       model_print("Execution %d:", execution_number);
+       model_print("Execution %d:", get_execution_number());
        if (isfeasibleprefix()) {
                if (scheduler->all_threads_sleeping())
                        model_print(" SLEEP-SET REDUNDANT");
@@ -2658,11 +2659,11 @@ void ModelExecution::print_summary() const
                print_infeasibility(" INFEASIBLE");
        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");
        }
@@ -2675,7 +2676,7 @@ void ModelExecution::print_summary() const
  */
 void ModelExecution::add_thread(Thread *t)
 {
-       thread_map->put(id_to_int(t->get_id()), t);
+       thread_map.put(id_to_int(t->get_id()), t);
        if (!t->is_model_thread())
                scheduler->add_thread(t);
 }
@@ -2687,7 +2688,7 @@ void ModelExecution::add_thread(Thread *t)
  */
 Thread * ModelExecution::get_thread(thread_id_t tid) const
 {
-       return thread_map->get(id_to_int(tid));
+       return thread_map.get(id_to_int(tid));
 }
 
 /**
@@ -2713,8 +2714,8 @@ Thread * ModelExecution::get_thread(const ModelAction *act) const
  */
 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;
@@ -2800,12 +2801,12 @@ Thread * ModelExecution::take_step(ModelAction *curr)
  */
 void ModelExecution::fixup_release_sequences()
 {
-       while (!pending_rel_seqs->empty() &&
+       while (!pending_rel_seqs.empty() &&
                        is_feasible_prefix_ignore_relseq() &&
                        !unrealizedraces.empty()) {
                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);