Changeset 13363

Timestamp:

09/13/12 13:46:14 (13 years ago)

Author:

Mathieu Morlighem

Message:

NEW: improved error message handle in python

Location:

issm/trunk-jpl/src/c

Files:

• python/include/python_macros.h (modified) (1 diff)
• shared/Exceptions/Exceptions.cpp (modified) (1 diff)
• shared/Exceptions/exceptions.h (modified) (1 diff)
• shared/TriMesh/TriMeshUtils.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/python/include/python_macros.h

@@ -20 +20 @@
 /*The following macros hide the error exception handling in a matlab module. Just put 
  * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions 
- * will be trapped. Really nifty!*/
+ * will be trapped*/
+#define MODULEBOOT(); \
+        PyObject *output = PyTuple_New(NLHS);        \
+        int       nrhs   = (int)PyTuple_Size(args);  \
+        if(!output) return NULL;\
+         try{ \
 
-#define MODULEBOOT(); ModuleBoot();  \
-        PyObject* output = PyTuple_New(NLHS); if (!output) return NULL;\
-                        int nrhs = (int)PyTuple_Size(args);
-
-#define MODULEEND();  ModuleEnd(); \
-                                                 return output;
+#define MODULEEND(); }\
+  catch(ErrorException &exception){\
+          PyErr_SetString(PyExc_TypeError,"ISSM Error"); \
+  } \
+        catch (exception &e){\
+                PyErr_SetString(PyExc_TypeError,exprintf("Standard exception: %s\n",e.what()));\
+        }\
+        catch(...){\
+                PyErr_SetString(PyExc_TypeError,"An unexpected error occurred");\
+        }\
+        return output;
 //}}}
 #if _PYTHON_MAJOR_ >=3

issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp

@@ -39 +39 @@
 }
 
-void ErrorException::Report(){
+void ErrorException::Report() const{
         extern int my_rank;
         extern int num_procs;

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

@@ -27 +27 @@
         ~ErrorException() throw();
         virtual const char *what() const throw();
-        void Report();
+        void Report() const;
 
 };

issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp

@@ -255 +255 @@
         int el1,el2;
 
-        double* segments=NULL;
-        double*    segmentmarkerlist=NULL;
+        double *segments          = NULL;
+        double *segmentmarkerlist = NULL;
         int     nsegs;
 
         /*Recover input: */
-        segments=*psegments;
-        segmentmarkerlist=*psegmentmarkerlist;
-        nsegs=*pnsegs;
+        segments          = *psegments;
+        segmentmarkerlist = *psegmentmarkerlist;
+        nsegs             = *pnsegs;
 
         /*Reallocate segments: */