Changeset 14914

Timestamp:

05/05/13 21:00:08 (12 years ago)

Author:

Eric.Larour

Message:

CHG: got rid of macros.h in src/c/include, and pushed the last remaining ones pertaining
to exception handling into src/c/shared/Exceptions/exception.h

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/DofIndexing.cpp (modified) (1 diff)
• classes/ToolkitOptions.cpp (modified) (1 diff)
• classes/bamg/include.h (modified) (1 diff)
• classes/gauss/GaussPenta.cpp (modified) (1 diff)
• classes/gauss/GaussTria.cpp (modified) (1 diff)
• classes/objects/Bucket.h (modified) (1 diff)
• include/include.h (modified) (1 diff)
• include/macros.h (deleted)
• io/Comm/IssmComm.cpp (modified) (1 diff)
• shared/Elements/PrintArrays.cpp (modified) (1 diff)
• shared/Exceptions/exceptions.h (modified) (2 diffs)
• shared/Numerics/Synchronize.sh (modified) (1 diff)
• shared/Numerics/Verbosity.cpp (modified) (1 diff)
• shared/Sorting/binary_search.cpp (modified) (1 diff)
• toolkits/issm/IssmAbsMat.h (modified) (1 diff)
• toolkits/issm/IssmAbsVec.h (modified) (1 diff)
• toolkits/issm/IssmDenseMat.h (modified) (1 diff)
• toolkits/issm/IssmMat.h (modified) (1 diff)
• toolkits/issm/IssmMpiDenseMat.h (modified) (1 diff)
• toolkits/issm/IssmMpiVec.h (modified) (1 diff)
• toolkits/issm/IssmSeqVec.h (modified) (1 diff)
• toolkits/issm/IssmToolkitUtils.cpp (modified) (1 diff)
• toolkits/issm/IssmVec.h (modified) (1 diff)
• toolkits/mumps/MpiDenseMumpsSolve.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -21 +21 @@
 core_sources = ./issm.h\
                                         ./issm-binding.h\
-                                        ./include/macros.h\
                                         ./include/typedefs.h\
                                         ./include/types.h\

issm/trunk-jpl/src/c/classes/DofIndexing.cpp ¶

@@ -15 +15 @@
 #include "../include/typedefs.h"
 #include "../io/Print/Print.h"
-#include "../include/macros.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"

issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp ¶

@@ -12 +12 @@
 #include "./ToolkitOptions.h"
 #include "../include/types.h"
-#include "../include/macros.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"

issm/trunk-jpl/src/c/classes/bamg/include.h ¶

@@ -6 +6 @@
 #define  _INCLUDE2_H_
 
-#include "../../include/macros.h"
 #include "./macros.h"
 #include "./typedefs.h"

issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp ¶

@@ -5 +5 @@
 #include "./GaussPenta.h"
 #include "./GaussTria.h"
-#include "../../include/macros.h"
 #include "../../io/Print/Print.h"
+#include "../../include/typedefs.h"
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"

issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp ¶

@@ -4 +4 @@
 
 #include "./GaussTria.h"
-#include "../../include/macros.h"
 #include "../../io/Print/Print.h"
 #include "../../shared/Exceptions/exceptions.h"

issm/trunk-jpl/src/c/classes/objects/Bucket.h ¶

@@ -10 +10 @@
 #include "./Object.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../Container/DataSet.h"
 #include "../../toolkits/toolkitsenums.h"

issm/trunk-jpl/src/c/include/include.h ¶

@@ -6 +6 @@
 #define  _INCLUDEGLOBAL_H_
 
-#include "./macros.h"
 #include "./typedefs.h"
 #include "./types.h"

issm/trunk-jpl/src/c/io/Comm/IssmComm.cpp ¶

@@ -11 +11 @@
 #include "./IssmComm.h"
 #include "../../include/types.h"
-#include "../../include/macros.h"
 #include "../../shared/Exceptions/exceptions.h"
 

issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp ¶

@@ -1 +1 @@
 
 #include "./elements.h"
