X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=history.cc;h=c3e7eeb0133a594aba5908d9434b1808154ec750;hp=d3e36c6a37b7aaac6dd1ed02c98278b1b70020d6;hb=0acd7ac85bd6004e53e1283a2900ffef7debeed8;hpb=9270d9d61d990f6b73cc2e6657aa19d36b0ea1e5

diff --git a/history.cc b/history.cc
index d3e36c6a..c3e7eeb0 100644
--- a/history.cc
+++ b/history.cc
@@ -2,70 +2,113 @@
 #include "history.h"
 #include "action.h"
 #include "funcnode.h"
+#include "funcinst.h"
 #include "common.h"
+#include "concretepredicate.h"
 
 #include "model.h"
 #include "execution.h"
-
+#include "newfuzzer.h"
 
 /** @brief Constructor */
 ModelHistory::ModelHistory() :
-	func_counter(1), /* function id starts with 1 */
+	func_counter(1),	/* function id starts with 1 */
 	func_map(),
 	func_map_rev(),
 	func_nodes()
-{}
+{
+	/* The following are snapshot data structures */
+	write_history = new HashTable<void *, value_set_t *, uintptr_t, 4>();
+	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>(128);
+}
 
 void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
 {
 	//model_print("thread %d entering func %d\n", tid, func_id);
-	uint32_t id = id_to_int(tid);
-	SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
-	SnapVector< SnapList<func_inst_list_t *> *> *
-			thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+	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_inst_lists->resize( id + 1 );
-	}
+		thrd_func_act_lists->resize( id + 1 );
 
-	func_id_list_t * func_list = thrd_func_list->at(id);
-	SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
+		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);
 
-	if (func_list == NULL) {
-		func_list = new func_id_list_t();
-		thrd_func_list->at(id) = func_list;
+			(*thrd_func_act_lists)[i] = new SnapList<action_list_t *>();
+			thrd_last_entered_func->push_back(0);
+		}
 	}
 
-	if (func_inst_lists == NULL) {
-		func_inst_lists = new SnapList< func_inst_list_t *>();
-		thrd_func_inst_lists->at(id) = func_inst_lists;
-	}
+	SnapList<action_list_t *> * func_act_lists = (*thrd_func_act_lists)[id];
+	func_act_lists->push_back( new action_list_t() );
 
-	func_list->push_back(func_id);
-	func_inst_lists->push_back( new func_inst_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);
+
+	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 */
 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 = model->get_execution()->get_thrd_func_list();
-	SnapVector< SnapList<func_inst_list_t *> *> *
-			thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+	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();
 
-	func_id_list_t * func_list = thrd_func_list->at(id);
-	SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
-
-	uint32_t last_func_id = func_list->back();
+	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) {
-		func_list->pop_back();
-
-		func_inst_list_t * curr_inst_list = func_inst_lists->back();
-		link_insts(curr_inst_list);
-
-		func_inst_lists->pop_back();
+		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);
+
+		(*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);
@@ -73,110 +116,325 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
 	//model_print("thread %d exiting func %d\n", tid, func_id);
 }
 
+void ModelHistory::resize_func_nodes(uint32_t new_size)
+{
+	uint32_t old_size = func_nodes.size();
+
+	if ( old_size < new_size )
+		func_nodes.resize(new_size);
+
+	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);
+		func_node->set_func_name(func_name);
+		func_nodes[id] = func_node;
+	}
+}
+
 void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
 {
-	/* return if thread i has not entered any function or has exited
+	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 = model->get_execution()->get_thrd_func_list();
-	SnapVector< SnapList<func_inst_list_t *> *> *
-			thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
+	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 )
 		return;
-	else if (thrd_func_list->at(id) == NULL)
-		return;
 
-	/* get the function id that thread i is currently in */
-	func_id_list_t * func_list = thrd_func_list->at(id);
-	SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
+	/* 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];
 
-	uint32_t func_id = func_list->back();
+	if (act->is_write()) {
+		void * location = act->get_location();
+		uint64_t value = act->get_write_value();
+		update_write_history(location, value);
 
-	if ( func_nodes.size() <= func_id )
-		func_nodes.resize( func_id + 1 );
+		/* Update FuncNodes that may read from this 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 */
+	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))
+		return;
 
 	FuncNode * func_node = func_nodes[func_id];
