diff options
Diffstat (limited to 'src/mem/ruby/system')
-rw-r--r-- | src/mem/ruby/system/Sequencer.cc | 13 | ||||
-rw-r--r-- | src/mem/ruby/system/Sequencer.hh | 12 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index ad219eab3..a5a6e3260 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -56,14 +56,13 @@ RubySequencerParams::create() } Sequencer::Sequencer(const Params *p) - : RubyPort(p) + : RubyPort(p), deadlockCheckEvent(this) { m_store_waiting_on_load_cycles = 0; m_store_waiting_on_store_cycles = 0; m_load_waiting_on_store_cycles = 0; m_load_waiting_on_load_cycles = 0; - m_deadlock_check_scheduled = false; m_outstanding_count = 0; m_max_outstanding_requests = 0; @@ -128,9 +127,8 @@ void Sequencer::wakeup() { assert(m_outstanding_count == total_outstanding); if (m_outstanding_count > 0) { // If there are still outstanding requests, keep checking - g_eventQueue_ptr->scheduleEvent(this, m_deadlock_threshold); - } else { - m_deadlock_check_scheduled = false; + schedule(deadlockCheckEvent, + (m_deadlock_threshold * g_eventQueue_ptr->getClock()) + curTick); } } @@ -198,9 +196,8 @@ bool Sequencer::insertRequest(SequencerRequest* request) { assert(m_outstanding_count == total_outstanding); // See if we should schedule a deadlock check - if (m_deadlock_check_scheduled == false) { - g_eventQueue_ptr->scheduleEvent(this, m_deadlock_threshold); - m_deadlock_check_scheduled = true; + if (deadlockCheckEvent.scheduled() == false) { + schedule(deadlockCheckEvent, m_deadlock_threshold); } Address line_addr(request->ruby_request.paddr); diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index 974b251f0..f24edbf74 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -128,6 +128,18 @@ private: int m_store_waiting_on_store_cycles; int m_load_waiting_on_store_cycles; int m_load_waiting_on_load_cycles; + + class SequencerWakeupEvent : public Event + { + Sequencer *m_sequencer_ptr; + + public: + SequencerWakeupEvent(Sequencer *_seq) : m_sequencer_ptr(_seq) {} + void process() { m_sequencer_ptr->wakeup(); } + const char *description() const { return "Sequencer deadlock check"; } + }; + + SequencerWakeupEvent deadlockCheckEvent; }; // Output operator declaration |