diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2010-12-22 23:15:24 -0600 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2010-12-22 23:15:24 -0600 |
| commit | 58fa2857e123a44b1633628b898847773153c047 (patch) | |
| tree | abf6318d961c8bcb31d7a0f5c4aa9bbb4a0db0ed /src/mem/ruby/tester | |
| parent | 2c0e80f96bee8c2ad48cd3fb7a18af149bfe76bc (diff) | |
| download | gem5-58fa2857e123a44b1633628b898847773153c047.tar.xz | |
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
Diffstat (limited to 'src/mem/ruby/tester')
| -rw-r--r-- | src/mem/ruby/tester/DeterministicDriver.cc | 3 | ||||
| -rw-r--r-- | src/mem/ruby/tester/RaceyPseudoThread.cc | 10 | ||||
| -rw-r--r-- | src/mem/ruby/tester/test_framework.cc | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc index 8dce1c702..533f58e6f 100644 --- a/src/mem/ruby/tester/DeterministicDriver.cc +++ b/src/mem/ruby/tester/DeterministicDriver.cc @@ -32,6 +32,7 @@ * */ +#include "base/misc.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/tester/Tester_Globals.hh" #include "mem/ruby/tester/DeterministicDriver.hh" @@ -89,7 +90,7 @@ DeterministicDriver::DeterministicDriver(string generator_type, int num_completi m_generator_vector[i] = new DetermSeriesGETSGenerator(i, *this); break; default: - ERROR_MSG("Unexpected specified generator type"); + fatal("Unexpected specified generator type"); } } diff --git a/src/mem/ruby/tester/RaceyPseudoThread.cc b/src/mem/ruby/tester/RaceyPseudoThread.cc index eaae1112f..cfe4078cf 100644 --- a/src/mem/ruby/tester/RaceyPseudoThread.cc +++ b/src/mem/ruby/tester/RaceyPseudoThread.cc @@ -50,10 +50,9 @@ RaceyPseudoThread::~RaceyPseudoThread() { void RaceyPseudoThread::checkForDeadlock() { Time current_time = m_driver.eventQueue->getTime(); if(!m_done && (current_time - m_last_progress) > g_DEADLOCK_THRESHOLD) { - WARN_EXPR(m_proc_id); - WARN_EXPR(m_ic_counter); - WARN_EXPR(m_last_progress); - ERROR_MSG("Deadlock detected."); + panic("Deadlock detected: m_proc_id: %d m_ic_counter: %d " + "m_last_progress: %d\n", + m_proc_id, m_ic_counter, m_last_progress); } } @@ -123,8 +122,7 @@ void RaceyPseudoThread::wakeup() { case 10: goto L10; default: - WARN_EXPR(m_stop); - ERROR_MSG("RaceyPseudoThread: Bad context point!"); + fatal("RaceyPseudoThread: Bad context point %u!", m_stop); } // diff --git a/src/mem/ruby/tester/test_framework.cc b/src/mem/ruby/tester/test_framework.cc index 99d11887f..2dcace49d 100644 --- a/src/mem/ruby/tester/test_framework.cc +++ b/src/mem/ruby/tester/test_framework.cc @@ -34,6 +34,7 @@ using namespace std; +#include "base/misc.hh" #include "mem/ruby/tester/test_framework.hh" #include "mem/protocol/protocol_name.hh" #include "getopt.hh" @@ -211,7 +212,7 @@ void tester_playback_trace() int read = replayer->playbackTrace(trace_filename); cout << "(" << read << " requests read)" << endl; if (read == 0) { - ERROR_MSG("Zero items read from tracefile."); + fatal("Zero items read from tracefile."); } } |