Get rid of the Statistics and Statreset ParamContexts, and

expose all of the relevant functionality to python.  Clean
up the mysql code while we're at it.

--HG--
extra : convert_revision : 5b711202a5a452b8875ebefb136a156b65c24279

5 files changed, 35 insertions, 137 deletions

diff --git a/src/sim/main.cc b/src/sim/main.cc
index 13850f255..45819f880 100644
--- a/src/sim/main.cc
+++ b/src/sim/main.cc
@@ -53,6 +53,7 @@
 #include "base/output.hh"
 #include "base/pollevent.hh"
 #include "base/statistics.hh"
+#include "base/stats/output.hh"
 #include "base/str.hh"
 #include "base/time.hh"
 #include "config/pythonhome.hh"
@@ -220,7 +221,7 @@ loadIniFile(PyObject *_resolveFunc)
     inifile.load(simout.resolve("config.ini"));
 
     // Initialize statistics database
-    Stats::InitSimStats();
+    Stats::initSimStats();
 }
 
 
@@ -297,7 +298,6 @@ finalInit()
     SimStartup();
 }
 
-
 /** Simulate for num_cycles additional cycles.  If num_cycles is -1
  * (the default), do not limit simulation; some other event must
  * terminate the loop.  Exported to Python via SWIG.
@@ -350,16 +350,12 @@ simulate(Tick num_cycles = MaxTick)
             async_event = false;
             if (async_dump) {
                 async_dump = false;
-
-                using namespace Stats;
-                SetupEvent(Dump, curTick);
+                Stats::StatEvent(true, false);
             }
 
             if (async_dumpreset) {
                 async_dumpreset = false;
-
-                using namespace Stats;
-                SetupEvent(Dump | Reset, curTick);
+                Stats::StatEvent(true, true);
             }
 
             if (async_exit) {
@@ -469,5 +465,5 @@ doExitCleanup()
     ParamContext::cleanupAllContexts();
 
     // print simulation stats
-    Stats::DumpNow();
+    Stats::dump();
 }
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 4a8c0eb66..66ebc10e1 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -32,6 +32,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <fstream>
 #include <string>
 
 #include "arch/vtophys.hh"
@@ -199,8 +200,7 @@ namespace AlphaPseudo
         Tick when = curTick + delay * Clock::Int::ns;
         Tick repeat = period * Clock::Int::ns;
 
-        using namespace Stats;
-        SetupEvent(Reset, when, repeat);
+        Stats::StatEvent(false, true, when, repeat);
     }
 
     void
@@ -213,8 +213,7 @@ namespace AlphaPseudo
         Tick when = curTick + delay * Clock::Int::ns;
         Tick repeat = period * Clock::Int::ns;
 
-        using namespace Stats;
-        SetupEvent(Dump, when, repeat);
+        Stats::StatEvent(true, false, when, repeat);
     }
 
     void
@@ -254,8 +253,7 @@ namespace AlphaPseudo
         Tick when = curTick + delay * Clock::Int::ns;
         Tick repeat = period * Clock::Int::ns;
 
-        using namespace Stats;
-        SetupEvent(Dump|Reset, when, repeat);
+        Stats::StatEvent(true, true, when, repeat);
     }
 
     void
diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc
index 1ff16976d..d32bb1142 100644
--- a/src/sim/serialize.cc
+++ b/src/sim/serialize.cc
@@ -407,36 +407,3 @@ Checkpoint::sectionExists(const std::string &section)
 {
     return db->sectionExists(section);
 }
-
-/** Hacked stat reset event */
-
-class StatresetParamContext : public ParamContext
-{
-  public:
-    StatresetParamContext(const string &section);
-    ~StatresetParamContext();
-    void startup();
-};
-
-StatresetParamContext statParams("statsreset");
-
-Param<Tick> reset_cycle(&statParams, "reset_cycle",
-                        "Cycle to reset stats on", 0);
-
-StatresetParamContext::StatresetParamContext(const string &section)
-    : ParamContext(section)
-{ }
-
-StatresetParamContext::~StatresetParamContext()
-{
-}
-
-void
-StatresetParamContext::startup()
-{
-    if (reset_cycle > 0) {
-        Stats::SetupEvent(Stats::Reset, curTick + reset_cycle, 0);
-        cprintf("Stats reset event scheduled for %lli\n",
-                curTick + reset_cycle);
-    }
-}
diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index 3fad8beb5..228c83898 100644
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -38,14 +38,9 @@
 #include "base/callback.hh"
 #include "base/hostinfo.hh"
 #include "base/statistics.hh"