-	if (func_node == NULL) {
-		const char * func_name = func_map_rev[func_id];
-		func_node = new FuncNode();
-		func_node->set_func_id(func_id);
-		func_node->set_func_name(func_name);
 
-		func_nodes[func_id] = func_node;
+	/* 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);
 	}
+}
 
-	/* add corresponding FuncInst to func_node and curr_inst_list*/
-	FuncInst * inst = func_node->get_or_add_action(act);
+/* Return the FuncNode given its func_id  */
+FuncNode * ModelHistory::get_func_node(uint32_t func_id)
+{
+	if (func_id == 0)
+		return NULL;
 
-	if (inst == NULL)
-		return;
+	// This node has not been added to func_nodes
+	if (func_nodes.size() <= func_id)
+		return NULL;
 
-	if (inst->is_read())
-		func_node->store_read(act, tid);
+	return func_nodes[func_id];
+}
+
+/* Return the current FuncNode when given a thread 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();
 
-	func_inst_list_t * curr_inst_list = func_inst_lists->back();
-	ASSERT(curr_inst_list != NULL);
-	curr_inst_list->push_back(inst);
+	if (func_id != 0) {
+		return func_nodes[func_id];
+	}
+
+	return NULL;
 }
 
-/* Link FuncInsts in a list - add one FuncInst to another's predecessors and successors */
-void ModelHistory::link_insts(func_inst_list_t * inst_list)
+void ModelHistory::update_write_history(void * location, uint64_t write_val)
 {
-	if (inst_list == NULL)
-		return;
+	value_set_t * write_set = write_history->get(location);
+
+	if (write_set == NULL) {
+		write_set = new value_set_t();
+		write_history->put(location, write_set);
+	}
+
+	write_set->add(write_val);
+}
+
+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)
+{
+	SnapVector<FuncNode *> * func_node_list = loc_rd_func_nodes_map->get(location);
+	if (func_node_list == NULL) {
+		func_node_list = new SnapVector<FuncNode *>();
+		loc_rd_func_nodes_map->put(location, func_node_list);
+	}
+
+	return func_node_list;
+}
+
+SnapVector<FuncNode *> * ModelHistory::getWrFuncNodes(void * location)
+{
+	SnapVector<FuncNode *> * func_node_list = loc_wr_func_nodes_map->get(location);
+	if (func_node_list == NULL) {
+		func_node_list = new SnapVector<FuncNode *>();
+		loc_wr_func_nodes_map->put(location, func_node_list);
+	}
+
+	return func_node_list;
+}
+
+/* When a thread is paused by Fuzzer, keep track of the condition it is waiting for */
+void ModelHistory::add_waiting_write(ConcretePredicate * concrete)
+{
+	void * location = concrete->get_location();
+	SnapVector<ConcretePredicate *> * waiting_conditions = loc_waiting_writes_map->get(location);
+	if (waiting_conditions == NULL) {
+		waiting_conditions = new SnapVector<ConcretePredicate *>();
+		loc_waiting_writes_map->put(location, waiting_conditions);
+	}
 
-	func_inst_list_t::iterator it = inst_list->begin();
-	func_inst_list_t::iterator prev;
+	/* waiting_conditions should not have duplications */
+	waiting_conditions->push_back(concrete);
 
-	if (inst_list->size() == 0)
+	int thread_id = id_to_int(concrete->get_tid());
+	if (thrd_waiting_write->size() <= (uint) thread_id) {
+		thrd_waiting_write->resize(thread_id + 1);
+	}
+
+	(*thrd_waiting_write)[thread_id] = concrete;
+}
+
+void ModelHistory::remove_waiting_write(thread_id_t tid)
+{
+	ConcretePredicate * concrete = (*thrd_waiting_write)[ id_to_int(tid) ];
+	void * location = concrete->get_location();
+	SnapVector<ConcretePredicate *> * concrete_preds = loc_waiting_writes_map->get(location);
+
+	for (uint i = 0; i < concrete_preds->size(); i++) {
+		ConcretePredicate * current = (*concrete_preds)[i];
+		if (concrete == current) {
+			(*concrete_preds)[i] = concrete_preds->back();
+			concrete_preds->pop_back();
+			break;
+		}
+	}
+
+	int thread_id = id_to_int( concrete->get_tid() );
+	(*thrd_waiting_write)[thread_id] = NULL;
+	delete concrete;
+}
+
+/* Check if any other thread is waiting for this write action. If so, "notify" them */
+void ModelHistory::check_waiting_write(ModelAction * write_act)
+{
+	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;
 
-	/* add the first instruction to the list of entry insts */
-	FuncInst * entry_inst = *it;
-	FuncNode * func_node = entry_inst->get_func_node();
-	func_node->add_entry_inst(entry_inst);
+	uint index = 0;
+	while (index < concrete_preds->size()) {
+		ConcretePredicate * concrete_pred = (*concrete_preds)[index];
+		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++) {
+			struct concrete_pred_expr concrete = (*concrete_exprs)[i];
+			bool equality;
+			switch (concrete.token) {
+				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) {
+				satisfy_predicate = false;
+				break;
+			}
+		}
 
-	it++;
-	while (it != inst_list->end()) {
-		prev = it;
-		prev--;
+		if (satisfy_predicate) {
+			to_remove.push_back(concrete_pred);
+		}
 
-		FuncInst * prev_inst = *prev;
-		FuncInst * curr_inst = *it;
+		index++;
+	}
+
+	for (uint i = 0; i < to_remove.size(); i++) {
+		ConcretePredicate * concrete_pred = to_remove[i];
 
-		prev_inst->add_succ(curr_inst);
-		curr_inst->add_pred(prev_inst);
+		/* Wake up threads */
+		thread_id_t tid = concrete_pred->get_tid();
+		Thread * thread = model->get_thread(tid);
 
-		it++;
+		model_print("** thread %d is woken up\n", thread->get_id());
+		model->get_execution()->getFuzzer()->notify_paused_thread(thread);
 	}
 }
 
-void ModelHistory::print()
+SnapVector<inst_act_map_t *> * ModelHistory::getThrdInstActMap(uint32_t func_id)
 {
-	for (uint32_t i = 0; i < func_nodes.size(); i++ ) {
-		FuncNode * funcNode = func_nodes[i];
-		if (funcNode == NULL)
-			continue;
+	ASSERT(func_id != 0);
 
-		func_inst_list_mt * entry_insts = funcNode->get_entry_insts();
+	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);
+	}
 
-		model_print("function %s has entry actions\n", funcNode->get_func_name());
-		func_inst_list_mt::iterator it;
-		for (it = entry_insts->begin(); it != entry_insts->end(); it++) {
-			FuncInst *inst = *it;
-			model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
+	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()
+{
+	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++) {
+		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()
+{
+	/* function id starts with 1 */
+	for (uint32_t i = 1; i < func_nodes.size(); i++) {
+		FuncNode * func_node = func_nodes[i];
 
-/*
-		func_inst_list_mt * inst_list = funcNode->get_inst_list();
+		func_inst_list_mt * entry_insts = func_node->get_entry_insts();
+		model_print("function %s has entry actions\n", func_node->get_func_name());
 
-		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;
+		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());
 		}
-*/
 	}
 }