Changeset 13701

Timestamp:

10/16/12 14:37:32 (12 years ago)

Author:

Mathieu Morlighem

Message:

Better handling of matlab and python errors by putting error message directoy in mexErrTxt
Got rid of c/matlab/io/PrintfFunction.cpp
Initialize IssmComm for modules as -1 so that my_rank and num_proc are still defined

Location:

issm/trunk-jpl/src/c

Files:

• classes/IssmComm.cpp (modified) (1 diff)
• include/macros.h (modified) (2 diffs)
• matlab/include/matlab_macros.h (modified) (1 diff)
• matlab/io/PrintfFunction.cpp (deleted)
• python/include/python_macros.h (modified) (1 diff)
• shared/Exceptions/Exceptions.cpp (modified) (4 diffs)
• shared/Exceptions/exceptions.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/IssmComm.cpp

@@ -19 +19 @@
 }/*}}}*/
 int IssmComm::GetRank(){  /*{{{*/
-        int my_rank;
+        int my_rank = 0;
+
+        /*for matlab and python modules, comm == -1*/
+        if((int)comm==-1) return my_rank;
+
         #ifdef _HAVE_MPI_
         MPI_Comm_rank(comm,&my_rank);
-        #else
-        my_rank=0;
         #endif
+
         return my_rank;
 
 }/*}}}*/
 int IssmComm::GetSize(){  /*{{{*/
-        int size;
+
+        int size = 1;
+
+        /*for matlab and python modules, comm == -1*/
+        if((int)comm==-1) return size;
+
         #ifdef _HAVE_MPI_
         MPI_Comm_size(comm,&size);
-        #else
-        size=1;
         #endif
+
         return size;
 

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

@@ -23 +23 @@
 #define _printf_(flag,...) do{if(flag) PrintfFunction(__VA_ARGS__);}while(0)
 /*}}}*/
-/* _error2_ {{{*/
+/* _error_ {{{*/
 /*new Error exception macro*/
 #ifdef _INTEL_WIN_
@@ -82 +82 @@
 #define ExceptionTrapEnd(); }\
         catch(ErrorException &exception){\
-                exception.Report(); \
                 return 1;\
         }\

issm/trunk-jpl/src/c/matlab/include/matlab_macros.h

@@ -20 +20 @@
  * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions 
  * will be trapped*/
-#define MODULEBOOT(); try{ 
+#define MODULEBOOT(); try{ \
+        IssmComm::SetComm(-1);
 
 #define MODULEEND(); }\
         catch(ErrorException &exception){\
-                mexErrMsgTxt("ISSM Error"); \
+                mexErrMsgTxt(exception.MatlabReport()); \
         }\
         catch (exception &e){\

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

@@ -22 +22 @@
  * will be trapped*/
 #define MODULEBOOT(); \
-        PyObject *output = PyTuple_New(NLHS);        \
+        PyObject *output = PyTuple_New(NLHS); \
         int       nrhs   = (int)PyTuple_Size(args);  \
         if(!output) return NULL;\
-         try{ \
+        try{ \
+        IssmComm::SetComm(-1);
 
 #define MODULEEND(); }\
   catch(ErrorException &exception){\
-          PyErr_SetString(PyExc_TypeError,"ISSM Error"); \
+          PyErr_SetString(PyExc_TypeError,exception.PythonReport()); \
           return NULL;\
   } \

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

@@ -12 +12 @@
 #include "../../include/include.h"
 
-ErrorException::ErrorException(const string &what_arg){
+ErrorException::ErrorException(const string &what_arg){/*{{{*/
 
         what_str=what_arg;
@@ -18 +18 @@
         function_name="";
         file_line=0;
-}
-
-ErrorException::ErrorException(const string& what_file, const string& what_function,int what_line, const string& what_arg){
+}/*}}}*/
+ErrorException::ErrorException(const string& what_file, const string& what_function,int what_line, const string& what_arg){/*{{{*/
 
         what_str=what_arg;
@@ -26 +25 @@
         function_name=what_function;
         file_line=what_line;
-}
-
-ErrorException::~ErrorException() throw(){
-
-        int num_procs;
-
-        /*recover num_procs:*/
-        num_procs=IssmComm::GetSize();
-
-        /*We want the report only for matlab modules, otherwise we get twice the report
-         * We assume that if num_procs==1, it is a module (FIXME)*/
-        if(num_procs==1) this->Report();
-}
-
-const char* ErrorException::what() const throw(){
+}/*}}}*/
+ErrorException::~ErrorException() throw(){/*{{{*/
+}/*}}}*/
+const char* ErrorException::what() const throw(){/*{{{*/
         return what_str.c_str();
-}
-
-void ErrorException::Report() const{
+}/*}}}*/
+void ErrorException::Report() const{/*{{{*/
 
         int my_rank;
@@ -58 +45 @@
         else{
                 if(num_procs==1){
-                        _printLine_("\n??? Error using ==> " << file_name.c_str() << ":" << file_line);
+                        _printLine_("\n??? Error in ==> " << file_name.c_str() << ":" << file_line);
                         _printLine_(function_name.c_str() << " error message: " << what() << "\n");
                 }
                 else{
                         _printLine_("\n[" << my_rank<< "] ??? Error using ==> " << file_name.c_str() << ":" << file_line);
-                        _printLine_("[" << my_rank << "] " << function_name.c_str() << " error message: " << what() << "\n");
+                        _printLine_(  "[" << my_rank << "] " << function_name.c_str() << " error message: " << what() << "\n");
                 }
         }
         return;
-}
+}/*}}}*/
+const char* ErrorException::MatlabReport() const{/*{{{*/
+
+        /*Output*/
+        std::ostringstream buffer;
+
+        if (this->file_line==0){ //WINDOWS
+                 buffer << " error message: " << (this->what_str).c_str();
+        }
+        else{
+                buffer << "\nError in ==> " << (this->file_name).c_str() << ":" << file_line << "\n";
+                buffer << (this->function_name).c_str() << " error message: " << (this->what_str).c_str();
+        }
+
+        return buffer.str().c_str();
+}/*}}}*/
+const char* ErrorException::PythonReport() const{/*{{{*/
+
+        /*Output*/
+        std::ostringstream buffer;
+
+        if (this->file_line==0){ //WINDOWS
+                buffer << " error message: " << (this->what_str).c_str();
+        }
+        else{
+                buffer << "\nError in ==> " << (this->file_name).c_str() << ":" << file_line << "\n";
+                buffer << (this->function_name).c_str() << " error message: " << (this->what_str).c_str();
+        }
+
+        return buffer.str().c_str();
+}/*}}}*/

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

@@ -28 +28 @@
         virtual const char *what() const throw();
         void Report() const;
+        const char* MatlabReport() const;
+        const char* PythonReport() const;
 
 };