From 60adacb5716d91b9838fbb5e2b0d3e766c1cfdb1 Mon Sep 17 00:00:00 2001 From: Sean Wilson Date: Wed, 28 Jun 2017 10:44:34 -0500 Subject: testers: Refactor some Event subclasses to lambdas Change-Id: I897b6162a827216b7bad74d955c0e50e06a5a3ec Signed-off-by: Sean Wilson Reviewed-on: https://gem5-review.googlesource.com/3926 Maintainer: Jason Lowe-Power Reviewed-by: Jason Lowe-Power --- src/cpu/testers/rubytest/RubyTester.cc | 4 +++- src/cpu/testers/rubytest/RubyTester.hh | 15 +-------------- 2 files changed, 4 insertions(+), 15 deletions(-) (limited to 'src/cpu/testers/rubytest') diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc index baf2b7e5b..712d15dff 100644 --- a/src/cpu/testers/rubytest/RubyTester.cc +++ b/src/cpu/testers/rubytest/RubyTester.cc @@ -50,7 +50,9 @@ #include "sim/system.hh" RubyTester::RubyTester(const Params *p) - : MemObject(p), checkStartEvent(this), + : MemObject(p), + checkStartEvent([this]{ wakeup(); }, "RubyTester tick", + false, Event::CPU_Tick_Pri), _masterId(p->system->getMasterId(name())), m_checkTable_ptr(nullptr), m_num_cpus(p->num_cpus), diff --git a/src/cpu/testers/rubytest/RubyTester.hh b/src/cpu/testers/rubytest/RubyTester.hh index 39e6d78a3..007035977 100644 --- a/src/cpu/testers/rubytest/RubyTester.hh +++ b/src/cpu/testers/rubytest/RubyTester.hh @@ -118,20 +118,7 @@ class RubyTester : public MemObject MasterID masterId() { return _masterId; } protected: - class CheckStartEvent : public Event - { - private: - RubyTester *tester; - - public: - CheckStartEvent(RubyTester *_tester) - : Event(CPU_Tick_Pri), tester(_tester) - {} - void process() { tester->wakeup(); } - virtual const char *description() const { return "RubyTester tick"; } - }; - - CheckStartEvent checkStartEvent; + EventFunctionWrapper checkStartEvent; MasterID _masterId; -- cgit v1.2.3