Changeset 5626

Timestamp:

10/29/09 16:57:02 (4 weeks ago)

Author:

goodell

Message:

Fix errhandler leak in C++ introduced in r850.

The fix so that MPI::ERRORS_THROW_EXCEPTIONS actually throws (r850)
caused us to leak errhandlers in C++ when using Call_errhandler because
Get_errhandler (correctly) adds a reference to the errhandler that must
be released by calling Errhandler::Free.

Reviewed by robl@.

Files:

• mpich2/trunk/src/binding/cxx/buildiface (modified) (3 diffs)

mpich2/trunk/src/binding/cxx/buildiface

@@ -2529 +2529 @@
 void Comm::Call_errhandler( int errorcode ) const
 {
-    if (Get_errhandler() == ERRORS_THROW_EXCEPTIONS) {
+    // we must free the Errhandler object returned from Get_errhandler because
+    // Get_errhandler adds a reference (the MPI Standard says as though a new
+    // object were created)
+    Errhandler current = Get_errhandler();
+    if (current == ERRORS_THROW_EXCEPTIONS) {
+        current.Free();
         throw Exception(errorcode); // throw by value, catch by reference
+    }
+    else {
+        current.Free();
     }
     MPIX_CALL( MPI_Comm_call_errhandler( (MPI_Comm) the_real_comm, errorcode ));
@@ -2537 +2545 @@
 void Win::Call_errhandler( int errorcode ) const
 {
-    if (Get_errhandler() == ERRORS_THROW_EXCEPTIONS) {
+    // we must free the Errhandler object returned from Get_errhandler because
+    // Get_errhandler adds a reference (the MPI Standard says as though a new
+    // object were created)
+    Errhandler current = Get_errhandler();
+    if (current == ERRORS_THROW_EXCEPTIONS) {
+        current.Free();
         throw Exception(errorcode); // throw by value, catch by reference
+    }
+    else {
+        current.Free();
     }
     MPIX_CALL( MPI_Win_call_errhandler( (MPI_Win) the_real_win, errorcode ));
@@ -2546 +2562 @@
 void File::Call_errhandler( int errorcode ) const
 {
-    if (Get_errhandler() == ERRORS_THROW_EXCEPTIONS) {
+    // we must free the Errhandler object returned from Get_errhandler because
+    // Get_errhandler adds a reference (the MPI Standard says as though a new
+    // object were created)
+    Errhandler current = Get_errhandler();
+    if (current == ERRORS_THROW_EXCEPTIONS) {
+        current.Free();
         throw Exception(errorcode); // throw by value, catch by reference
+    }
+    else {
+        current.Free();
     }
     MPIX_CALL( MPI_File_call_errhandler( (MPI_File) the_real_file, errorcode ));