#include "predicate.h"
#include "concretepredicate.h"
+#include "model.h"
+
FuncNode::FuncNode(ModelHistory * history) :
history(history),
exit_count(0),
write_locations = new loc_set_t();
val_loc_map = new HashTable<uint64_t, loc_set_t *, uint64_t, 0>();
loc_may_equal_map = new HashTable<void *, loc_set_t *, uintptr_t, 0>();
- thrd_inst_act_map = new SnapVector<inst_act_map_t *>();
//values_may_read_from = new value_set_t();
}
/* Reallocate snapshotted memories when new executions start */
void FuncNode::set_new_exec_flag()
{
- for (mllnode<FuncInst *> * it = inst_list.begin(); it != NULL; it = it->getNext()) {
- FuncInst * inst = it->getVal();
- inst->unset_location();
- }
-
action_list_buffer = new SnapList<action_list_t *>();
read_locations = new loc_set_t();
write_locations = new loc_set_t();
val_loc_map = new HashTable<uint64_t, loc_set_t *, uint64_t, 0>();
loc_may_equal_map = new HashTable<void *, loc_set_t *, uintptr_t, 0>();
- thrd_inst_act_map = new SnapVector<inst_act_map_t *>();
//values_may_read_from = new value_set_t();
}
FuncInst * inst = func_inst_map.get(position);
ASSERT(inst->get_type() == act->get_type());
+ int curr_execution_number = model->get_execution_number();
- // locations are set to NULL when new executions start
- if (inst->get_location() == NULL)
+ /* Reset locations when new executions start */
+ if (inst->get_execution_number() != curr_execution_number) {
inst->set_location(act->get_location());
+ inst->set_execution_number(curr_execution_number);
+ }
if (inst->get_location() != act->get_location())
inst->not_single_location();
void FuncNode::init_inst_act_map(thread_id_t tid)
{
int thread_id = id_to_int(tid);
+ SnapVector<inst_act_map_t *> * thrd_inst_act_map = history->getThrdInstActMap(func_id);
uint old_size = thrd_inst_act_map->size();
if (thrd_inst_act_map->size() <= (uint) thread_id) {
void FuncNode::reset_inst_act_map(thread_id_t tid)
{
int thread_id = id_to_int(tid);
+ SnapVector<inst_act_map_t *> * thrd_inst_act_map = history->getThrdInstActMap(func_id);
+
inst_act_map_t * map = (*thrd_inst_act_map)[thread_id];
map->reset();
}
void FuncNode::update_inst_act_map(thread_id_t tid, ModelAction * read_act)
{
int thread_id = id_to_int(tid);
+ SnapVector<inst_act_map_t *> * thrd_inst_act_map = history->getThrdInstActMap(func_id);
+
inst_act_map_t * map = (*thrd_inst_act_map)[thread_id];
FuncInst * read_inst = get_inst(read_act);
map->put(read_inst, read_act);
inst_act_map_t * FuncNode::get_inst_act_map(thread_id_t tid)
{
int thread_id = id_to_int(tid);
+ SnapVector<inst_act_map_t *> * thrd_inst_act_map = history->getThrdInstActMap(func_id);
+
return (*thrd_inst_act_map)[thread_id];
}