Changeset 5624

Timestamp:

10/29/09 16:56:59 (4 weeks ago)

Author:

goodell

Message:

Fix MPI_File errhandler leak.

Prior to this commit we only released references to the previously set file
errhandler in MPI_File_set_errhandler if the newly set errhandler was *not*
builtin. This resulted in an errhandler object leak if a user-defined
errhandler was set and then a predefined errhandler was set afterwards.

Reviewed by robl@.

Files:

• mpich2/trunk/src/mpi/errhan/file_set_errhandler.c (modified) (2 diffs)

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

@@ -104 +104 @@
 
     /* ... body of routine ...  */
-    if (HANDLE_GET_KIND(errhandler) != HANDLE_KIND_BUILTIN) {
-        MPIR_ROMIO_Get_file_errhand( file, &old_errhandler );
-        if (!old_errhandler) {
-            MPID_Errhandler_get_ptr( MPI_ERRORS_RETURN, old_errhandler_ptr );
-        }
-        else {
-            MPID_Errhandler_get_ptr( old_errhandler, old_errhandler_ptr );
-        }
-
-        if (old_errhandler_ptr) {
-            MPIR_Errhandler_release_ref(old_errhandler_ptr,&in_use);
-            if (!in_use) {
-                MPID_Errhandler_free( old_errhandler_ptr );
-            }
-        }
+    MPIR_ROMIO_Get_file_errhand( file, &old_errhandler );
+    if (!old_errhandler) {
+        /* MPI_File objects default to the errhandler set on MPI_FILE_NULL
+         * at file open time, or MPI_ERRORS_RETURN if no errhandler is set
+         * on MPI_FILE_NULL. (MPI-2.2, sec 13.7) */
+        MPID_Errhandler_get_ptr( MPI_ERRORS_RETURN, old_errhandler_ptr );
+    }
+    else {
+        MPID_Errhandler_get_ptr( old_errhandler, old_errhandler_ptr );
+    }
+
+    if (old_errhandler_ptr) {
+        MPIR_Errhandler_release_ref(old_errhandler_ptr,&in_use);
+        if (!in_use) {
+            MPID_Errhandler_free( old_errhandler_ptr );
+        }
     }
 
@@ -130 +131 @@
 #endif
 #endif
-    
+
     /* ... end of body of routine ... */