From 2b2d9092eea1f50b468e459029dcfdd88e2232da Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@gmail.com>
Date: Tue, 21 Sep 2010 21:51:25 +0000
Subject: [PATCH] fix statistics-registry-related memory leaks

---
 src/main/main.cpp |  9 +++++----
 src/prop/sat.h    | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/main.cpp b/src/main/main.cpp
index 235ebb354..a6fe10888 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -188,8 +188,6 @@ int runCvc4(int argc, char* argv[]) {
   }
 
   Result asSatResult = lastResult.asSatisfiabilityResult();
-  
-
   int returnValue;
 
   switch(asSatResult.isSAT()) {
@@ -216,15 +214,18 @@ int runCvc4(int argc, char* argv[]) {
 
   // Remove the parser
   delete parser;
-ReferenceStat< Result > s_statSatResult("sat/unsat", asSatResult);
+
+  ReferenceStat< Result > s_statSatResult("sat/unsat", asSatResult);
   StatisticsRegistry::registerStat(&s_statSatResult);
 
   if(options.statistics){
     StatisticsRegistry::flushStatistics(cerr);
   }
 
-  return returnValue;
+  StatisticsRegistry::unregisterStat(&s_statSatResult);
+  StatisticsRegistry::unregisterStat(&s_statFilename);
 
+  return returnValue;
 }
 
 void doCommand(SmtEngine& smt, Command* cmd) {
diff --git a/src/prop/sat.h b/src/prop/sat.h
index 7229b3565..63c17f513 100644
--- a/src/prop/sat.h
+++ b/src/prop/sat.h
@@ -126,7 +126,7 @@ class SatSolver : public SatInputInterface {
 
   /** Remember the options */
   Options* d_options;
-  
+
   /* Pointer to the concrete SAT solver. Including this via the
      preprocessor saves us a level of indirection vs, e.g., defining a
      sub-class for each solver. */
@@ -165,6 +165,17 @@ class SatSolver : public SatInputInterface {
       StatisticsRegistry::registerStat(&d_statMaxLiterals);
       StatisticsRegistry::registerStat(&d_statTotLiterals);
     }
+    ~Statistics() {
+      StatisticsRegistry::unregisterStat(&d_statStarts);
+      StatisticsRegistry::unregisterStat(&d_statDecisions);
+      StatisticsRegistry::unregisterStat(&d_statRndDecisions);
+      StatisticsRegistry::unregisterStat(&d_statPropagations);
+      StatisticsRegistry::unregisterStat(&d_statConflicts);
+      StatisticsRegistry::unregisterStat(&d_statClausesLiterals);
+      StatisticsRegistry::unregisterStat(&d_statLearntsLiterals);
+      StatisticsRegistry::unregisterStat(&d_statMaxLiterals);
+      StatisticsRegistry::unregisterStat(&d_statTotLiterals);
+    }
     void init(Minisat::SimpSolver* d_minisat){
       d_statStarts.setData(d_minisat->starts);
       d_statDecisions.setData(d_minisat->decisions);
-- 
2.30.2