From 58fa2857e123a44b1633628b898847773153c047 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Wed, 22 Dec 2010 23:15:24 -0600 Subject: This patch removes the WARN_* and ERROR_* from src/mem/ruby/common/Debug.hh file. These statements have been replaced with warn(), panic() and fatal() defined in src/base/misc.hh --- src/mem/ruby/system/Sequencer.cc | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'src/mem/ruby/system/Sequencer.cc') diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index dd30835da..1a0f8a66a 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -27,6 +27,7 @@ */ #include "base/str.hh" +#include "base/misc.hh" #include "cpu/testers/rubytest/RubyTester.hh" #include "mem/protocol/CacheMsg.hh" #include "mem/protocol/Protocol.hh" @@ -99,14 +100,12 @@ Sequencer::wakeup() if (current_time - request->issue_time < m_deadlock_threshold) continue; - WARN_MSG("Possible Deadlock detected"); - WARN_EXPR(m_version); - WARN_EXPR(request->ruby_request.paddr); - WARN_EXPR(m_readRequestTable.size()); - WARN_EXPR(current_time); - WARN_EXPR(request->issue_time); - WARN_EXPR(current_time - request->issue_time); - ERROR_MSG("Aborting"); + panic("Possible Deadlock detected. Aborting!\n" + "version: %d request.paddr: %d m_readRequestTable: %d " + "current time: %u issue_time: %d difference: %d\n", m_version, + request->ruby_request.paddr, m_readRequestTable.size(), + current_time, request->issue_time, + current_time - request->issue_time); } RequestTable::iterator write = m_writeRequestTable.begin(); @@ -116,14 +115,12 @@ Sequencer::wakeup() if (current_time - request->issue_time < m_deadlock_threshold) continue; - WARN_MSG("Possible Deadlock detected"); - WARN_EXPR(m_version); - WARN_EXPR(request->ruby_request.paddr); - WARN_EXPR(current_time); - WARN_EXPR(request->issue_time); - WARN_EXPR(current_time - request->issue_time); - WARN_EXPR(m_writeRequestTable.size()); - ERROR_MSG("Aborting"); + panic("Possible Deadlock detected. Aborting!\n" + "version: %d request.paddr: %d m_writeRequestTable: %d " + "current time: %u issue_time: %d difference: %d\n", m_version, + request->ruby_request.paddr, m_writeRequestTable.size(), + current_time, request->issue_time, + current_time - request->issue_time); } total_outstanding += m_writeRequestTable.size(); -- cgit v1.2.3