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_func_act_lists = new SnapVector< SnapList<action_list_t *> *>();
+ thrd_func_list = new SnapVector<func_id_list_t>();
+ thrd_last_entered_func = new SnapVector<uint32_t>();
thrd_waiting_write = new SnapVector<ConcretePredicate *>();
thrd_wait_obj = new SnapVector<WaitObj *>();
func_inst_act_maps = new HashTable<uint32_t, SnapVector<inst_act_map_t *> *, int, 0>(128);
ModelHistory::~ModelHistory()
{
// TODO: complete deconstructor; maybe not needed
- for (uint i = 0; i < thrd_wait_obj->size(); i++)
+ for (uint i = 0;i < thrd_wait_obj->size();i++)
delete (*thrd_wait_obj)[i];
}
void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
{
//model_print("thread %d entering func %d\n", tid, func_id);
- ModelExecution * execution = model->get_execution();
uint id = id_to_int(tid);
- SnapVector<func_id_list_t> * thrd_func_list = execution->get_thrd_func_list();
- SnapVector< SnapList<action_list_t *> *> *
- thrd_func_act_lists = execution->get_thrd_func_act_lists();
- SnapVector<uint32_t> * thrd_last_entered_func = execution->get_thrd_last_entered_func();
-
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++) {
+ for (uint i = oldsize;i < id + 1;i++) {
// push 0 as a dummy function id to a void seg fault
new (&(*thrd_func_list)[i]) func_id_list_t();
(*thrd_func_list)[i].push_back(0);
/* @param func_id a non-zero value */
void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
{
- ModelExecution * execution = model->get_execution();
uint32_t id = id_to_int(tid);
- SnapVector<func_id_list_t> * thrd_func_list = execution->get_thrd_func_list();
- SnapVector< SnapList<action_list_t *> *> *
- thrd_func_act_lists = execution->get_thrd_func_act_lists();
SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
uint32_t last_func_id = (*thrd_func_list)[id].back();
action_list_t * curr_act_list = func_act_lists->back();
- /* defer the processing of curr_act_list until the function has exits a few times
+ /* defer the processing of curr_act_list until the function has exits a few times
* (currently twice) so that more information can be gathered to infer nullity predicates.
*/
func_node->incr_exit_count();
if ( old_size < new_size )
func_nodes.resize(new_size);
- for (uint32_t id = old_size; id < new_size; id++) {
+ for (uint32_t id = old_size;id < new_size;id++) {
const char * func_name = func_map_rev[id];
FuncNode * func_node = new FuncNode(this);
func_node->set_func_id(id);
void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
{
- ModelExecution * execution = model->get_execution();
- SnapVector<func_id_list_t> * thrd_func_list = execution->get_thrd_func_list();
- SnapVector< SnapList<action_list_t *> *> *
- thrd_func_act_lists = execution->get_thrd_func_act_lists();
-
uint32_t thread_id = id_to_int(tid);
/* Return if thread tid has not entered any function that contains atomics */
if ( thrd_func_list->size() <= thread_id )
/* Notify FuncNodes that may read from this location */
SnapVector<FuncNode *> * func_node_list = getRdFuncNodes(location);
- for (uint i = 0; i < func_node_list->size(); i++) {
+ 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);
+ // check_waiting_write(act);
}
uint32_t func_id = (*thrd_func_list)[thread_id].back();
if (act->is_read()) {
func_node->update_inst_act_map(tid, act);
- // Update predicate tree position
- Fuzzer * fuzzer = execution->getFuzzer();
+ Fuzzer * fuzzer = model->get_execution()->getFuzzer();
Predicate * selected_branch = fuzzer->get_selected_child_branch(tid);
func_node->set_predicate_tree_position(tid, selected_branch);
}
+
+ if (act->is_write()) {
+ Predicate * curr_pred = func_node->get_predicate_tree_position(tid);
+ FuncInst * curr_inst = func_node->get_inst(act);
+
+ if (curr_pred) {
+ // Follow child
+ curr_pred = curr_pred->get_single_child(curr_inst);
+ }
+ func_node->set_predicate_tree_position(tid, curr_pred);
+ }
}
/* Return the FuncNode given its func_id */
FuncNode * ModelHistory::get_curr_func_node(thread_id_t tid)
{
int thread_id = id_to_int(tid);
- SnapVector<func_id_list_t> * thrd_func_list = model->get_execution()->get_thrd_func_list();
uint32_t func_id = (*thrd_func_list)[thread_id].back();
if (func_id != 0) {
/* Linear search should be fine because presumably not many ConcretePredicates
* are at the same memory location */
- for (uint i = 0; i < concrete_preds->size(); i++) {
+ for (uint i = 0;i < concrete_preds->size();i++) {
ConcretePredicate * current = (*concrete_preds)[i];
if (concrete == current) {
(*concrete_preds)[i] = concrete_preds->back();
SnapVector<struct concrete_pred_expr> * concrete_exprs = concrete_pred->getExpressions();
bool satisfy_predicate = true;
/* Check if the written value satisfies every predicate expression */
- for (uint i = 0; i < concrete_exprs->size(); i++) {
+ for (uint i = 0;i < concrete_exprs->size();i++) {
struct concrete_pred_expr concrete = (*concrete_exprs)[i];
- bool equality;
+ bool equality = false;
switch (concrete.token) {
- case EQUALITY:
- equality = (value == concrete.value);
- break;
- case NULLITY:
- equality = ((void*)value == NULL);
- break;
- default:
- model_print("unknown predicate token");
- break;
+ case EQUALITY:
+ equality = (value == concrete.value);
+ break;
+ case NULLITY:
+ equality = ((void*)value == NULL);
+ break;
+ default:
+ model_print("unknown predicate token");
+ break;
}
if (equality != concrete.equality) {
int old_size = thrd_wait_obj->size();
if (old_size <= thread_id) {
thrd_wait_obj->resize(thread_id + 1);
- for (int i = old_size; i < thread_id + 1; i++) {
+ for (int i = old_size;i < thread_id + 1;i++) {
(*thrd_wait_obj)[i] = new WaitObj( int_to_id(i) );
}
}
}
void ModelHistory::add_waiting_thread(thread_id_t self_id,
- thread_id_t waiting_for_id, FuncNode * target_node, int dist)
+thread_id_t waiting_for_id, FuncNode * target_node, int dist)
{
WaitObj * self_wait_obj = getWaitObj(self_id);
self_wait_obj->add_waiting_for(waiting_for_id, target_node, dist);
}
void ModelHistory::stop_waiting_for_node(thread_id_t self_id,
- thread_id_t waiting_for_id, FuncNode * target_node)
+thread_id_t waiting_for_id, FuncNode * target_node)
{
WaitObj * self_wait_obj = getWaitObj(self_id);
bool thread_removed = self_wait_obj->remove_waiting_for_node(waiting_for_id, target_node);
/* Monitor thread tid and decide whether other threads (that are waiting for tid)
* should keep waiting for this thread or not. Shall only be called when a thread
- * enters a function.
+ * enters a function.
*
* Heuristics: If the distance from the current FuncNode to some target node
- * ever increases, stop waiting for this thread on this target node.
+ * ever increases, stop waiting for this thread on this target node.
*/
void ModelHistory::monitor_waiting_thread(uint32_t func_id, thread_id_t tid)
{
/* Reallocate some snapshotted memories when new executions start */
void ModelHistory::set_new_exec_flag()
{
- for (uint i = 1; i < func_nodes.size(); i++) {
+ for (uint i = 1;i < func_nodes.size();i++) {
FuncNode * func_node = func_nodes[i];
func_node->set_new_exec_flag();
}
void ModelHistory::dump_func_node_graph()
{
model_print("digraph func_node_graph {\n");
- for (uint i = 1; i < func_nodes.size(); i++) {
+ 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()) {
+ for (it = out_edges->begin();it != NULL;it = it->getNext()) {
FuncNode * other = it->getVal();
model_print("\"%p\" -> \"%p\"\n", node, other);
}
void ModelHistory::print_func_node()
{
/* function id starts with 1 */
- for (uint32_t i = 1; i < func_nodes.size(); i++) {
+ for (uint32_t i = 1;i < func_nodes.size();i++) {
FuncNode * func_node = func_nodes[i];
- func_inst_list_mt * entry_insts = func_node->get_entry_insts();
- model_print("function %s has entry actions\n", func_node->get_func_name());
+ func_node->assign_base_score();
+ func_node->print_predicate_tree();
- mllnode<FuncInst*>* it;
- for (it = entry_insts->begin();it != NULL;it=it->getNext()) {
- FuncInst *inst = it->getVal();
- model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
- }
+/*
+ func_inst_list_mt * entry_insts = func_node->get_entry_insts();
+ model_print("function %s has entry actions\n", func_node->get_func_name());
+
+ mllnode<FuncInst*>* it;
+ for (it = entry_insts->begin();it != NULL;it=it->getNext()) {
+ FuncInst *inst = it->getVal();
+ model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
+ }
+ */
}
}
void ModelHistory::print_waiting_threads()
{
ModelExecution * execution = model->get_execution();
- for (unsigned int i = 0; i < execution->get_num_threads();i++) {
+ for (unsigned int i = 0;i < execution->get_num_threads();i++) {
thread_id_t tid = int_to_id(i);
WaitObj * wait_obj = getWaitObj(tid);
wait_obj->print_waiting_for();
}
- for (unsigned int i = 0; i < execution->get_num_threads();i++) {
+ for (unsigned int i = 0;i < execution->get_num_threads();i++) {
thread_id_t tid = int_to_id(i);
WaitObj * wait_obj = getWaitObj(tid);
wait_obj->print_waited_by();
projects / c11tester.git / blobdiff