/** @brief Constructor */
ModelHistory::ModelHistory() :
func_counter(1), /* function id starts with 1 */
+ last_seq_number(INIT_SEQ_NUMBER),
func_map(),
func_map_rev(),
func_nodes()
{
/* The following are snapshot data structures */
- write_history = new HashTable<void *, value_set_t *, uintptr_t, 4>();
+ write_history = new HashTable<void *, value_set_t *, 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_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);
-
- (*thrd_func_act_lists)[i] = new SnapList<action_list_t *>();
thrd_last_entered_func->push_back(0);
}
}
- 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);
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);
+ func_node->function_entry_handler(tid);
/* Add edges between FuncNodes */
if (last_entered_func_id != 0) {
last_func_node->add_out_edge(func_node);
}
- monitor_waiting_thread(func_id, tid);
+ /* Monitor the statuses of threads waiting for tid */
+ // monitor_waiting_thread(func_id, tid);
}
/* @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();
if (last_func_id == func_id) {
FuncNode * func_node = func_nodes[func_id];
- func_node->set_predicate_tree_position(tid, NULL);
- func_node->reset_inst_act_map(tid);
-
- 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
- * (currently twice) so that more information can be gathered to infer nullity predicates.
- */
- func_node->incr_exit_count();
- if (func_node->get_exit_count() >= 2) {
- 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();
- func_node->update_tree(act_list);
- }
-
- func_node->update_tree(curr_act_list);
- } else
- func_node->get_action_list_buffer()->push_front(curr_act_list);
+ func_node->function_exit_handler(tid);
(*thrd_func_list)[id].pop_back();
- func_act_lists->pop_back();
} else {
- model_print("trying to exit with a wrong function id\n");
- model_print("--- last_func: %d, func_id: %d\n", last_func_id, func_id);
+ ASSERT(false);
}
//model_print("thread %d exiting func %d\n", tid, func_id);
}
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();
- /* 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 *> *> *
- thrd_func_act_lists = execution->get_thrd_func_act_lists();
-
- uint32_t id = id_to_int(tid);
- if ( thrd_func_list->size() <= id )
+ 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 )
return;
- /* 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];
+ /* Monitor the statuses of threads waiting for tid */
+ // monitor_waiting_thread_counter(tid);
+ /* Every write action should be processed, including
+ * nonatomic writes (which have no position) */
if (act->is_write()) {
void * location = act->get_location();
uint64_t value = act->get_write_value();
/* 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);
}
- /* The following does not care about actions without a position */
+ uint32_t func_id = (*thrd_func_list)[thread_id].back();
+
+ /* The following does not care about actions that are not inside
+ * any function that contains atomics or actions without a position */
if (func_id == 0 || act->get_position() == NULL)
return;
- action_list_t * curr_act_list = func_act_lists->back();
- ASSERT(curr_act_list != NULL);
-
- if (skip_action(act, curr_act_list))
+ if (skip_action(act))
return;
FuncNode * func_node = func_nodes[func_id];
-
- /* Add to curr_inst_list */
- curr_act_list->push_back(act);
func_node->add_inst(act);
- if (act->is_read()) {
- func_node->update_inst_act_map(tid, act);
-
- // Update predicate tree position
- Fuzzer * fuzzer = execution->getFuzzer();
- Predicate * selected_branch = fuzzer->get_selected_child_branch(tid);
- func_node->set_predicate_tree_position(tid, selected_branch);
- }
+ func_node->update_tree(act);
+ last_seq_number = act->get_seq_number();
}
/* 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();
void * location = write_act->get_location();
uint64_t value = write_act->get_write_value();
SnapVector<ConcretePredicate *> * concrete_preds = loc_waiting_writes_map->get(location);
- SnapVector<ConcretePredicate *> to_remove = SnapVector<ConcretePredicate *>();
if (concrete_preds == NULL)
return;
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) {
}
if (satisfy_predicate) {
- to_remove.push_back(concrete_pred);
+ /* Wake up threads */
+ thread_id_t tid = concrete_pred->get_tid();
+ Thread * thread = model->get_thread(tid);
+
+ //model_print("** thread %d is woken up\n", thread->get_id());
+ ((NewFuzzer *)model->get_execution()->getFuzzer())->notify_paused_thread(thread);
}
index++;
}
-
- for (uint i = 0; i < to_remove.size(); i++) {
- ConcretePredicate * concrete_pred = to_remove[i];
-
- /* Wake up threads */
- thread_id_t tid = concrete_pred->get_tid();
- 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);
- }
}
WaitObj * ModelHistory::getWaitObj(thread_id_t tid)
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);
}
self_wait_obj->clear_waiting_for();
+ delete iter;
}
-void ModelHistory::stop_waiting_for(thread_id_t self_id,
- thread_id_t waiting_for_id, FuncNode * target_node)
+void ModelHistory::stop_waiting_for_node(thread_id_t self_id,
+ 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(waiting_for_id, target_node);
+ bool thread_removed = self_wait_obj->remove_waiting_for_node(waiting_for_id, target_node);
// model_print("\t%d gives up %d on node %d\n", self_id, waiting_for_id, target_node->get_func_id());
// 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);
}
}
}
-SnapVector<inst_act_map_t *> * ModelHistory::getThrdInstActMap(uint32_t func_id)
-{
- ASSERT(func_id != 0);
-
- SnapVector<inst_act_map_t *> * maps = func_inst_act_maps->get(func_id);
- if (maps == NULL) {
- maps = new SnapVector<inst_act_map_t *>();
- func_inst_act_maps->put(func_id, maps);
- }
-
- return maps;
-}
-
-bool ModelHistory::skip_action(ModelAction * act, SnapList<ModelAction *> * curr_act_list)
+bool ModelHistory::skip_action(ModelAction * act)
{
bool second_part_of_rmw = act->is_rmwc() || act->is_rmw();
modelclock_t curr_seq_number = act->get_seq_number();
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;
- }
+ if (last_seq_number != INIT_SEQ_NUMBER && last_seq_number == curr_seq_number)
+ return true;
/* Skip actions that are paused by fuzzer (sequence number is 0) */
if (curr_seq_number == 0)
/* 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)
{
int new_dist = curr_node->compute_distance(target, old_dist);
if (new_dist == -1) {
- stop_waiting_for(waited_by_id, tid, target);
+ 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)
+{
+ WaitObj * wait_obj = getWaitObj(tid);
+ thrd_id_set_t * waited_by = wait_obj->getWaitedBy();
+
+ // Thread tid has taken an action, update the counter for threads waiting for tid
+ thrd_id_set_iter * tid_iter = waited_by->iterator();
+ while (tid_iter->hasNext()) {
+ thread_id_t waited_by_id = tid_iter->next();
+ WaitObj * other_wait_obj = getWaitObj(waited_by_id);
+
+ bool expire = other_wait_obj->incr_counter(tid);
+ if (expire) {
+// model_print("thread %d stops waiting for thread %d\n", waited_by_id, tid);
+ wait_obj->remove_waited_by(waited_by_id);
+ other_wait_obj->remove_waiting_for(tid);
+
+ thrd_id_set_t * other_waiting_for = other_wait_obj->getWaitingFor();
+ if ( other_waiting_for->isEmpty() ) {
+ // 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);
+ ((NewFuzzer *)execution->getFuzzer())->notify_paused_thread(thread);
}
}
}
+
+ delete tid_iter;
}
/* 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_node->print_predicate_tree();
- 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_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());
- }
+ 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