X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=23efa8f77566d10752f5d4f7e8c6c70f73aff55d;hb=9508fe09d2eeaaf7fbe7193d9cb81b3bc66316b5;hp=5941cf27f5f0d89523fe8a27a6581eb3184d7203;hpb=4fa31aac91303266f4c87a6cd5d60cbab34135db;p=model-checker.git

diff --git a/model.cc b/model.cc
index 5941cf2..23efa8f 100644
--- a/model.cc
+++ b/model.cc
@@ -16,6 +16,7 @@
 #include "datarace.h"
 #include "threads-model.h"
 #include "output.h"
+#include "traceanalysis.h"
 
 #define INITIAL_THREAD_ID	0
 
@@ -92,6 +93,7 @@ ModelChecker::ModelChecker(struct model_params params) :
 	thrd_last_action(new SnapVector<ModelAction *>(1)),
 	thrd_last_fence_release(new SnapVector<ModelAction *>()),
 	node_stack(new NodeStack()),
+	trace_analyses(new ModelVector<Trace_Analysis *>()),
 	priv(new struct model_snapshot_members()),
 	mo_graph(new CycleGraph())
 {
@@ -121,6 +123,9 @@ ModelChecker::~ModelChecker()
 	delete thrd_last_action;
 	delete thrd_last_fence_release;
 	delete node_stack;
+	for (unsigned int i = 0; i <trace_analyses->size();i++)
+		delete (*trace_analyses)[i];
+	delete trace_analyses;
 	delete scheduler;
 	delete mo_graph;
 	delete priv;
@@ -146,6 +151,18 @@ static SnapVector<action_list_t> * get_safe_ptr_vect_action(HashTable<void *, Sn
 	return tmp;
 }
 
+action_list_t * ModelChecker::get_actions_on_obj(void * obj, thread_id_t tid) {
+	SnapVector<action_list_t> *wrv=obj_thrd_map->get(obj);
+	if (wrv==NULL)
+		return NULL;
+	unsigned int thread=id_to_int(tid);
+	if (thread < wrv->size())
+		return &(*wrv)[thread];
+	else
+		return NULL;
+}
+
+
 /**
  * Restores user program to initial state and resets all model-checker data
  * structures.
@@ -553,6 +570,7 @@ bool ModelChecker::next_execution()
 			assert_bug("Deadlock detected");
 
 		checkDataRaces();
+		run_trace_analyses();
 	}
 
 	record_stats();
@@ -578,6 +596,15 @@ bool ModelChecker::next_execution()
 	return true;
 }
 
+/**
+ * @brief Run trace analyses on complete trace. */
+
+void ModelChecker::run_trace_analyses() {
+	for(unsigned int i=0; i < trace_analyses->size(); i++) {
+		(*trace_analyses)[i]->analyze(action_trace);
+	}
+}
+
 /**
  * @brief Find the last fence-related backtracking conflict for a ModelAction
  *