#include "history.h"
#include "action.h"
#include "funcnode.h"
+#include "funcinst.h"
#include "common.h"
#include "model.h"
func_map(),
func_map_rev(),
func_nodes(),
- write_history(), // snapshot data structure
- loc_func_nodes_map() // shapshot data structure
+ write_history(), // snapshot data structure
+ loc_func_nodes_map(), // shapshot data structure
+ thrd_last_entered_func() // snapshot data structure
{}
void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
if ( thrd_func_list->size() <= id ) {
uint oldsize = thrd_func_list->size();
thrd_func_list->resize( id + 1 );
+ thrd_func_act_lists->resize( id + 1 );
+
for (uint i = oldsize; i < id + 1; i++) {
new (&(*thrd_func_list)[i]) func_id_list_t();
// push 0 as a dummy function id to a void seg fault
(*thrd_func_list)[i].push_back(0);
- }
- thrd_func_act_lists->resize( id + 1 );
- for (uint i = oldsize; i < id + 1; i++) {
(*thrd_func_act_lists)[i] = new SnapList<action_list_t *>();
}
}
+ while ( thrd_last_entered_func.size() <= id ) {
+ thrd_last_entered_func.push_back(0); // 0 is a dummy function id
+ }
+
SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
+ func_act_lists->push_back( new action_list_t() );
+ uint32_t last_entered_func_id = thrd_last_entered_func[id];
+ thrd_last_entered_func[id] = func_id;
(*thrd_func_list)[id].push_back(func_id);
- func_act_lists->push_back( new action_list_t() );
if ( func_nodes.size() <= func_id )
resize_func_nodes( func_id + 1 );
FuncNode * func_node = func_nodes[func_id];
func_node->init_predicate_tree_position(tid);
func_node->init_inst_act_map(tid);
+
+ /* Add edges between FuncNodes */
+ if (last_entered_func_id != 0) {
+ FuncNode * last_func_node = func_nodes[last_entered_func_id];
+ last_func_node->add_out_edge(func_node);
+ }
}
/* @param func_id a non-zero value */
FuncNode * func_node = func_nodes[func_id];
func_node->set_predicate_tree_position(tid, NULL);
func_node->reset_inst_act_map(tid);
- //func_node->clear_read_map(tid);
action_list_t * curr_act_list = func_act_lists->back();
*/
func_node->incr_exit_count();
if (func_node->get_exit_count() >= 2) {
-
ModelList<action_list_t *> * action_list_buffer = func_node->get_action_list_buffer();
+
SnapList<action_list_t *> * action_list_buffer = func_node->get_action_list_buffer();
while (action_list_buffer->size() > 0) {
action_list_t * act_list = action_list_buffer->back();
action_list_buffer->pop_back();
if (act->is_write()) {
void * location = act->get_location();
uint64_t value = act->get_write_value();
- add_to_write_history(location, value);
+ update_write_history(location, value);
- /* update FuncNodes */
+ /* Update FuncNodes that may read from this location */
SnapList<FuncNode *> * func_nodes = loc_func_nodes_map.get(location);
- sllnode<FuncNode *> * it = NULL;
- if (func_nodes != NULL)
- it = func_nodes->begin();
-
- for (; it != NULL; it = it->getNext()) {
- FuncNode * func_node = it->getVal();
- func_node->add_to_val_loc_map(value, 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);
+ }
}
}
action_list_t * curr_act_list = func_act_lists->back();
ASSERT(curr_act_list != NULL);
- ModelAction * last_act = NULL;
- if (curr_act_list->size() != 0)
- last_act = curr_act_list->back();
-
- /* skip actions that are paused by fuzzer (sequence number is 0),
- * that are second part of a read modify write or actions with the same sequence number */
modelclock_t curr_seq_number = act->get_seq_number();
- if (curr_seq_number == 0 || second_part_of_rmw ||
- (last_act != NULL && last_act->get_seq_number() == curr_seq_number) )
- return;
+ /* 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;
+ }
- if ( func_nodes.size() <= func_id )
- resize_func_nodes( func_id + 1 );
+ /* skip actions that are paused by fuzzer (sequence number is 0) */
+ if (curr_seq_number == 0)
+ return;
FuncNode * func_node = func_nodes[func_id];
if (act->is_read()) {
func_node->update_inst_act_map(tid, act);
+ // Update predicate tree position
Fuzzer * fuzzer = model->get_execution()->getFuzzer();
Predicate * selected_branch = fuzzer->get_selected_child_branch(tid);
func_node->set_predicate_tree_position(tid, selected_branch);
return func_nodes[func_id];
}
-void ModelHistory::add_to_write_history(void * location, uint64_t write_val)
+void ModelHistory::update_write_history(void * location, uint64_t write_val)
{
value_set_t * write_set = write_history.get(location);
write_set->add(write_val);
}
-void ModelHistory::add_to_loc_func_nodes_map(void * location, FuncNode * node)
+void ModelHistory::update_loc_func_nodes_map(void * location, FuncNode * node)
{
SnapList<FuncNode *> * func_node_list = loc_func_nodes_map.get(location);
if (func_node_list == NULL) {
func_node_list->push_back(node);
}
+void ModelHistory::update_loc_wr_func_nodes_map(void * location, FuncNode * node)
+{
+ SnapList<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->push_back(node);
+}
+
/* Reallocate some snapshotted memories when new executions start */
void ModelHistory::set_new_exec_flag()
{
}
}
-void ModelHistory::print_write()
+void ModelHistory::dump_func_node_graph()
{
+ model_print("digraph func_node_graph {\n");
+ for (uint i = 1; i < func_nodes.size(); i++) {
+ FuncNode * node = func_nodes[i];
+ ModelList<FuncNode *> * out_edges = node->get_out_edges();
+
+ model_print("\"%p\" [label=\"%s\"]\n", node, node->get_func_name());
+ mllnode<FuncNode *> * it;
+ for (it = out_edges->begin(); it != NULL; it = it->getNext()) {
+ FuncNode * other = it->getVal();
+ model_print("\"%p\" -> \"%p\"\n", node, other);
+ }
+ }
+ model_print("}\n");
}
void ModelHistory::print_func_node()
FuncInst *inst = it->getVal();
model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
}
-/*
- func_inst_list_mt * inst_list = funcNode->get_inst_list();
-
- model_print("function %s has following actions\n", funcNode->get_func_name());
- func_inst_list_mt::iterator it;
- for (it = inst_list->begin(); it != inst_list->end(); it++) {
- FuncInst *inst = *it;
- model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
- }
-*/
}
}
projects / c11tester.git / blobdiff