diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2012-08-27 01:00:55 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2012-08-27 01:00:55 -0500 |
| commit | 9190940511b5783811bc6288dd4f22f8d18c9d26 (patch) | |
| tree | 72a07f80a772d7c6f2a6f0255cee173ac631cb35 /src/mem/ruby/system/TimerTable.cc | |
| parent | 7122b83d8f92d77bccae432b4e90ba12f1babad5 (diff) | |
| download | gem5-9190940511b5783811bc6288dd4f22f8d18c9d26.tar.xz | |
Ruby: Remove RubyEventQueue
This patch removes RubyEventQueue. Consumer objects now rely on RubySystem
or themselves for scheduling events.
Diffstat (limited to 'src/mem/ruby/system/TimerTable.cc')
| -rw-r--r-- | src/mem/ruby/system/TimerTable.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mem/ruby/system/TimerTable.cc b/src/mem/ruby/system/TimerTable.cc index d5df8fe18..6702411a5 100644 --- a/src/mem/ruby/system/TimerTable.cc +++ b/src/mem/ruby/system/TimerTable.cc @@ -27,7 +27,7 @@ */ #include "mem/ruby/common/Global.hh" -#include "mem/ruby/eventqueue/RubyEventQueue.hh" +#include "mem/ruby/system/System.hh" #include "mem/ruby/system/TimerTable.hh" TimerTable::TimerTable() @@ -48,7 +48,7 @@ TimerTable::isReady() const updateNext(); } assert(m_next_valid); - return (g_eventQueue_ptr->getTime() >= m_next_time); + return (g_system_ptr->getTime() >= m_next_time); } const Address& @@ -69,10 +69,10 @@ TimerTable::set(const Address& address, Time relative_latency) assert(address == line_address(address)); assert(relative_latency > 0); assert(!m_map.count(address)); - Time ready_time = g_eventQueue_ptr->getTime() + relative_latency; + Time ready_time = g_system_ptr->getTime() + relative_latency; m_map[address] = ready_time; assert(m_consumer_ptr != NULL); - g_eventQueue_ptr->scheduleEventAbsolute(m_consumer_ptr, ready_time); + m_consumer_ptr->scheduleEventAbsolute(ready_time); m_next_valid = false; // Don't always recalculate the next ready address |