Changeset 5622

Timestamp:

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

Author:

goodell

Message:

Fix errhandler leaks in fileerrret, fileerrretx, and userioerr tests.

Reviewed by robl@.

Location:

mpich2/trunk/test/mpi

Files:

• errors/cxx/io/fileerrretx.cxx (modified) (1 diff)
• errors/io/fileerrret.c (modified) (1 diff)
• io/userioerr.c (modified) (2 diffs)

mpich2/trunk/test/mpi/errors/cxx/io/fileerrretx.cxx

@@ -67 +67 @@
     eh = MPI::File::Create_errhandler( efn );
     MPI::FILE_NULL.Set_errhandler( eh );
+    eh.Free();
     sawErr = 0;
     try {

mpich2/trunk/test/mpi/errors/io/fileerrret.c

@@ -47 +47 @@
     MPI_File_create_errhandler( efn, &eh );
     MPI_File_set_errhandler( MPI_FILE_NULL, eh );
+    MPI_Errhandler_free(&eh);
 
     rc = MPI_File_open(MPI_COMM_WORLD, filename, 

mpich2/trunk/test/mpi/io/userioerr.c

@@ -49 +49 @@
 
     rc = MPI_File_create_errhandler( user_handler, &ioerr_handler );
+    if (rc) {
+        errs++;
+        printf("MPI_Errhandler_create returned an error code: %d\n");
+    }
+
     rc = MPI_File_set_errhandler( fh, ioerr_handler );
+    if (rc) {
+        errs++;
+        printf("MPI_File_set_errhandler returned an error code: %d\n");
+    }
+
+    /* avoid leaking the errhandler, safe because they have refcount semantics */
+    rc = MPI_Errhandler_free(&ioerr_handler);
+    if (rc) {
+        errs++;
+        printf("MPI_Errhandler_free returned an error code: %d\n");
+    }
 
     /* This should generate an error because the file mode is WRONLY */
@@ -58 +74 @@
     }
 
-    MPI_File_close( &fh );
-    
+    rc = MPI_File_close( &fh );
+    if (rc) {
+        errs++;
+        printf("MPI_File_close returned an error code: %d\n");
+    }
+
     MTest_Finalize( errs );
     MPI_Finalize( );