Changeset 850

Timestamp:

04/14/08 17:03:38 (20 months ago)

Author:

goodell

Message:

Fix for req#3999. MPI::{Comm,Win,File}::Call_errhandler now does the right
thing for MPI::ERRORS_THROW_EXCEPTIONS. Also, beef up the test a bit.

Location:

mpich2/trunk

Files:

• src/binding/cxx/buildiface (modified) (9 diffs)
• src/include/mpi.h.in (modified) (1 diff)
• src/mpi/errhan/errutil.c (modified) (1 diff)
• test/mpi/errors/cxx/errhan/throwtest.cxx (modified) (2 diffs)

mpich2/trunk/src/binding/cxx/buildiface

@@ -406 +406 @@
 #                   'Create_keyval' => 'int',
                     'Free_keyval' =>  'static:0:1',
-                    'Call_errhandler' => 0,
+# this routine is special and cannot be auto-generated
+#                   'Call_errhandler' => 0,
                     'Set_name' => '0:2',
                     'Get_name' => '0:3',
@@ -526 +527 @@
                    'Get_errhandler' => 'MPI_Errhandler',
                    'Set_errhandler' => 0,
-                   'Call_errhandler' => 0,
+                   # this routine is special and cannot be autogenerated
+                   #'Call_errhandler' => 0,
                    );           
 #     %class_mpi2file = ( 
@@ -590 +592 @@
                     'Fence' => '0', 
                     'Get_group' => 'MPI_Group',
-                    'Call_errhandler' => 0,
+                    # this routine is special and cannot be auto-generated
+                    #'Call_errhandler' => 0,
                     'Get_attr' => '0',
                     'Start' => '0',
@@ -1731 +1734 @@
         # Errors_return is not quite right for errors-throw-exceptions,
         # but it is close.
-        print $OUTFD "const Errhandler ERRORS_THROW_EXCEPTIONS(MPI_ERRORS_RETURN);\n";
+        print $OUTFD "const Errhandler ERRORS_THROW_EXCEPTIONS(MPI_ERRORS_THROW_EXCEPTIONS);\n";
     }
     else {
@@ -2339 +2342 @@
     return e1;
 }
+
+
+// Call_errhandler implementations.  These sadly must contain a bit of logic to
+// cover the ERRORS_THROW_EXCEPTIONS case.
+void Comm::Call_errhandler( int errorcode ) const
+{
+    if (Get_errhandler() == ERRORS_THROW_EXCEPTIONS) {
+        throw Exception(errorcode); // throw by value, catch by reference
+    }
+    MPIX_CALL( MPI_Comm_call_errhandler( (MPI_Comm) the_real_comm, errorcode ));
+}
+
+void Win::Call_errhandler( int errorcode ) const
+{
+    if (Get_errhandler() == ERRORS_THROW_EXCEPTIONS) {
+        throw Exception(errorcode); // throw by value, catch by reference
+    }
+    MPIX_CALL( MPI_Win_call_errhandler( (MPI_Win) the_real_win, errorcode ));
+}
+
+void File::Call_errhandler( int errorcode ) const
+{
+    if (Get_errhandler() == MPI_ERRORS_THROW_EXCEPTIONS) {
+        throw Exception(errorcode); // throw by value, catch by reference
+    }
+    MPIX_CALL( MPI_File_call_errhandler( (MPI_File) the_real_file, errorcode ));
+}
+
 \n";
 
@@ -2602 +2633 @@
 # Add the routine to initialize MPI datatype names for the C++ datatypes
 print $OUTFD "
+/* MT FIXME: this is not thread-safe */
 void MPIR_CXX_InitDatatypeNames( void )
 {
@@ -3056 +3088 @@
     *(void **)attr_out = attr_in; return 0;} 
     static Errhandler Create_errhandler( Errhandler_fn * );
+    virtual void Call_errhandler( int errcode ) const;
 \n";
 }
@@ -3066 +3099 @@
 
     static Errhandler Create_errhandler( Errhandler_fn * );
+    virtual void Call_errhandler( int errcode ) const;
 \n";
 }
@@ -3076 +3110 @@
 
     static Errhandler Create_errhandler( Errhandler_fn * );
+    virtual void Call_errhandler( int errcode ) const;
 
     typedef int Copy_attr_function(const Win& oldwin, int win_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, bool& flag); 

mpich2/trunk/src/include/mpi.h.in

@@ -211 +211 @@
 #define MPI_ERRORS_ARE_FATAL ((MPI_Errhandler)0x54000000)
 #define MPI_ERRORS_RETURN    ((MPI_Errhandler)0x54000001)
