From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Mon, 11 May 2009 17:38:46 +0000 (-0700)
Subject: ruby: Check stderr and not stdin before hanging on an assert.
X-Git-Tag: Calvin_Submission~336^2~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ebf2f5aaddcb81ba39692b716ed9ad658df27cd8;p=gem5.git

ruby: Check stderr and not stdin before hanging on an assert.
---

diff --git a/src/mem/ruby/common/Debug.hh b/src/mem/ruby/common/Debug.hh
index 6dce98dd5..8548e9772 100644
--- a/src/mem/ruby/common/Debug.hh
+++ b/src/mem/ruby/common/Debug.hh
@@ -154,7 +154,7 @@ const bool ASSERT_FLAG = true;
            << __PRETTY_FUNCTION__ << " in "\
            << __FILE__ << ":"\
            << __LINE__ << endl << flush;\
-      if(isatty(STDIN_FILENO)) {\
+      if(isatty(STDERR_FILENO)) {\
         cerr << "At this point you might want to attach a debug to ";\
         cerr << "the running and get to the" << endl;\
         cerr << "crash site; otherwise press enter to continue" << endl;\
@@ -175,7 +175,7 @@ const bool ASSERT_FLAG = true;
          << __PRETTY_FUNCTION__ << " in "\
          << __FILE__ << ":"\
          << __LINE__ << endl << flush;\
-    if(isatty(STDIN_FILENO)) {\
+    if(isatty(STDERR_FILENO)) {\
       cerr << "press enter to continue" << endl;\
       cerr << "PID: " << getpid();\
       cerr << endl << flush; \
diff --git a/src/mem/slicc/slicc_global.hh b/src/mem/slicc/slicc_global.hh
index caa5509f8..3e4f37a57 100644
--- a/src/mem/slicc/slicc_global.hh
+++ b/src/mem/slicc/slicc_global.hh
@@ -67,7 +67,7 @@ const bool CHECK_INVALID_RESOURCE_STALLS = false;
            << __PRETTY_FUNCTION__ << " in "\
            << __FILE__ << ":"\
            << __LINE__ << endl;\
-      if(isatty(STDIN_FILENO)) {\
+      if(isatty(STDERR_FILENO)) {\
         cerr << "At this point you might want to attach a debug to ";\
         cerr << "the running and get to the" << endl;\
         cerr << "crash site; otherwise press enter to continue" << endl;\