summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2003-12-17 09:43:03 -0800
committerSteve Reinhardt <stever@eecs.umich.edu>2003-12-17 09:43:03 -0800
commitd5a187dd5a38771d72e6a52bd9a6891eb76fe8f4 (patch)
tree5cc8f02b9cc1df728f14e1d16c0897f819d3e2ea /base
parent16021aa4363bff23f9ab5db82c34b42f17c0a0da (diff)
downloadgem5-d5a187dd5a38771d72e6a52bd9a6891eb76fe8f4.tar.xz
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
Diffstat (limited to 'base')
-rw-r--r--base/pollevent.cc4
-rw-r--r--base/trace.hh2
2 files changed, 3 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