diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2012-10-02 14:35:45 -0500 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2012-10-02 14:35:45 -0500 |
commit | 88ba1c452b25de7f11dcb4a14bbeb8f540809918 (patch) | |
tree | 03dab82a1b7e2d7de285ec1b19c0980a9310dd8f /src/mem/ruby/system/System.cc | |
parent | 4488379244cdf3c211e76dbf3b4278347f639039 (diff) | |
download | gem5-88ba1c452b25de7f11dcb4a14bbeb8f540809918.tar.xz |
ruby: makes some members non-static
This patch makes some of the members (profiler, network, memory vector)
of ruby system non-static.
Diffstat (limited to 'src/mem/ruby/system/System.cc')
-rw-r--r-- | src/mem/ruby/system/System.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc index 25857464d..8c267654f 100644 --- a/src/mem/ruby/system/System.cc +++ b/src/mem/ruby/system/System.cc @@ -51,10 +51,6 @@ int RubySystem::m_block_size_bits; uint64 RubySystem::m_memory_size_bytes; int RubySystem::m_memory_size_bits; -Network* RubySystem::m_network_ptr; -Profiler* RubySystem::m_profiler_ptr; -MemoryVector* RubySystem::m_mem_vec_ptr; - RubySystem::RubySystem(const Params *p) : ClockedObject(p) { @@ -84,11 +80,9 @@ RubySystem::RubySystem(const Params *p) m_mem_vec_ptr->resize(m_memory_size_bytes); } - // // Print ruby configuration and stats at exit - // - RubyExitCallback* rubyExitCB = new RubyExitCallback(p->stats_filename); - registerExitCallback(rubyExitCB); + registerExitCallback(new RubyExitCallback(p->stats_filename, this)); + m_warmup_enabled = false; m_cooldown_enabled = false; } @@ -636,5 +630,5 @@ void RubyExitCallback::process() { std::ostream *os = simout.create(stats_filename); - RubySystem::printStats(*os); + ruby_system->printStats(*os); } |