summaryrefslogtreecommitdiff
path: root/src/mem/ruby/network
diff options
context:
space:
mode:
authorJoel Hestness <jthestness@gmail.com>2015-05-19 10:56:51 -0500
committerJoel Hestness <jthestness@gmail.com>2015-05-19 10:56:51 -0500
commit0479569f6748202f1704d70aad3b03b3d17f6092 (patch)
tree12ed286bef31c4eb74d9ff7ae8e2f4613fafda10 /src/mem/ruby/network
parent99d3fa594565660d8d51fbda005e3c2213723fef (diff)
downloadgem5-0479569f6748202f1704d70aad3b03b3d17f6092.tar.xz
ruby: Fix RubySystem warm-up and cool-down scope
The processes of warming up and cooling down Ruby caches are simulation-wide processes, not just RubySystem instance-specific processes. Thus, the warm-up and cool-down variables should be globally visible to any Ruby components participating in either process. Make these variables static members and track the warm-up and cool-down processes as appropriate. This patch also has two side benefits: 1) It removes references to the RubySystem g_system_ptr, which are problematic for allowing multiple RubySystem instances in a single simulation. Warmup and cooldown variables being static (global) reduces the need for instance-specific dereferences through the RubySystem. 2) From the AbstractController, it removes local RubySystem pointers, which are used inconsistently with other uses of the RubySystem: 11 other uses reference the RubySystem with the g_system_ptr. Only sequencers have local pointers.
Diffstat (limited to 'src/mem/ruby/network')
-rw-r--r--src/mem/ruby/network/MessageBuffer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc
index 57a8d5519..99879a1b6 100644
--- a/src/mem/ruby/network/MessageBuffer.cc
+++ b/src/mem/ruby/network/MessageBuffer.cc
@@ -191,7 +191,7 @@ MessageBuffer::enqueue(MsgPtr message, Cycles delta)
}
// If running a cache trace, don't worry about the last arrival checks
- if (!g_system_ptr->m_warmup_enabled) {
+ if (!RubySystem::getWarmupEnabled()) {
m_last_arrival_time = arrival_time;
}