diff options
| author | Sean Wilson <spwilson2@wisc.edu> | 2017-06-28 10:44:34 -0500 |
|---|---|---|
| committer | Sean Wilson <spwilson2@wisc.edu> | 2017-07-12 20:07:05 +0000 |
| commit | 60adacb5716d91b9838fbb5e2b0d3e766c1cfdb1 (patch) | |
| tree | 076c184f8df9003297f707483f957c7062093321 /src/cpu/testers/garnet_synthetic_traffic | |
| parent | e5c9e9c4d439e1937db33a954ac231032dab69f2 (diff) | |
| download | gem5-60adacb5716d91b9838fbb5e2b0d3e766c1cfdb1.tar.xz | |
testers: Refactor some Event subclasses to lambdas
Change-Id: I897b6162a827216b7bad74d955c0e50e06a5a3ec
Signed-off-by: Sean Wilson <spwilson2@wisc.edu>
Reviewed-on: https://gem5-review.googlesource.com/3926
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/cpu/testers/garnet_synthetic_traffic')
| -rw-r--r-- | src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc | 3 | ||||
| -rw-r--r-- | src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh | 19 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc index 0f8c87729..1345fe93e 100644 --- a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc +++ b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc @@ -76,7 +76,8 @@ GarnetSyntheticTraffic::sendPkt(PacketPtr pkt) GarnetSyntheticTraffic::GarnetSyntheticTraffic(const Params *p) : MemObject(p), - tickEvent(this), + tickEvent([this]{ tick(); }, "GarnetSyntheticTraffic tick", + false, Event::CPU_Tick_Pri), cachePort("GarnetSyntheticTraffic", this), retryPkt(NULL), size(p->memory_size), diff --git a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh index 94eee44d7..3da7e2774 100644 --- a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh +++ b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh @@ -74,21 +74,7 @@ class GarnetSyntheticTraffic : public MemObject void printAddr(Addr a); protected: - class TickEvent : public Event - { - private: - GarnetSyntheticTraffic *cpu; - - public: - TickEvent(GarnetSyntheticTraffic *c) : Event(CPU_Tick_Pri), cpu(c) {} - void process() { cpu->tick(); } - virtual const char *description() const - { - return "GarnetSyntheticTraffic tick"; - } - }; - - TickEvent tickEvent; + EventFunctionWrapper tickEvent; class CpuPort : public MasterPort { @@ -160,6 +146,3 @@ class GarnetSyntheticTraffic : public MemObject }; #endif // __CPU_GARNET_SYNTHETIC_TRAFFIC_HH__ - - - |