diff options
Diffstat (limited to 'src/mem/ruby/common')
-rw-r--r-- | src/mem/ruby/common/Consumer.cc | 14 | ||||
-rw-r--r-- | src/mem/ruby/common/Consumer.hh | 7 |
2 files changed, 4 insertions, 17 deletions
diff --git a/src/mem/ruby/common/Consumer.cc b/src/mem/ruby/common/Consumer.cc index 1f7aeebd5..de6a8f448 100644 --- a/src/mem/ruby/common/Consumer.cc +++ b/src/mem/ruby/common/Consumer.cc @@ -33,24 +33,12 @@ void Consumer::scheduleEvent(Time timeDelta) { - scheduleEvent(g_system_ptr, timeDelta); -} - -void -Consumer::scheduleEvent(EventManager *em, Time timeDelta) -{ - scheduleEventAbsolute(em, timeDelta + g_system_ptr->getTime()); + scheduleEventAbsolute(timeDelta + g_system_ptr->getTime()); } void Consumer::scheduleEventAbsolute(Time timeAbs) { - scheduleEventAbsolute(g_system_ptr, timeAbs); -} - -void -Consumer::scheduleEventAbsolute(EventManager *em, Time timeAbs) -{ Tick evt_time = g_system_ptr->clockPeriod() * timeAbs; if (!alreadyScheduled(evt_time)) { // This wakeup is not redundant diff --git a/src/mem/ruby/common/Consumer.hh b/src/mem/ruby/common/Consumer.hh index 6a67bde39..a10abf362 100644 --- a/src/mem/ruby/common/Consumer.hh +++ b/src/mem/ruby/common/Consumer.hh @@ -44,8 +44,8 @@ class Consumer { public: - Consumer() - : m_last_scheduled_wakeup(0), m_last_wakeup(0) + Consumer(EventManager *_em) + : m_last_scheduled_wakeup(0), m_last_wakeup(0), em(_em) { } @@ -88,8 +88,6 @@ class Consumer m_scheduled_wakeups.erase(time); } - void scheduleEvent(EventManager* em, Time timeDelta); - void scheduleEventAbsolute(EventManager* em, Time timeAbs); void scheduleEvent(Time timeDelta); void scheduleEventAbsolute(Time timeAbs); @@ -97,6 +95,7 @@ class Consumer Tick m_last_scheduled_wakeup; std::set<Tick> m_scheduled_wakeups; Tick m_last_wakeup; + EventManager *em; class ConsumerEvent : public Event { |