From 6d324c0f3e11a9cadba211183db5b0a741758e0a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Wed, 17 Jun 2009 13:51:48 +0100
Subject: [PATCH] sigfpe message in header

---
 src/OSspecific/POSIX/signals/sigFpe.C  | 14 +++++++++++++-
 src/OSspecific/POSIX/signals/sigFpe.H  |  2 +-
 src/OSspecific/POSIX/signals/sigInt.C  |  2 +-
 src/OSspecific/POSIX/signals/sigInt.H  |  2 +-
 src/OSspecific/POSIX/signals/sigQuit.C |  2 +-
 src/OSspecific/POSIX/signals/sigQuit.H |  2 +-
 src/OSspecific/POSIX/signals/sigSegv.C |  2 +-
 src/OSspecific/POSIX/signals/sigSegv.H |  2 +-
 src/OpenFOAM/global/argList/argList.C  |  8 ++++----
 9 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/OSspecific/POSIX/signals/sigFpe.C b/src/OSspecific/POSIX/signals/sigFpe.C
index 813364d366..bdcc1d08bd 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.C
+++ b/src/OSspecific/POSIX/signals/sigFpe.C
@@ -177,7 +177,7 @@ Foam::sigFpe::~sigFpe()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::sigFpe::set()
+void Foam::sigFpe::set(const bool verbose)
 {
     if (oldAction_.sa_handler)
     {
@@ -190,6 +190,12 @@ void Foam::sigFpe::set()
 
     if (env("FOAM_SIGFPE"))
     {
+        if (verbose)
+        {
+            Info<< "SigFpe : Enabling floating point exception trapping"
+                << " (FOAM_SIGFPE)." << endl;
+        }
+
 #       ifdef LINUX_GNUC
 
         feenableexcept
@@ -240,6 +246,12 @@ void Foam::sigFpe::set()
 
     if (env("FOAM_SETNAN"))
     {
+        if (verbose)
+        {
+            Info<< "SetNaN : Initialising allocated memory to NaN"
+                << " (FOAM_SETNAN)." << endl;
+        }
+
 #       ifdef LINUX_GNUC
 
         // Set our malloc
diff --git a/src/OSspecific/POSIX/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H
index 6d9fe7623c..46755873de 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.H
+++ b/src/OSspecific/POSIX/signals/sigFpe.H
@@ -107,7 +107,7 @@ public:
 
     // Member functions
 
-        void set();
+        void set(const bool verbose);
 };
 
 
diff --git a/src/OSspecific/POSIX/signals/sigInt.C b/src/OSspecific/POSIX/signals/sigInt.C
index 922374fa73..1f3555ec87 100644
--- a/src/OSspecific/POSIX/signals/sigInt.C
+++ b/src/OSspecific/POSIX/signals/sigInt.C
@@ -81,7 +81,7 @@ Foam::sigInt::~sigInt()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::sigInt::set()
+void Foam::sigInt::set(const bool verbose)
 {
     if (oldAction_.sa_handler)
     {
diff --git a/src/OSspecific/POSIX/signals/sigInt.H b/src/OSspecific/POSIX/signals/sigInt.H
index 49cf7ea41e..1f89c47f97 100644
--- a/src/OSspecific/POSIX/signals/sigInt.H
+++ b/src/OSspecific/POSIX/signals/sigInt.H
@@ -78,7 +78,7 @@ public:
 
     // Member functions
 
-        void set();
+        void set(const bool verbose);
 };
 
 
diff --git a/src/OSspecific/POSIX/signals/sigQuit.C b/src/OSspecific/POSIX/signals/sigQuit.C
index 890d4d3430..7c67c903bc 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.C
+++ b/src/OSspecific/POSIX/signals/sigQuit.C
@@ -83,7 +83,7 @@ Foam::sigQuit::~sigQuit()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::sigQuit::set()
+void Foam::sigQuit::set(const bool verbose)
 {
     if (oldAction_.sa_handler)
     {
diff --git a/src/OSspecific/POSIX/signals/sigQuit.H b/src/OSspecific/POSIX/signals/sigQuit.H
index c130416a68..23890cc6db 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.H
+++ b/src/OSspecific/POSIX/signals/sigQuit.H
@@ -78,7 +78,7 @@ public:
 
     // Member functions
 
-        void set();
+        void set(const bool verbose);
 };
 
 
diff --git a/src/OSspecific/POSIX/signals/sigSegv.C b/src/OSspecific/POSIX/signals/sigSegv.C
index 270a214619..14ab77ffe3 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.C
+++ b/src/OSspecific/POSIX/signals/sigSegv.C
@@ -83,7 +83,7 @@ Foam::sigSegv::~sigSegv()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::sigSegv::set()
+void Foam::sigSegv::set(const bool verbose)
 {
     if (oldAction_.sa_handler)
     {
diff --git a/src/OSspecific/POSIX/signals/sigSegv.H b/src/OSspecific/POSIX/signals/sigSegv.H
index 2c405c9565..5aae61de7d 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.H
+++ b/src/OSspecific/POSIX/signals/sigSegv.H
@@ -78,7 +78,7 @@ public:
 
     // Member functions
 
-        void set();
+        void set(const bool verbose);
 };
 
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 4a45b56f45..df69869394 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -526,10 +526,10 @@ Foam::argList::argList
 
     // Switch on signal trapping. We have to wait until after Pstream::init
     // since this sets up its own ones.
-    sigFpe_.set();
-    sigInt_.set();
-    sigQuit_.set();
-    sigSegv_.set();
+    sigFpe_.set(bannerEnabled);
+    sigInt_.set(bannerEnabled);
+    sigQuit_.set(bannerEnabled);
+    sigSegv_.set(bannerEnabled);
 
     if (Pstream::master() && bannerEnabled)
     {