-#include "base/str.hh"
 #include "base/time.hh"
-#include "base/stats/output.hh"
 #include "cpu/base.hh"
 #include "sim/eventq.hh"
-#include "sim/sim_object.hh"
-#include "sim/stat_control.hh"
-#include "sim/root.hh"
 
 using namespace std;
 
@@ -63,11 +58,9 @@ namespace Stats {
 
 Time statTime(true);
 Tick startTick;
-Tick lastDump(0);
 
-class SimTicksReset : public Callback
+struct SimTicksReset : public Callback
 {
-  public:
     void process()
     {
         statTime.set();
@@ -92,7 +85,7 @@ statElapsedTicks()
 SimTicksReset simTicksReset;
 
 void
-InitSimStats()
+initSimStats()
 {
     simInsts
         .functor(BaseCPU::numSimulatedInstructions)
@@ -153,81 +146,40 @@ InitSimStats()
     registerResetCallback(&simTicksReset);
 }
 
-class StatEvent : public Event
+class _StatEvent : public Event
 {
-  protected:
-    int flags;
+  private:
+    bool dump;
+    bool reset;
     Tick repeat;
 
   public:
-    StatEvent(EventQueue *queue, int _flags, Tick _when, Tick _repeat);
-    virtual void process();
-    virtual const char *description();
-};
-
-StatEvent::StatEvent(EventQueue *queue, int _flags, Tick _when, Tick _repeat)
-    : Event(queue, Stat_Event_Pri),
-      flags(_flags), repeat(_repeat)
-{
-    setFlags(AutoDelete);
-    schedule(_when);
-}
-
-const char *
-StatEvent::description()
-{
-    return "Statistics dump and/or reset";
-}
-
-void
-StatEvent::process()
-{
-    if (flags & Stats::Dump)
-        DumpNow();
-
-    if (flags & Stats::Reset) {
-        cprintf("Resetting stats at cycle %d!\n", curTick);
-        reset();
+    _StatEvent(bool _dump, bool _reset, Tick _when, Tick _repeat)
+        : Event(&mainEventQueue, Stat_Event_Pri), dump(_dump), reset(_reset),
+          repeat(_repeat)
+    {
+        setFlags(AutoDelete);
+        schedule(_when);
     }
 
-    if (repeat)
-        schedule(curTick + repeat);
-}
+    virtual void
+    process()
+    {
+        if (dump)
+            Stats::dump();
 
-list<Output *> OutputList;
+        if (reset)
+            Stats::reset();
 
-void
-DumpNow()
-{
-    assert(lastDump <= curTick);
-    if (lastDump == curTick)
-        return;
-    lastDump = curTick;
-
-    list<Output *>::iterator i = OutputList.begin();
-    list<Output *>::iterator end = OutputList.end();
-    for (; i != end; ++i) {
-        Output *output = *i;
-        if (!output->valid())
-            continue;
-
-        output->output();
+        if (repeat)
+            new _StatEvent(dump, reset, curTick + repeat, repeat);
     }
-}
+};
 
 void
-SetupEvent(int flags, Tick when, Tick repeat, EventQueue *queue)
+StatEvent(bool dump, bool reset, Tick when, Tick repeat)
 {
-    if (queue == NULL)
-        queue = &mainEventQueue;
-
-    new StatEvent(queue, flags, when, repeat);
+    new _StatEvent(dump, reset, when, repeat);
 }
 
 /* namespace Stats */ }
-
-void debugDumpStats()
-{
-    Stats::DumpNow();
-}
-
diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh
index 67f7cc491..1efa2554e 100644
--- a/src/sim/stat_control.hh
+++ b/src/sim/stat_control.hh
@@ -31,25 +31,10 @@
 #ifndef __SIM_STAT_CONTROL_HH__
 #define __SIM_STAT_CONTROL_HH__
 
-#include <fstream>
-#include <list>
-
-class EventQueue;
-
 namespace Stats {
 
-enum {
-    Reset = 0x1,
-    Dump = 0x2
-};
-
-class Output;
-extern std::list<Output *> OutputList;
-
-void DumpNow();
-void SetupEvent(int flags, Tick when, Tick repeat = 0, EventQueue *queue = NULL);
-
-void InitSimStats();
+void initSimStats();
+void StatEvent(bool dump, bool reset, Tick when = curTick, Tick repeat = 0);
 
 /* namespace Stats */ }