From b0b5b34bfff8d3ac85825e56b5af130420c28e6f Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Mon, 23 Apr 2018 12:48:00 +0100
Subject: [PATCH] Hadrons: custom abort with module trace

---
 extras/Hadrons/Exceptions.cc    | 24 ++++++++++++++++++++++++
 extras/Hadrons/Exceptions.hpp   |  4 ++++
 extras/Hadrons/HadronsXmlRun.cc | 17 +----------------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/extras/Hadrons/Exceptions.cc b/extras/Hadrons/Exceptions.cc
index eedc03b1..e87181b2 100644
--- a/extras/Hadrons/Exceptions.cc
+++ b/extras/Hadrons/Exceptions.cc
@@ -27,6 +27,8 @@ See the full license in the file "LICENSE" in the top level distribution directo
 /*  END LEGAL */
 
 #include <Grid/Hadrons/Exceptions.hpp>
+#include <Grid/Hadrons/VirtualMachine.hpp>
+#include <Grid/Hadrons/Module.hpp>
 
 #ifndef ERR_SUFF
 #define ERR_SUFF " (" + loc + ")"
@@ -47,6 +49,7 @@ CONST_EXC(Definition, Logic("definition error: " + msg, loc))
 CONST_EXC(Implementation, Logic("implementation error: " + msg, loc))
 CONST_EXC(Range, Logic("range error: " + msg, loc))
 CONST_EXC(Size, Logic("size error: " + msg, loc))
+
 // runtime errors
 CONST_EXC(Runtime, runtime_error(msg + ERR_SUFF))
 CONST_EXC(Argument, Runtime("argument error: " + msg, loc))
@@ -55,3 +58,24 @@ CONST_EXC(Memory, Runtime("memory error: " + msg, loc))
 CONST_EXC(Parsing, Runtime("parsing error: " + msg, loc))
 CONST_EXC(Program, Runtime("program error: " + msg, loc))
 CONST_EXC(System, Runtime("system error: " + msg, loc))
+
+// abort functions
+void Grid::Hadrons::Exceptions::abort(const std::exception& e)
+{
+    auto &vm = VirtualMachine::getInstance();
+    int  mod = vm.getCurrentModule();
+
+    LOG(Error) << "FATAL ERROR -- Exception " << typeName(&typeid(e)) 
+               << std::endl;
+    if (mod >= 0)
+    {
+        LOG(Error) << "During execution of module '"
+                    << vm.getModuleName(mod) << "' (address " << mod << ")"
+                    << std::endl;
+    }
+    LOG(Error) << e.what() << std::endl;
+    LOG(Error) << "Aborting program" << std::endl;
+    Grid_finalize();
+
+    exit(EXIT_FAILURE);
+}
diff --git a/extras/Hadrons/Exceptions.hpp b/extras/Hadrons/Exceptions.hpp
index ce11618a..adf2340f 100644
--- a/extras/Hadrons/Exceptions.hpp
+++ b/extras/Hadrons/Exceptions.hpp
@@ -56,6 +56,7 @@ namespace Exceptions
     DECL_EXC(Implementation, Logic);
     DECL_EXC(Range, Logic);
     DECL_EXC(Size, Logic);
+
     // runtime errors
     DECL_EXC(Runtime, std::runtime_error);
     DECL_EXC(Argument, Runtime);
@@ -64,6 +65,9 @@ namespace Exceptions
     DECL_EXC(Parsing, Runtime);
     DECL_EXC(Program, Runtime);
     DECL_EXC(System, Runtime);
+
+    // abort functions
+    void abort(const std::exception& e);
 }
 
 END_HADRONS_NAMESPACE
diff --git a/extras/Hadrons/HadronsXmlRun.cc b/extras/Hadrons/HadronsXmlRun.cc
index 26e56f7d..6b613bb4 100644
--- a/extras/Hadrons/HadronsXmlRun.cc
+++ b/extras/Hadrons/HadronsXmlRun.cc
@@ -69,22 +69,7 @@ int main(int argc, char *argv[])
     }
     catch (const std::exception& e)
     {
-        auto &vm = VirtualMachine::getInstance();
-        int  mod = vm.getCurrentModule();
-
-        LOG(Error) << "FATAL ERROR -- Exception " << typeName(&typeid(e)) 
-                   << std::endl;
-                if (mod >= 0)
-        {
-            LOG(Error) << "During execution of module '"
-                       << vm.getModuleName(mod) << "' (address " << mod << ")"
-                       << std::endl;
-        }
-        LOG(Error) << e.what() << std::endl;
-        LOG(Error) << "Aborting program" << std::endl;
-        Grid_finalize();
-
-        return EXIT_FAILURE;
+        Exceptions::abort(e);
     }
     
     // epilogue