From cf232de4615f0fe9435d6e92a1d6319c972a8c88 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 14 Jan 2013 10:04:21 -0600 Subject: Ruby: use ClockedObject in Consumer class Many Ruby structures inherit from the Consumer, which is used for scheduling events. The Consumer used to relay on an Event Manager for scheduling events and on g_system_ptr for time. With this patch, the Consumer will now use a ClockedObject to schedule events and to query for current time. This resulted in several structures being converted from SimObjects to ClockedObjects. Also, the MessageBuffer class now requires a pointer to a ClockedObject so as to query for time. --- src/mem/ruby/common/Consumer.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mem/ruby/common/Consumer.hh') diff --git a/src/mem/ruby/common/Consumer.hh b/src/mem/ruby/common/Consumer.hh index a10abf362..9e089e992 100644 --- a/src/mem/ruby/common/Consumer.hh +++ b/src/mem/ruby/common/Consumer.hh @@ -39,12 +39,12 @@ #include #include "mem/ruby/common/TypeDefines.hh" -#include "sim/eventq.hh" +#include "sim/clocked_object.hh" class Consumer { public: - Consumer(EventManager *_em) + Consumer(ClockedObject *_em) : m_last_scheduled_wakeup(0), m_last_wakeup(0), em(_em) { } @@ -95,7 +95,7 @@ class Consumer Tick m_last_scheduled_wakeup; std::set m_scheduled_wakeups; Tick m_last_wakeup; - EventManager *em; + ClockedObject *em; class ConsumerEvent : public Event { -- cgit v1.2.3