From a726f5f6e1e0731a0516be1e9e23397744734ef5 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Mon, 15 Apr 2013 19:55:37 -0700
Subject: [PATCH] model: embed the trace_analyses in the class
---
model.cc | 11 +++++------
model.h | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/model.cc b/model.cc
index 03d7ba33..8d5bc0fa 100644
--- a/model.cc
+++ b/model.cc
@@ -30,7 +30,7 @@ ModelChecker::ModelChecker(struct model_params params) :
execution(new ModelExecution(¶ms, scheduler, node_stack)),
diverge(NULL),
earliest_diverge(NULL),
- trace_analyses(new ModelVector<TraceAnalysis *>())
+ trace_analyses()
{
}
@@ -38,9 +38,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 +327,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());
}
/**
diff --git a/model.h b/model.h
index cfc65286..7d84f601 100644
--- a/model.h
+++ b/model.h
@@ -69,7 +69,7 @@ public:
const model_params params;
void add_trace_analysis(TraceAnalysis *a) {
- trace_analyses->push_back(a);
+ trace_analyses.push_back(a);
}
action_list_t * get_actions_on_obj(void * obj, thread_id_t tid);
@@ -96,7 +96,7 @@ private:
ucontext_t system_context;
- ModelVector<TraceAnalysis *> * trace_analyses;
+ ModelVector<TraceAnalysis *> trace_analyses;
/** @brief The cumulative execution stats */
struct execution_stats stats;
--
2.34.1