From 9190940511b5783811bc6288dd4f22f8d18c9d26 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 27 Aug 2012 01:00:55 -0500 Subject: Ruby: Remove RubyEventQueue This patch removes RubyEventQueue. Consumer objects now rely on RubySystem or themselves for scheduling events. --- src/mem/ruby/slicc_interface/Message.hh | 6 +++--- src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mem/ruby/slicc_interface') diff --git a/src/mem/ruby/slicc_interface/Message.hh b/src/mem/ruby/slicc_interface/Message.hh index c57857adb..48156a99a 100644 --- a/src/mem/ruby/slicc_interface/Message.hh +++ b/src/mem/ruby/slicc_interface/Message.hh @@ -34,7 +34,7 @@ #include "base/refcnt.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/common/TypeDefines.hh" -#include "mem/ruby/eventqueue/RubyEventQueue.hh" +#include "mem/ruby/system/System.hh" class Message; typedef RefCountingPtr MsgPtr; @@ -43,8 +43,8 @@ class Message : public RefCounted { public: Message() - : m_time(g_eventQueue_ptr->getTime()), - m_LastEnqueueTime(g_eventQueue_ptr->getTime()), + : m_time(g_system_ptr->getTime()), + m_LastEnqueueTime(g_system_ptr->getTime()), m_DelayedCycles(0) { } diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh index b8fd46dd0..06372c9fc 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh +++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh @@ -49,7 +49,7 @@ random(int n) inline Time get_time() { - return g_eventQueue_ptr->getTime(); + return g_system_ptr->getTime(); } inline Time -- cgit v1.2.3