diff options
author | Nathan Binkert <binkertn@umich.edu> | 2007-02-17 22:52:32 -0800 |
---|---|---|
committer | Nathan Binkert <binkertn@umich.edu> | 2007-02-17 22:52:32 -0800 |
commit | e94103397c58ffe05d4c5c7f536edabfb1d6861b (patch) | |
tree | 9109a4c2f22b3681c48ab6047c3223e70297db12 /src/sim/main.cc | |
parent | 01f32efa4b3c25ad6323ec3e76d756b442a8f419 (diff) | |
download | gem5-e94103397c58ffe05d4c5c7f536edabfb1d6861b.tar.xz |
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
Diffstat (limited to 'src/sim/main.cc')
-rw-r--r-- | src/sim/main.cc | 14 |
1 files changed, 5 insertions, 9 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(); } |