diff -r 27747ed45e84 -r 8cb136e5a71f src/python/m5/stats.py --- a/src/python/m5/stats.py Tue Jan 04 14:42:22 2011 -0800 +++ b/src/python/m5/stats.py Tue Jan 04 14:42:34 2011 -0800 @@ -28,7 +28,7 @@ import internal -from internal.stats import StatEvent as event +from internal.stats import schedStatEvent as schedEvent from objects import Root def initText(filename, desc=True): diff -r 27747ed45e84 -r 8cb136e5a71f src/python/swig/stats.i --- a/src/python/swig/stats.i Tue Jan 04 14:42:22 2011 -0800 +++ b/src/python/swig/stats.i Tue Jan 04 14:42:34 2011 -0800 @@ -50,7 +50,8 @@ std::string passwd, std::string project, std::string name, std::string sample); -void StatEvent(bool dump, bool reset, Tick when = curTick, Tick repeat = 0); +void schedStatEvent(bool dump, bool reset, + Tick when = curTick, Tick repeat = 0); void enable(); void prepare(); diff -r 27747ed45e84 -r 8cb136e5a71f src/sim/pseudo_inst.cc --- a/src/sim/pseudo_inst.cc Tue Jan 04 14:42:22 2011 -0800 +++ b/src/sim/pseudo_inst.cc Tue Jan 04 14:42:34 2011 -0800 @@ -236,7 +236,7 @@ Tick when = curTick + delay * SimClock::Int::ns; Tick repeat = period * SimClock::Int::ns; - Stats::StatEvent(false, true, when, repeat); + Stats::schedStatEvent(false, true, when, repeat); } void @@ -249,7 +249,7 @@ Tick when = curTick + delay * SimClock::Int::ns; Tick repeat = period * SimClock::Int::ns; - Stats::StatEvent(true, false, when, repeat); + Stats::schedStatEvent(true, false, when, repeat); } void @@ -262,7 +262,7 @@ Tick when = curTick + delay * SimClock::Int::ns; Tick repeat = period * SimClock::Int::ns; - Stats::StatEvent(true, true, when, repeat); + Stats::schedStatEvent(true, true, when, repeat); } void diff -r 27747ed45e84 -r 8cb136e5a71f src/sim/simulate.cc --- a/src/sim/simulate.cc Tue Jan 04 14:42:22 2011 -0800 +++ b/src/sim/simulate.cc Tue Jan 04 14:42:34 2011 -0800 @@ -93,7 +93,7 @@ if (async_event) { async_event = false; if (async_statdump || async_statreset) { - Stats::StatEvent(async_statdump, async_statreset); + Stats::schedStatEvent(async_statdump, async_statreset); async_statdump = false; async_statreset = false; } diff -r 27747ed45e84 -r 8cb136e5a71f src/sim/stat_control.hh --- a/src/sim/stat_control.hh Tue Jan 04 14:42:22 2011 -0800 +++ b/src/sim/stat_control.hh Tue Jan 04 14:42:34 2011 -0800 @@ -34,7 +34,8 @@ namespace Stats { void initSimStats(); -void StatEvent(bool dump, bool reset, Tick when = curTick, Tick repeat = 0); +void schedStatEvent(bool dump, bool reset, Tick when = curTick, + Tick repeat = 0); } // namespace Stats diff -r 27747ed45e84 -r 8cb136e5a71f src/sim/stat_control.cc --- a/src/sim/stat_control.cc Tue Jan 04 14:42:22 2011 -0800 +++ b/src/sim/stat_control.cc Tue Jan 04 14:42:34 2011 -0800 @@ -48,6 +48,7 @@ #endif #include "sim/eventq.hh" +#include "sim/stat_control.hh" using namespace std; @@ -188,14 +189,13 @@ Stats::reset(); if (repeat) { - Event *event = new _StatEvent(dump, reset, repeat); - mainEventQueue.schedule(event, curTick + repeat); + Stats::schedStatEvent(dump, reset, curTick + repeat, repeat); } } }; void -StatEvent(bool dump, bool reset, Tick when, Tick repeat) +schedStatEvent(bool dump, bool reset, Tick when, Tick repeat) { Event *event = new _StatEvent(dump, reset, repeat); mainEventQueue.schedule(event, when);