[svn-r5481] Description:

    Renamed pio_info_g as h5_io_info_g to better reflect its
    general purpose.
Platforms tested:
    eirene(pp)

4 files changed, 12 insertions, 12 deletions

diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 49104bc..fabb1ac 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -152,7 +152,7 @@ do_pio(parameters param)
 
     /* debug */
     if (pio_debug_level>=4) {
-	h5_dump_info_object(pio_info_g);
+	h5_dump_info_object(h5_io_info_g);
     }
 
     /* IO type */
@@ -1011,9 +1011,9 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
 
     case MPIO:
         if (flags & (PIO_CREATE | PIO_WRITE)) {
-            MPI_File_delete(fname, pio_info_g);
+            MPI_File_delete(fname, h5_io_info_g);
             mrc = MPI_File_open(pio_comm_g, fname, MPI_MODE_CREATE | MPI_MODE_RDWR,
-                                pio_info_g, &fd->mpifd);
+                                h5_io_info_g, &fd->mpifd);
 
             if (mrc != MPI_SUCCESS) {
                 fprintf(stderr, "MPI File Open failed(%s)\n", fname);
@@ -1030,7 +1030,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
             }
         } else {
             mrc = MPI_File_open(pio_comm_g, fname, MPI_MODE_RDONLY,
-                                pio_info_g, &fd->mpifd);
+                                h5_io_info_g, &fd->mpifd);
 
             if (mrc != MPI_SUCCESS) {
                 fprintf(stderr, "MPI File Open failed(%s)\n", fname);
@@ -1048,7 +1048,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
         }
 
         /* Set the file driver to the MPI-I/O driver */
-        hrc = H5Pset_fapl_mpio(acc_tpl, pio_comm_g, pio_info_g);     
+        hrc = H5Pset_fapl_mpio(acc_tpl, pio_comm_g, h5_io_info_g);     
         if (hrc < 0) {
             fprintf(stderr, "HDF5 Property List Set failed\n");
             GOTOERROR(FAIL);
@@ -1166,7 +1166,7 @@ do_cleanupfile(iotype iot, char *fname)
             break;
         case MPIO:
         case PHDF5:
-            MPI_File_delete(fname, pio_info_g);
+            MPI_File_delete(fname, h5_io_info_g);
             break;
         }
     }
diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index 08bd67a..2f8e7bb 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -958,7 +958,7 @@ report_parameters(struct options *opts)
     }
 
     HDfprintf(output, "rank %d: ", rank);
-    h5_dump_info_object(pio_info_g);
+    h5_dump_info_object(h5_io_info_g);
     HDfprintf(output, "\n");
 }
 
diff --git a/test/h5test.c b/test/h5test.c
index e227709..c6382dc 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -61,7 +61,7 @@
 #endif
 char	*paraprefix = NULL;	/* for command line option para-prefix */
 #ifdef H5_HAVE_PARALLEL
-MPI_Info    pio_info_g=MPI_INFO_NULL;/* MPI INFO object to run the PIO  */
+MPI_Info    h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */
 #endif
 
 /*
@@ -603,8 +603,8 @@ h5_set_info_object(void)
 	envp = HDstrdup(envp);
 
 	/* create an INFO object if not created yet */
-	if (pio_info_g==MPI_INFO_NULL)
-	    MPI_Info_create (&pio_info_g);
+	if (h5_io_info_g==MPI_INFO_NULL)
+	    MPI_Info_create (&h5_io_info_g);
 
 	/* parse only one setting.  Need to extend it to handle multiple */
 	/* settings.  LATER */
@@ -613,7 +613,7 @@ h5_set_info_object(void)
 	if (valp != NULL){
 	    /* change '=' to NULL, move valp down one */
 	    *valp++ = NULL;
-	    if (MPI_SUCCESS!=MPI_Info_set(pio_info_g, namep, valp)){
+	    if (MPI_SUCCESS!=MPI_Info_set(h5_io_info_g, namep, valp)){
 		printf("MPI_Info_set failed\n");
 		ret_value = -1;
 	    }
diff --git a/test/h5test.h b/test/h5test.h
index 695199c..6cf7277 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -27,7 +27,7 @@
  */
 extern char *paraprefix;
 #ifdef H5_HAVE_PARALLEL
-extern MPI_Info pio_info_g;         /* MPI INFO object to run the PIO */
+extern MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
 #endif
 
 /*