diff options
author | Sean Wilson <spwilson2@wisc.edu> | 2017-06-07 12:13:16 -0500 |
---|---|---|
committer | Sean Wilson <spwilson2@wisc.edu> | 2017-06-20 18:03:21 +0000 |
commit | ebe5f0df9a6158ec4ed84429d1619f388eb1388b (patch) | |
tree | c3070d745a0820856a044313860c8edede236be8 /src/cpu/testers/traffic_gen | |
parent | 8421362cc23a6341e44ce59f2c4f578438fd8a55 (diff) | |
download | gem5-ebe5f0df9a6158ec4ed84429d1619f388eb1388b.tar.xz |
cpu, gpu-compute: Replace EventWrapper use with EventFunctionWrapper
Change-Id: Idd5992463bcf9154f823b82461070d1f1842cea3
Signed-off-by: Sean Wilson <spwilson2@wisc.edu>
Reviewed-on: https://gem5-review.googlesource.com/3746
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/cpu/testers/traffic_gen')
-rw-r--r-- | src/cpu/testers/traffic_gen/traffic_gen.cc | 4 | ||||
-rw-r--r-- | src/cpu/testers/traffic_gen/traffic_gen.hh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/testers/traffic_gen/traffic_gen.cc b/src/cpu/testers/traffic_gen/traffic_gen.cc index 1a12b7675..9d8732902 100644 --- a/src/cpu/testers/traffic_gen/traffic_gen.cc +++ b/src/cpu/testers/traffic_gen/traffic_gen.cc @@ -61,14 +61,14 @@ TrafficGen::TrafficGen(const TrafficGenParams* p) configFile(p->config_file), elasticReq(p->elastic_req), progressCheck(p->progress_check), - noProgressEvent(this), + noProgressEvent([this]{ noProgress(); }, name()), nextTransitionTick(0), nextPacketTick(0), currState(0), port(name() + ".port", *this), retryPkt(NULL), retryPktTick(0), - updateEvent(this), + updateEvent([this]{ update(); }, name()), numSuppressed(0) { } diff --git a/src/cpu/testers/traffic_gen/traffic_gen.hh b/src/cpu/testers/traffic_gen/traffic_gen.hh index 6b3ccbe30..b2039bef9 100644 --- a/src/cpu/testers/traffic_gen/traffic_gen.hh +++ b/src/cpu/testers/traffic_gen/traffic_gen.hh @@ -152,7 +152,7 @@ class TrafficGen : public MemObject /** * Event to keep track of our progress, or lack thereof. */ - EventWrapper<TrafficGen, &TrafficGen::noProgress> noProgressEvent; + EventFunctionWrapper noProgressEvent; /** Time of next transition */ Tick nextTransitionTick; @@ -206,7 +206,7 @@ class TrafficGen : public MemObject Tick retryPktTick; /** Event for scheduling updates */ - EventWrapper<TrafficGen, &TrafficGen::update> updateEvent; + EventFunctionWrapper updateEvent; uint64_t numSuppressed; |