From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Wed, 17 Dec 2003 17:43:03 +0000 (-0800)
Subject: Miscellaneous minor fixes/improvements.
X-Git-Tag: m5_1.0_beta2~229
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d5a187dd5a38771d72e6a52bd9a6891eb76fe8f4;p=gem5.git

Miscellaneous minor fixes/improvements.
Most notable is that the rundiff trace-output lossage is fixed!

base/pollevent.cc:
    Use SA_RESTART to keep blocked write() calls from failing
    with EINTR when signals happen.
base/trace.hh:
    Make TRACING_ON depend on NDEBUG not being set (instead of
    DEBUG being set) so m5.opt/m5.fast do what we want.
util/rundiff:
    Print header lines showing file/cmd names.

--HG--
extra : convert_revision : 4966814ad65aedb6d62a5a62a6ad3e3f326d61b8
---

diff --git a/base/pollevent.cc b/base/pollevent.cc
index 619bda887..60a20bd2e 100644
--- a/base/pollevent.cc
+++ b/base/pollevent.cc
@@ -223,14 +223,14 @@ PollQueue::setupHandler()
 
     act.sa_handler = handleIO;
     sigemptyset(&act.sa_mask);
-    act.sa_flags = 0;
+    act.sa_flags = SA_RESTART;
 
     if (sigaction(SIGIO, &act, &oldio) == -1)
         panic("could not do sigaction");
 
     act.sa_handler = handleALRM;
     sigemptyset(&act.sa_mask);
-    act.sa_flags = 0;
+    act.sa_flags = SA_RESTART;
 
     if (sigaction(SIGALRM, &act, &oldalrm) == -1)
         panic("could not do sigaction");
diff --git a/base/trace.hh b/base/trace.hh
index 805a925a6..5aeaac445 100644
--- a/base/trace.hh
+++ b/base/trace.hh
@@ -36,7 +36,7 @@
 #include "sim/universe.hh"
 
 #ifndef TRACING_ON
-#ifdef DEBUG
+#ifndef NDEBUG
 #define TRACING_ON	1
 #else
 #define TRACING_ON	0
diff --git a/util/rundiff b/util/rundiff
index 63c05b96b..9376e4b9e 100755
--- a/util/rundiff
+++ b/util/rundiff
@@ -87,6 +87,10 @@ my ($fh1, $fh2);
 open($fh1, $file1) or die "Can't open $file1";
 open($fh2, $file2) or die "Can't open $file2";
 
+# print files to output so we know which is which
+print "-$file1\n";
+print "+$file2\n";
+
 # buffer of matching lines for pre-diff context
 my @precontext = ();
 # number of post-diff matching lines remaining to print