X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=history.cc;h=deaab0be37bae9818dd053db4055bb0de5ba0bfd;hp=ec90a5a4826a06d42a7cb3cff1599ec621a99c25;hb=755d1463d1871b4d075b59b5c9e17c409e12db9a;hpb=0c8b810bcf730dcf184c0b35eef074f89a40fac3

diff --git a/history.cc b/history.cc
index ec90a5a4..deaab0be 100644
--- a/history.cc
+++ b/history.cc
@@ -2,81 +2,206 @@
 #include "history.h"
 #include "action.h"
 #include "funcnode.h"
+#include "common.h"
+
+#include "model.h"
+#include "execution.h"
+
 
 /** @brief Constructor */
 ModelHistory::ModelHistory() :
-	func_counter(0), /* function id starts with 0 */
+	func_counter(1),	/* function id starts with 1 */
 	func_map(),
-	func_atomics(),
-	work_list(2)	/* we have at least two threads */
+	func_map_rev(),
+	func_nodes(),
+	write_history(),
+	write_locations()
 {}
 
 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);
-	if ( work_list.size() <= id )
-		work_list.resize( id + 1 );
+	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();
+
+	if ( thrd_func_list->size() <= id ) {
+		uint oldsize = thrd_func_list->size();
+		thrd_func_list->resize( id + 1 );
+		for (uint i = oldsize; i < id + 1; i++) {
+			// push 0 as a dummy function id to a void seg fault
+			(*thrd_func_list)[i].push_back(0);
+		}
+
+		thrd_func_inst_lists->resize( id + 1 );
+	}
+
+	SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
 
-	func_id_list_t * func_list = work_list[id];
-	if (func_list == NULL) {
-		func_list = new func_id_list_t();
-		work_list[id] = func_list;
+	if (func_inst_lists == NULL) {
+		func_inst_lists = new SnapList< func_inst_list_t *>();
+		thrd_func_inst_lists->at(id) = func_inst_lists;
 	}
 
-	func_list->push_back(func_id);
+	(*thrd_func_list)[id].push_back(func_id);
+	func_inst_lists->push_back( new func_inst_list_t() );
+
+	if ( func_nodes.size() <= func_id )
+		resize_func_nodes( func_id + 1 );
 }
 
+/* @param func_id a non-zero value */
 void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
 {
-	func_id_list_t * func_list = work_list[ id_to_int(tid) ];
-	uint32_t last_func_id = func_list->back();
+	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();
+
+	SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
+	uint32_t last_func_id = (*thrd_func_list)[id].back();
 
 	if (last_func_id == func_id) {
-		func_list->pop_back();
+		FuncNode * func_node = func_nodes[func_id];
+		func_node->clear_read_map(tid);
+
+		func_inst_list_t * curr_inst_list = func_inst_lists->back();
+		func_node->link_insts(curr_inst_list);
+
+		(*thrd_func_list)[id].pop_back();
+		func_inst_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);
 	}
+	//model_print("thread %d exiting func %d\n", tid, func_id);
 }
 
-void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid) {
+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();
+		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
 	   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();
+
 	uint32_t id = id_to_int(tid);
-	if ( work_list.size() <= id )
-		return;
-	else if (work_list[id] == NULL)
+	if ( thrd_func_list->size() <= id )
 		return;
 
 	/* get the function id that thread i is currently in */
-	func_id_list_t * func_list = work_list[id];
-	uint32_t func_id = func_list->back();
+	uint32_t func_id = (*thrd_func_list)[id].back();
+	SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
+
+	if (func_id == 0)
+		return;
+	else if ( func_nodes.size() <= func_id )
+		resize_func_nodes( func_id + 1 );
+
+	FuncNode * func_node = func_nodes[func_id];
+	ASSERT (func_node != NULL);
 
-	if ( func_atomics.size() <= func_id )
-		func_atomics.resize( func_id + 1 );
+	/* add corresponding FuncInst to func_node */
+	FuncInst * inst = func_node->get_or_add_action(act);
 
-	FuncNode * func_node = func_atomics[func_id];
-	if (func_node == NULL) {
-		func_node = new FuncNode();
-		func_atomics[func_id] = func_node;
+	if (inst == NULL)
+		return;
+
+	if (inst->is_read())
+		func_node->store_read(act, tid);
+
+	if (inst->is_write())
+		add_to_write_history(act->get_location(), act->get_write_value());
+
+	/* add to curr_inst_list */
+	func_inst_list_t * curr_inst_list = func_inst_lists->back();
+	ASSERT(curr_inst_list != NULL);
+	curr_inst_list->push_back(inst);
+}
+
+/* return the FuncNode given its func_id  */
+FuncNode * ModelHistory::get_func_node(uint32_t func_id)
+{
+	if (func_nodes.size() <= func_id)	// this node has not been added
+		return NULL;
+
+	return func_nodes[func_id];
+}
+
+uint64_t ModelHistory::query_last_read(void * location, thread_id_t tid)
+{
+	SnapVector<func_id_list_t> * thrd_func_list = model->get_execution()->get_thrd_func_list();
+	uint32_t id = id_to_int(tid);
+
+	ASSERT( thrd_func_list->size() > id );
+	uint32_t func_id = (*thrd_func_list)[id].back();
+	FuncNode * func_node = func_nodes[func_id];
+
+	uint64_t last_read_val = 0xdeadbeef;
+	if (func_node != NULL) {
+		last_read_val = func_node->query_last_read(location, tid);
+	}
+
+	return last_read_val;
+}
+
+void ModelHistory::add_to_write_history(void * location, uint64_t write_val)
+{
+	write_set_t * write_set = write_history.get(location);
+
+	if (write_set == NULL) {
+		write_set = new write_set_t();
+		write_history.put(location, write_set);
 	}
 
-	func_node->add_action(act);
+	write_set->add(write_val);
+	write_locations.add(location);
+}
+
+void ModelHistory::print_write()
+{
 }
 
-void ModelHistory::print() {
-	for (uint32_t i = 0; i < func_atomics.size(); i++ ) {
-		FuncNode * funcNode = func_atomics[i];
-		func_inst_list_t * inst_list = funcNode->get_inst_list();
+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];
 
-		if (funcNode == NULL)
-			continue;
+		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 with id: %d has following actions\n", i);
-		func_inst_list_t::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());
 		}
+/*
+                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());
+                }
+*/
 	}
 }