#include <inttypes.h>
#include "history.h"
#include "action.h"
+#include "funcnode.h"
+#include "common.h"
+
+#include "model.h"
+#include "execution.h"
-HistoryNode::HistoryNode(ModelAction *act) :
- action(act)
-{
- ASSERT(act);
- this->position = act->get_position();
-}
/** @brief Constructor */
ModelHistory::ModelHistory() :
func_counter(0), /* function id starts with 0 */
func_map(),
- func_atomics(),
- work_list(2) /* we have at least two threads */
+ func_map_rev(),
+ func_atomics()
{}
void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
{
-// model_print("entering function: %d\n", func_id);
-
+ //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 ) {
+ thrd_func_list->resize( id + 1 );
+ thrd_func_inst_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);
- 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;
+ thrd_func_list->at(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);
+ func_inst_lists->push_back( new func_inst_list_t() );
}
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 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();
+
+ 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();
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();
} 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("exiting function: %d\n", 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::add_func_atomic(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 )
+ if ( thrd_func_list->size() <= id )
return;
- else if (work_list[id] == NULL)
+ 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 = work_list[id];
+ 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 func_id = func_list->back();
if ( func_atomics.size() <= func_id )
func_atomics.resize( func_id + 1 );
- action_mlist_t * atomic_list = func_atomics[func_id];
- if (atomic_list == NULL) {
- atomic_list = new action_mlist_t();
- func_atomics[func_id] = atomic_list;
+ FuncNode * func_node = func_atomics[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_atomics[func_id] = func_node;
}
- atomic_list->push_back(act);
+ FuncInst * inst = func_node->get_or_add_action(act);
+ if (inst != NULL) {
+ func_inst_list_t * curr_inst_list = func_inst_lists->back();
- model_print("func id: %d, added atomic acts: %d\n", func_id, act->get_type());
+ ASSERT(curr_inst_list != NULL);
+ curr_inst_list->push_back(inst);
+ }
}
-void ModelHistory::print() {
+/* Link FuncInsts in a list - add one FuncInst to another's predecessors and successors */
+void ModelHistory::link_insts(func_inst_list_t * inst_list)
+{
+ if (inst_list == NULL)
+ return;
+
+ func_inst_list_t::iterator it = inst_list->begin();
+ func_inst_list_t::iterator prev = inst_list->end();
+ it++;
+
+ while (it != inst_list->end()) {
+ prev = it;
+ prev--;
+
+ FuncInst * prev_inst = *prev;
+ FuncInst * curr_inst = *it;
+
+ prev_inst->add_succ(curr_inst);
+ curr_inst->add_pred(prev_inst);
+
+ it++;
+ }
+}
+
+void ModelHistory::print()
+{
for (uint32_t i = 0; i < func_atomics.size(); i++ ) {
- action_mlist_t * atomic_list = func_atomics[i];
+ FuncNode * funcNode = func_atomics[i];
+ func_inst_list_mt * inst_list = funcNode->get_inst_list();
- if (atomic_list == NULL)
+ if (funcNode == NULL)
continue;
- model_print("function with id: %d has following actions\n", i);
- action_mlist_t::iterator it;
- for (it = atomic_list->begin(); it != atomic_list->end(); it++) {
- const ModelAction *act = *it;
- act->print();
+ 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());
}
}
}
projects / c11tester.git / blobdiff