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/System.hh | |
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/System.hh')
-rw-r--r-- | src/mem/ruby/system/System.hh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh index bbb14667f..e6501f7bf 100644 --- a/src/mem/ruby/system/System.hh +++ b/src/mem/ruby/system/System.hh @@ -37,7 +37,6 @@ #include "base/callback.hh" #include "mem/ruby/common/Global.hh" -#include "mem/ruby/eventqueue/RubyEventQueue.hh" #include "mem/ruby/recorder/CacheRecorder.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" #include "mem/ruby/system/MemoryVector.hh" @@ -78,6 +77,8 @@ class RubySystem : public SimObject static int getBlockSizeBits() { return m_block_size_bits; } static uint64 getMemorySizeBytes() { return m_memory_size_bytes; } static int getMemorySizeBits() { return m_memory_size_bits; } + Tick getTime() const { return curTick() / m_clock; } + Tick getClock() const { return m_clock; } // Public Methods static Network* @@ -87,12 +88,6 @@ class RubySystem : public SimObject return m_network_ptr; } - static RubyEventQueue* - getEventQueue() - { - return g_eventQueue_ptr; - } - Profiler* getProfiler() { @@ -111,11 +106,6 @@ class RubySystem : public SimObject void clearStats() const; uint64 getInstructionCount(int thread) { return 1; } - static uint64 - getCycleCount(int thread) - { - return g_eventQueue_ptr->getTime(); - } void print(std::ostream& out) const; |