-      /* #define MPIR_ERRORS_WARN     ((MPI_Errhandler)0x54000002) */
+/* MPI_ERRORS_THROW_EXCEPTIONS is not part of the MPI standard, it is here to
+   facilitate the c++ binding which has MPI::ERRORS_THROW_EXCEPTIONS. */
+#define MPI_ERRORS_THROW_EXCEPTIONS ((MPI_Errhandler)0x54000002)
 typedef int MPI_Errhandler;
 

mpich2/trunk/src/mpi/errhan/errutil.c

@@ -113 +113 @@
 
 /* Preallocated errorhandler objects */
-MPID_Errhandler MPID_Errhandler_builtin[2] = 
+MPID_Errhandler MPID_Errhandler_builtin[3] = 
           { { MPI_ERRORS_ARE_FATAL, 0},
-            { MPI_ERRORS_RETURN, 0} }; 
+            { MPI_ERRORS_RETURN, 0},
+            { MPI_ERRORS_THROW_EXCEPTIONS, 0} }; 
 MPID_Errhandler MPID_Errhandler_direct[MPID_ERRHANDLER_PREALLOC] = { {0} };
 MPIU_Object_alloc_t MPID_Errhandler_mem = { 0, 0, 0, 0, MPID_ERRHANDLER, 

mpich2/trunk/test/mpi/errors/cxx/errhan/throwtest.cxx

@@ -13 +13 @@
 /* #define VERBOSE */
 
+/* returns number of errors found */
+template <class T>
+int testCallErrhandler(T &obj, int errorClass, int errorCode, std::string errorString)
+{
+    int errs = 0;
+
+    try {
+        obj.Call_errhandler(errorCode);
+        std::cerr << "Do Not See This" << std::endl;
+        errs++;
+    }
+    catch (MPI::Exception &ex) {
+#ifdef VERBOSE
+        std::cerr << "MPI Exception: " << ex.Get_error_string() << std::endl;
+#endif
+        if (ex.Get_error_code() != errorCode) {
+            std::cout << "errorCode does not match" << std::endl;
+            errs++;
+        }
+        if (ex.Get_error_class() != errorClass) {
+            std::cout << "errorClass does not match" << std::endl;
+            errs++;
+        }
+        if (ex.Get_error_string() != errorString) {
+            std::cout << "errorString does not match" << std::endl;
+            errs++;
+        }
+    }
+    catch (...) {
+        std::cerr << "Caught Unknown Exception" << std::endl;
+        errs++;
+    }
+
+    return errs;
+}
+
 int main( int argc, char *argv[] )
 {
     int errs = 0;
-  
+    MPI::Win win = MPI::WIN_NULL;
+    MPI::File file = MPI::FILE_NULL;
+
     MPI::Init();
 
@@ -23 +61 @@
     int errorClass = MPI::Add_error_class();
     int errorCode = MPI::Add_error_code(errorClass);
-    MPI::Add_error_string(errorCode, "Internal-use Error Code");
+    std::string errorString = "Internal-use Error Code";
+    MPI::Add_error_string(errorCode, errorString.c_str());
+
+    win = MPI::Win::Create(NULL, 0, 1, MPI::INFO_NULL, MPI_COMM_WORLD);
+    file = MPI::File::Open(MPI::COMM_WORLD, "testfile", MPI::MODE_WRONLY | MPI::MODE_CREATE | MPI::MODE_DELETE_ON_CLOSE, MPI::INFO_NULL);
 
     MPI::COMM_WORLD.Set_errhandler(MPI::ERRORS_THROW_EXCEPTIONS);
-    
-    try {
-      if (rank == 0) {
-        MPI::COMM_WORLD.Call_errhandler(errorCode);
-        std::cerr << "Do Not See This\n";
-        errs++;
-      }
-    }
-    catch (MPI::Exception ex) {
-#ifdef VERBOSE
-    std::cerr << "MPI Exception: " << ex.Get_error_string() << std::endl;
-#endif
-    }
-    catch (...) {
-      std::cerr << "Caught Unknown Exception\n";
-      errs++;
+    win.Set_errhandler(MPI::ERRORS_THROW_EXCEPTIONS);
+    file.Set_errhandler(MPI::ERRORS_THROW_EXCEPTIONS);
+
+    if (0 == rank) {
+        errs += testCallErrhandler(MPI::COMM_WORLD, errorClass, errorCode, errorString);
+        errs += testCallErrhandler(win,             errorClass, errorCode, errorString);
+        errs += testCallErrhandler(file,            errorClass, errorCode, errorString);
     }
 
     if (errs == 0) {
-      std::cout << " No Errors" << std::endl;
+        std::cout << " No Errors" << std::endl;
     }
     else {
-      std::cout << " Found " << errs << " errors" << std::endl;
+        std::cout << " Found " << errs << " errors" << std::endl;
     }