From 99cf3d542dfda51e082db5058af0bf178ed9c464 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Fri, 16 Nov 2012 12:02:10 -0800
Subject: [PATCH] model: restructure statistics records

---
 model.cc | 45 ++++++++++++++++++++++++++++++++++-----------
 model.h  | 15 +++++++++++++--
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/model.cc b/model.cc
index 436e4681..a6804b64 100644
--- a/model.cc
+++ b/model.cc
@@ -42,6 +42,7 @@ struct model_snapshot_members {
 	Thread *nextThread;
 	ModelAction *next_backtrack;
 	std::vector< bug_message *, SnapshotAlloc<bug_message *> > bugs;
+	struct execution_stats stats;
 };
 
 /** @brief Constructor */
@@ -49,8 +50,6 @@ ModelChecker::ModelChecker(struct model_params params) :
 	/* Initialize default scheduler */
 	params(params),
 	scheduler(new Scheduler()),
-	num_executions(0),
-	num_feasible_executions(0),
 	diverge(NULL),
 	earliest_diverge(NULL),
 	action_trace(new action_list_t()),
@@ -395,6 +394,33 @@ void ModelChecker::print_bugs() const
 	}
 }
 
+/**
+ * @brief Record end-of-execution stats
+ *
+ * Must be run when exiting an execution. Records various stats.
+ * @see struct execution_stats
+ */
+void ModelChecker::record_stats()
+{
+	stats.num_total++;
+	if (!isfinalfeasible())
+		stats.num_infeasible++;
+	else if (have_bug_reports())
+		stats.num_buggy_executions++;
+	else if (is_complete_execution())
+		stats.num_complete++;
+}
+
+/** @brief Print execution stats */
+void ModelChecker::print_stats() const
+{
+	printf("Number of complete, bug-free executions: %d\n", stats.num_complete);
+	printf("Number of buggy executions: %d\n", stats.num_buggy_executions);
+	printf("Number of infeasible executions: %d\n", stats.num_infeasible);
+	printf("Total executions: %d\n", stats.num_total);
+	printf("Total nodes created: %d\n", node_stack->get_total_nodes());
+}
+
 /**
  * Queries the model-checker for more executions to explore and, if one
  * exists, resets the model-checker state to execute a new execution.
@@ -406,7 +432,7 @@ bool ModelChecker::next_execution()
 {
 	DBG();
 
-	num_executions++;
+	record_stats();
 
 	if (isfinalfeasible() && (is_complete_execution() || have_bug_reports())) {
 		printf("Earliest divergence point since last feasible execution:\n");
@@ -416,15 +442,17 @@ bool ModelChecker::next_execution()
 			printf("(Not set)\n");
 
 		earliest_diverge = NULL;
-		num_feasible_executions++;
 
 		if (is_deadlocked())
 			assert_bug("Deadlock detected");
 
 		print_bugs();
 		checkDataRaces();
+		printf("\n");
+		print_stats();
 		print_summary();
 	} else if (DBG_ENABLED()) {
+		printf("\n");
 		print_summary();
 	}
 
@@ -2255,17 +2283,12 @@ void ModelChecker::dumpGraph(char *filename) {
 
 void ModelChecker::print_summary()
 {
-	printf("\n");
-	printf("Number of executions: %d\n", num_executions);
-	printf("Number of feasible executions: %d\n", num_feasible_executions);
-	printf("Total nodes created: %d\n", node_stack->get_total_nodes());
-
 #if SUPPORT_MOD_ORDER_DUMP
 	scheduler->print();
 	char buffername[100];
-	sprintf(buffername, "exec%04u", num_executions);
+	sprintf(buffername, "exec%04u", stats.num_total);
 	mo_graph->dumpGraphToFile(buffername);
-	sprintf(buffername, "graph%04u", num_executions);
+	sprintf(buffername, "graph%04u", stats.num_total);
 	dumpGraph(buffername);
 #endif
 
diff --git a/model.h b/model.h
index e64597f8..58ee152a 100644
--- a/model.h
+++ b/model.h
@@ -49,6 +49,14 @@ struct model_params {
 	unsigned int expireslop;
 };
 
+/** @brief Model checker execution stats */
+struct execution_stats {
+	int num_total; /**< @brief Total number of executions */
+	int num_infeasible; /**< @brief Number of infeasible executions */
+	int num_buggy_executions; /** @brief Number of buggy executions */
+	int num_complete; /**< @brief Number of feasible, non-buggy, complete executions */
+};
+
 struct PendingFutureValue {
 	ModelAction *writer;
 	ModelAction *act;
@@ -133,8 +141,6 @@ private:
 	bool mo_may_allow(const ModelAction * writer, const ModelAction *reader);
 	bool has_asserted() {return asserted;}
 	void reset_asserted() {asserted=false;}
-	int num_executions;
-	int num_feasible_executions;
 	bool promises_expired() const;
 	void execute_sleep_set();
 	void wake_up_sleeping_actions(ModelAction * curr);
@@ -238,6 +244,11 @@ private:
 	/** @brief Incorrectly-ordered synchronization was made */
 	bool bad_synchronization;
 
+	/** @brief The cumulative execution stats */
+	struct execution_stats stats;
+	void record_stats();
+	void print_stats() const;
+
 	bool have_bug_reports() const;
 	void print_bugs() const;
 };
-- 
2.34.1