diff options
| -rw-r--r-- | base/pollevent.cc | 4 | ||||
| -rw-r--r-- | base/trace.hh | 2 | ||||
| -rwxr-xr-x | util/rundiff | 4 |
3 files changed, 7 insertions, 3 deletions
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 |