From 52ebd222175ca3b2f66edbd0b9406d73b79b6100 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Tue, 6 May 2003 12:43:42 -0500 Subject: [svn-r6806] Purpose: Bug Fix Description: When I changed the H5P{set,get}_fapl_mpiposix functions to accept another parameter, I didn't change it in these files. Solution: Added the new "use_gpfs" parameter. Platforms tested: Modi4 (only affects the parallel stuff, so no need for full testing). Misc. update: --- perform/benchpar.c | 7 ++++--- perform/pio_engine.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/perform/benchpar.c b/perform/benchpar.c index 86f6526..5253263 100644 --- a/perform/benchpar.c +++ b/perform/benchpar.c @@ -76,8 +76,9 @@ static hid_t create_fcpl(void) /* Create & initialize file access property list with appropriate properties */ static hid_t create_fapl(MPI_Comm comm, MPI_Info info, int acc_type ) { - hid_t fapl; /* File access property list */ - herr_t ret; /* Generic return value */ + hid_t fapl; /* File access property list */ + hbool_t use_gpfs = FALSE; /* Use GPFS hints */ + herr_t ret; /* Generic return value */ fapl = H5Pcreate (H5P_FILE_ACCESS); assert(fapl>0); @@ -90,7 +91,7 @@ static hid_t create_fapl(MPI_Comm comm, MPI_Info info, int acc_type ) /* set parallel access with communicator, using MPI-posix driver */ if (acc_type == FACC_MPIPOSIX) { - ret = H5Pset_fapl_mpiposix(fapl, comm); + ret = H5Pset_fapl_mpiposix(fapl, comm, use_gpfs); assert(ret>=0); } /* end if */ diff --git a/perform/pio_engine.c b/perform/pio_engine.c index 8af34a1..b78dfd7 100644 --- a/perform/pio_engine.c +++ b/perform/pio_engine.c @@ -1455,7 +1455,8 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) { int ret_code = SUCCESS, mrc; herr_t hrc; - hid_t acc_tpl = -1; /* file access templates */ + hid_t acc_tpl = -1; /* file access templates */ + hbool_t use_gpfs = FALSE; /* use GPFS hints */ switch (param->io_type) { case POSIXIO: @@ -1523,7 +1524,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) /* Use the appropriate VFL driver */ if(param->h5_use_mpi_posix) { /* Set the file driver to the MPI-posix driver */ - hrc = H5Pset_fapl_mpiposix(acc_tpl, pio_comm_g); + hrc = H5Pset_fapl_mpiposix(acc_tpl, pio_comm_g, use_gpfs); if (hrc < 0) { fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); -- cgit v0.12