summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2003-05-06 17:44:35 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2003-05-06 17:44:35 (GMT)
commitd30d2ba5b96baa7ee6c61652d6ce734f4979fbe6 (patch)
treec3921efbf2e8b7ba1843567e608675483bce4935
parent52ebd222175ca3b2f66edbd0b9406d73b79b6100 (diff)
downloadhdf5-d30d2ba5b96baa7ee6c61652d6ce734f4979fbe6.zip
hdf5-d30d2ba5b96baa7ee6c61652d6ce734f4979fbe6.tar.gz
hdf5-d30d2ba5b96baa7ee6c61652d6ce734f4979fbe6.tar.bz2
[svn-r6807] Purpose:
Change Description: Instead of using the "USE_GPFS" macro, use the "H5_HAVE_GPFS" macro which is defined during configuration and then use the new parameter to the H5P{get,set}_fapl_mpiposix functions to control if GPFS is enabled or not. Platforms tested: Modi4 (only affects the parallel stuff, so no need for full testing). Misc. update:
-rw-r--r--src/H5FDmpiposix.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c
index c11c4cc..f262c7a 100644
--- a/src/H5FDmpiposix.c
+++ b/src/H5FDmpiposix.c
@@ -42,17 +42,16 @@
#include "H5Pprivate.h" /*property lists */
/* Features:
- * USE_GPFS_HINTS -- issue gpfs_fcntl() calls to hopefully improve
+ * H5_HAVE_GPFS -- issue gpfs_fcntl() calls to hopefully improve
* performance when accessing files on a GPFS
* file system.
*
* REPORT_IO -- if set then report all POSIX file calls to stderr.
*
*/
-/* #define USE_GPFS_HINTS */
/* #define REPORT_IO */
-#ifdef USE_GPFS_HINTS
+#ifdef H5_HAVE_GPFS
# include <gpfs_fcntl.h>
#endif
@@ -774,7 +773,7 @@ H5FD_mpiposix_open(const char *name, unsigned flags, hid_t fapl_id,
if (MPI_SUCCESS != (mpi_code= MPI_Bcast(&sb, sizeof(h5_stat_t), MPI_BYTE, 0, comm_dup)))
HMPI_GOTO_ERROR(NULL, "MPI_Bcast failed", mpi_code);
-#ifdef USE_GPFS_HINTS
+#ifdef H5_HAVE_GPFS
if (fa->use_gpfs) {
/*
* Free all byte range tokens. This is a good thing to do if raw data is aligned on 256kB boundaries (a GPFS page is
@@ -796,7 +795,7 @@ H5FD_mpiposix_open(const char *name, unsigned flags, hid_t fapl_id,
if (gpfs_fcntl(fd, &hint)<0)
HGOTO_ERROR(H5E_FILE, H5E_FCNTL, NULL, "failed to send hints to GPFS");
}
-#endif
+#endif /* H5_HAVE_GPFS */
/* Build the file struct and initialize it */
if (NULL==(file=H5MM_calloc(sizeof(H5FD_mpiposix_t))))
@@ -1320,7 +1319,7 @@ H5FD_mpiposix_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
if (0==file->naccess++) {
/* First write access to this file */
-#ifdef USE_GPFS_HINTS
+#ifdef H5_HAVE_GPFS
if (file->use_gpfs) {
struct {
gpfsFcntlHeader_t hdr;
@@ -1339,7 +1338,7 @@ H5FD_mpiposix_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
if (gpfs_fcntl(file->fd, &hint)<0)
HGOTO_ERROR(H5E_FILE, H5E_FCNTL, NULL, "failed to send hints to GPFS");
}
-#endif /* USE_GPFS_HINTS */
+#endif /* H5_HAVE_GPFS */
}
/* Seek to the correct location */