changeset fc475ac7d2a4 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=fc475ac7d2a4
description:
stats: rename StatEvent() function to schedStatEvent().
This follows the style rules and is more descriptive.
diffstat:
src/python/m5/stats.py | 2 +-
src/python/swig/stats.i | 3 ++-
src/sim/pseudo_inst.cc | 6 +++---
src/sim/simulate.cc | 2 +-
src/sim/stat_control.cc | 12 ++++++------
src/sim/stat_control.hh | 3 ++-
6 files changed, 15 insertions(+), 13 deletions(-)
diffs (129 lines):
diff -r f1d298b7416c -r fc475ac7d2a4 src/python/m5/stats.py
--- a/src/python/m5/stats.py Fri Jan 07 21:50:29 2011 -0800
+++ b/src/python/m5/stats.py Fri Jan 07 21:50:29 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 f1d298b7416c -r fc475ac7d2a4 src/python/swig/stats.i
--- a/src/python/swig/stats.i Fri Jan 07 21:50:29 2011 -0800
+++ b/src/python/swig/stats.i Fri Jan 07 21:50:29 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 f1d298b7416c -r fc475ac7d2a4 src/sim/pseudo_inst.cc
--- a/src/sim/pseudo_inst.cc Fri Jan 07 21:50:29 2011 -0800
+++ b/src/sim/pseudo_inst.cc Fri Jan 07 21:50:29 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 f1d298b7416c -r fc475ac7d2a4 src/sim/simulate.cc
--- a/src/sim/simulate.cc Fri Jan 07 21:50:29 2011 -0800
+++ b/src/sim/simulate.cc Fri Jan 07 21:50:29 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 f1d298b7416c -r fc475ac7d2a4 src/sim/stat_control.cc
--- a/src/sim/stat_control.cc Fri Jan 07 21:50:29 2011 -0800
+++ b/src/sim/stat_control.cc Fri Jan 07 21:50:29 2011 -0800
@@ -48,6 +48,7 @@
#endif
#include "sim/eventq.hh"
+#include "sim/stat_control.hh"
using namespace std;
@@ -164,7 +165,7 @@
static Global global;
}
-class _StatEvent : public Event
+class StatEvent : public Event
{
private:
bool dump;
@@ -172,7 +173,7 @@
Tick repeat;
public:
- _StatEvent(bool _dump, bool _reset, Tick _repeat)
+ StatEvent(bool _dump, bool _reset, Tick _repeat)
: Event(Stat_Event_Pri), dump(_dump), reset(_reset), repeat(_repeat)
{
setFlags(AutoDelete);
@@ -188,16 +189,15 @@
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);
+ Event *event = new StatEvent(dump, reset, repeat);
mainEventQueue.schedule(event, when);
}
diff -r f1d298b7416c -r fc475ac7d2a4 src/sim/stat_control.hh
--- a/src/sim/stat_control.hh Fri Jan 07 21:50:29 2011 -0800
+++ b/src/sim/stat_control.hh Fri Jan 07 21:50:29 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
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
