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/network/simple | |
| 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/network/simple')
| -rw-r--r-- | src/mem/ruby/network/simple/PerfectSwitch.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/Throttle.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc index 50b2055b5..66065e22c 100644 --- a/src/mem/ruby/network/simple/PerfectSwitch.cc +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc @@ -260,7 +260,7 @@ PerfectSwitch::wakeup() // There were not enough resources if (!enough) { - g_eventQueue_ptr->scheduleEvent(this, 1); + scheduleEvent(1); DPRINTF(RubyNetwork, "Can't deliver message since a node " "is blocked\n"); DPRINTF(RubyNetwork, "Message: %s\n", (*net_msg_ptr)); diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc index 7936e71dc..05dfc2553 100644 --- a/src/mem/ruby/network/simple/Throttle.cc +++ b/src/mem/ruby/network/simple/Throttle.cc @@ -167,7 +167,7 @@ Throttle::wakeup() DPRINTF(RubyNetwork, "throttle: %d my bw %d bw spent " "enqueueing net msg %d time: %lld.\n", m_node, getLinkBandwidth(), m_units_remaining[vnet], - g_eventQueue_ptr->getTime()); + g_system_ptr->getTime()); // Move the message m_out[vnet]->enqueue(m_in[vnet]->peekMsgPtr(), m_link_latency); @@ -215,7 +215,7 @@ Throttle::wakeup() // We are out of bandwidth for this cycle, so wakeup next // cycle and continue - g_eventQueue_ptr->scheduleEvent(this, 1); + scheduleEvent(1); } } @@ -228,7 +228,7 @@ Throttle::printStats(ostream& out) const void Throttle::clearStats() { - m_ruby_start = g_eventQueue_ptr->getTime(); + m_ruby_start = g_system_ptr->getTime(); m_links_utilized = 0.0; for (int i = 0; i < m_message_counters.size(); i++) { @@ -242,7 +242,7 @@ double Throttle::getUtilization() const { return 100.0 * double(m_links_utilized) / - double(g_eventQueue_ptr->getTime()-m_ruby_start); + double(g_system_ptr->getTime()-m_ruby_start); } void |