X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=48fa28acb71cf1b8d49112df717d2ac460dc2e9b;hb=f9fe0087091f88deeb814d0768eecdfb1b51a94d;hp=55949730f5c2a00428618dd8cfbe8bf65c96747f;hpb=a22d12cff31e5309eb0033324d3dd0258de53cb5;p=model-checker.git

diff --git a/model.cc b/model.cc
index 5594973..48fa28a 100644
--- a/model.cc
+++ b/model.cc
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <algorithm>
-#include <mutex>
 #include <new>
 #include <stdarg.h>
 
@@ -30,7 +29,7 @@ ModelChecker::ModelChecker(struct model_params params) :
 	execution(new ModelExecution(&params, scheduler, node_stack)),
 	diverge(NULL),
 	earliest_diverge(NULL),
-	trace_analyses(new ModelVector<TraceAnalysis *>())
+	trace_analyses()
 {
 }
 
@@ -38,9 +37,8 @@ ModelChecker::ModelChecker(struct model_params params) :
 ModelChecker::~ModelChecker()
 {
 	delete node_stack;
-	for (unsigned int i = 0; i < trace_analyses->size(); i++)
-		delete (*trace_analyses)[i];
-	delete trace_analyses;
+	for (unsigned int i = 0; i < trace_analyses.size(); i++)
+		delete trace_analyses[i];
 	delete scheduler;
 }
 
@@ -328,8 +326,8 @@ bool ModelChecker::next_execution()
 
 /** @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(execution->get_action_trace());
+	for (unsigned int i = 0; i < trace_analyses.size(); i++)
+		trace_analyses[i]->analyze(execution->get_action_trace());
 }
 
 /**
@@ -436,7 +434,7 @@ void ModelChecker::run()
 {
 	do {
 		thrd_t user_thread;
-		Thread *t = new Thread(&user_thread, &user_main_wrapper, NULL, NULL);
+		Thread *t = new Thread(execution->get_next_id(), &user_thread, &user_main_wrapper, NULL, NULL);
 		execution->add_thread(t);
 
 		do {