From ebe5f0df9a6158ec4ed84429d1619f388eb1388b Mon Sep 17 00:00:00 2001 From: Sean Wilson Date: Wed, 7 Jun 2017 12:13:16 -0500 Subject: cpu, gpu-compute: Replace EventWrapper use with EventFunctionWrapper Change-Id: Idd5992463bcf9154f823b82461070d1f1842cea3 Signed-off-by: Sean Wilson Reviewed-on: https://gem5-review.googlesource.com/3746 Reviewed-by: Anthony Gutierrez Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/cpu/testers/traffic_gen/traffic_gen.cc | 4 ++-- src/cpu/testers/traffic_gen/traffic_gen.hh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/cpu/testers/traffic_gen') 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 noProgressEvent; + EventFunctionWrapper noProgressEvent; /** Time of next transition */ Tick nextTransitionTick; @@ -206,7 +206,7 @@ class TrafficGen : public MemObject Tick retryPktTick; /** Event for scheduling updates */ - EventWrapper updateEvent; + EventFunctionWrapper updateEvent; uint64_t numSuppressed; -- cgit v1.2.3