{
/* The following are snapshot data structures */
write_history = new HashTable<void *, value_set_t *, uintptr_t, 4>();
- loc_func_nodes_map = new HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 0>();
- loc_wr_func_nodes_map = new HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 0>();
+ loc_rd_func_nodes_map = new HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0>();
+ loc_wr_func_nodes_map = new HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0>();
loc_waiting_writes_map = new HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 0>();
thrd_waiting_write = new SnapVector<ConcretePredicate *>();
- func_inst_act_maps = new HashTable<uint32_t, SnapVector<inst_act_map_t *> *, int, 0>();
+ func_inst_act_maps = new HashTable<uint32_t, SnapVector<inst_act_map_t *> *, int, 0>(128);
}
void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
{
ModelExecution * execution = model->get_execution();
- /* return if thread i has not entered any function or has exited
+ /* Return if thread i has not entered any function or has exited
from all functions */
SnapVector<func_id_list_t> * thrd_func_list = execution->get_thrd_func_list();
SnapVector< SnapList<action_list_t *> *> *
if ( thrd_func_list->size() <= id )
return;
- /* get the function id that thread i is currently in */
+ /* Get the function id that thread i is currently in */
uint32_t func_id = (*thrd_func_list)[id].back();
SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
update_write_history(location, value);
/* Update FuncNodes that may read from this location */
- SnapList<FuncNode *> * func_nodes = loc_func_nodes_map->get(location);
- if (func_nodes != NULL) {
- sllnode<FuncNode *> * it = func_nodes->begin();
- for (; it != NULL; it = it->getNext()) {
- FuncNode * func_node = it->getVal();
- func_node->add_to_val_loc_map(value, location);
- }
+ SnapVector<FuncNode *> * func_node_list = getRdFuncNodes(location);
+ for (uint i = 0; i < func_node_list->size(); i++) {
+ FuncNode * func_node = (*func_node_list)[i];
+ func_node->add_to_val_loc_map(value, location);
}
check_waiting_write(act);
}
- /* the following does not care about actions without a position */
+ /* The following does not care about actions without a position */
if (func_id == 0 || act->get_position() == NULL)
return;
- bool second_part_of_rmw = act->is_rmwc() || act->is_rmw();
-
action_list_t * curr_act_list = func_act_lists->back();
ASSERT(curr_act_list != NULL);
- modelclock_t curr_seq_number = act->get_seq_number();
- /* Skip actions that are second part of a read modify write or actions with the same sequence number */
- if (curr_act_list->size() != 0) {
- ModelAction * last_act = curr_act_list->back();
- if (second_part_of_rmw || last_act->get_seq_number() == curr_seq_number)
- return;
- }
-
- /* skip actions that are paused by fuzzer (sequence number is 0) */
- if (curr_seq_number == 0)
+ if (skip_action(act, curr_act_list))
return;
FuncNode * func_node = func_nodes[func_id];
- /* add to curr_inst_list */
+ /* Add to curr_inst_list */
curr_act_list->push_back(act);
func_node->add_inst(act);
write_set->add(write_val);
}
-void ModelHistory::update_loc_func_nodes_map(void * location, FuncNode * node)
+void ModelHistory::update_loc_rd_func_nodes_map(void * location, FuncNode * node)
+{
+ SnapVector<FuncNode *> * func_node_list = getRdFuncNodes(location);
+ func_node_list->push_back(node);
+}
+
+void ModelHistory::update_loc_wr_func_nodes_map(void * location, FuncNode * node)
+{
+ SnapVector<FuncNode *> * func_node_list = getWrFuncNodes(location);
+ func_node_list->push_back(node);
+}
+
+SnapVector<FuncNode *> * ModelHistory::getRdFuncNodes(void * location)
{
- SnapList<FuncNode *> * func_node_list = loc_func_nodes_map->get(location);
+ SnapVector<FuncNode *> * func_node_list = loc_rd_func_nodes_map->get(location);
if (func_node_list == NULL) {
- func_node_list = new SnapList<FuncNode *>();
- loc_func_nodes_map->put(location, func_node_list);
+ func_node_list = new SnapVector<FuncNode *>();
+ loc_rd_func_nodes_map->put(location, func_node_list);
}
- func_node_list->push_back(node);
+ return func_node_list;
}
-void ModelHistory::update_loc_wr_func_nodes_map(void * location, FuncNode * node)
+SnapVector<FuncNode *> * ModelHistory::getWrFuncNodes(void * location)
{
- SnapList<FuncNode *> * func_node_list = loc_wr_func_nodes_map->get(location);
+ SnapVector<FuncNode *> * func_node_list = loc_wr_func_nodes_map->get(location);
if (func_node_list == NULL) {
- func_node_list = new SnapList<FuncNode *>();
- loc_func_nodes_map->put(location, func_node_list);
+ func_node_list = new SnapVector<FuncNode *>();
+ loc_wr_func_nodes_map->put(location, func_node_list);
}
- func_node_list->push_back(node);
+ return func_node_list;
}
/* When a thread is paused by Fuzzer, keep track of the condition it is waiting for */
return maps;
}
+bool ModelHistory::skip_action(ModelAction * act, SnapList<ModelAction *> * curr_act_list)
+{
+ bool second_part_of_rmw = act->is_rmwc() || act->is_rmw();
+ modelclock_t curr_seq_number = act->get_seq_number();
+
+ /* Skip actions that are second part of a read modify write */
+ if (second_part_of_rmw)
+ return true;
+
+ /* Skip actions with the same sequence number */
+ if (curr_act_list->size() != 0) {
+ ModelAction * last_act = curr_act_list->back();
+ if (last_act->get_seq_number() == curr_seq_number)
+ return true;
+ }
+
+ /* Skip actions that are paused by fuzzer (sequence number is 0) */
+ if (curr_seq_number == 0)
+ return true;
+
+ return false;
+}
+
/* Reallocate some snapshotted memories when new executions start */
void ModelHistory::set_new_exec_flag()
{
projects / c11tester.git / blobdiff