func_node->update_inst_act_map(tid, act);
Fuzzer * fuzzer = model->get_execution()->getFuzzer();
- Predicate * selected_branch = fuzzer->get_selected_child_branch(tid);
+ Predicate * selected_branch = ((NewFuzzer *)fuzzer)->get_selected_child_branch(tid);
func_node->set_predicate_tree_position(tid, selected_branch);
}
if (curr_pred) {
// Follow child
- curr_pred = curr_pred->get_single_child(curr_inst);
+ curr_pred = curr_pred->follow_write_child(curr_inst);
}
func_node->set_predicate_tree_position(tid, curr_pred);
}
Thread * thread = model->get_thread(tid);
//model_print("** thread %d is woken up\n", thread->get_id());
- model->get_execution()->getFuzzer()->notify_paused_thread(thread);
+ ((NewFuzzer *)model->get_execution()->getFuzzer())->notify_paused_thread(thread);
}
index++;
}
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);
}
self_wait_obj->clear_waiting_for();
+ delete iter;
}
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);
// model_print("\tthread %d waits for nobody, wake up\n", self_id);
ModelExecution * execution = model->get_execution();
Thread * thread = execution->get_thread(self_id);
- execution->getFuzzer()->notify_paused_thread(thread);
+ ((NewFuzzer *)execution->getFuzzer())->notify_paused_thread(thread);
}
}
}
stop_waiting_for_node(waited_by_id, tid, target);
}
}
+
+ delete node_iter;
}
+
+ delete tid_iter;
}
void ModelHistory::monitor_waiting_thread_counter(thread_id_t tid)
// model_print("\tthread %d waits for nobody, wake up\n", self_id);
ModelExecution * execution = model->get_execution();
Thread * thread = execution->get_thread(waited_by_id);
- execution->getFuzzer()->notify_paused_thread(thread);
+ ((NewFuzzer *)execution->getFuzzer())->notify_paused_thread(thread);
}
}
}
+
+ delete tid_iter;
}
/* Reallocate some snapshotted memories when new executions start */
/* function id starts with 1 */
for (uint32_t i = 1;i < func_nodes.size();i++) {
FuncNode * func_node = func_nodes[i];
-
- func_node->assign_base_score();
func_node->print_predicate_tree();
/*