-#include "../../include/macros.h"
 using namespace std;
 

issm/trunk-jpl/src/c/shared/Exceptions/exceptions.h ¶

@@ -7 +7 @@
  */
 
-#ifndef MY_EXCEPTIONS_H_
-#define MY_EXCEPTIONS_H_
+#ifndef _MY_EXCEPTIONS_H_
+#define _MY_EXCEPTIONS_H_
 
 #include <exception>
 #include <string>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+
 using namespace std;
 
-/*We derive our classes from the c++ exception class: */
-class ErrorException: public exception {
+#ifdef HAVE_CONFIG_H
+        #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+/*macros: */
+/* _assert_ {{{*/
+/*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
+#ifdef _ISSM_DEBUG_ 
+#define _assert_(statement)\
+  if (!(statement)) _error_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
+#else
+#define _assert_(ignore)\
+  ((void) 0)
+#endif
+/*}}}*/
+/* _error_ {{{*/
+/*new Error exception macro*/
+#ifdef _INTEL_WIN_
+#define _error_(StreamArgs)\
+   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
+   throw ErrorException(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
+#else
+#define _error_(StreamArgs)\
+        do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
+   throw ErrorException(__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
+#endif
+/*}}}*/
+/* ExceptionTrapBegin/ExceptionTrapEnd {{{*/
+
+/*The following macros hide the error exception handling in a matlab module. Just put 
+ * ExceptionTrapBegin(); and ExceptionTrapEnd(); at the beginning and end of a module, and c++ exceptions 
+ * will be trapped. Really nifty!*/
+
+#define ExceptionTrapBegin(); \
+        try{
+
+#define ExceptionTrapEnd(); }\
+        catch(ErrorException &exception){\
+                exception.Report();\
+                return 0;\
+        }\
+        catch (exception& e) {\
+                _printf_(true,"Standard exception: %s\n",e.what());\
+                return 0;\
+        }\
+        catch(...){\
+                _printf_(true,"An unexpected error occurred");\
+                return 0;\
+        }
+/*}}}*/
+
+/*ISSM exception class: */
+class ErrorException: public exception { /*{{{*/
 
         string   what_str;
@@ -32 +91 @@
 
 };
+/*}}}*/
 
 char* exprintf(const char* format,...);
+
 #endif
+
+

issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh ¶

@@ -27 +27 @@
 #endif
 #include "./Verbosity.h"
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 /*}}}*/

issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp ¶

@@ -16 +16 @@
 #endif
 #include "./Verbosity.h"
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 /*}}}*/

issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp ¶

@@ -9 +9 @@
 #endif
 
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 #include <stdio.h>

issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h ¶

@@ -21 +21 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "./IssmAbsVec.h"
 

issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h ¶

@@ -21 +21 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include <math.h>
 

issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h ¶

@@ -21 +21 @@
 #include "../../shared/MemOps/MemOps.h"
 #include "../../io/Print/Print.h"
-#include "../../include/macros.h"
 #include "../../toolkits/gsl/gslincludes.h"
 

issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h ¶

@@ -16 +16 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../classes/ToolkitOptions.h"
 #include "../../io/Comm/Comm.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h ¶

@@ -20 +20 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../Container/DataSet.h"
 #include "../../io/Comm/Comm.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h ¶

@@ -20 +20 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../io/io.h"
 #ifdef _HAVE_MPI_

issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h ¶

@@ -20 +20 @@
 #include "../../io/Print/Print.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include <math.h>
 

issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp ¶

@@ -13 +13 @@
 #include "../../shared/MemOps/MemOps.h"
 #include "../../io/Comm/Comm.h"
-#include "../../include/macros.h"
 #include "../../classes/ToolkitOptions.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h ¶

@@ -17 +17 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "./IssmToolkitUtils.h"
 #include <math.h>

issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp ¶

@@ -11 +11 @@
 
 #include "../../include/types.h"
-#include "../../include/macros.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Exceptions/exceptions.h"