summaryrefslogtreecommitdiffstats
path: root/src/H5Fistore.c
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>1999-12-17 14:37:22 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>1999-12-17 14:37:22 (GMT)
commit2c7bbf697f56815d82c298e1103870daebe298c3 (patch)
tree1df07bb74e8d7f53bdb1c931a35b40eec27bcf67 /src/H5Fistore.c
parent36c94d90182b5740742aff9d15edc430520e2c71 (diff)
downloadhdf5-2c7bbf697f56815d82c298e1103870daebe298c3.zip
hdf5-2c7bbf697f56815d82c298e1103870daebe298c3.tar.gz
hdf5-2c7bbf697f56815d82c298e1103870daebe298c3.tar.bz2
[svn-r1881] Changed all the HAVE_PARALLEL and HAVE_GASS macros to the new
form of H5_HAVE_PARALLEL and H5_HAVE_GASS.
Diffstat (limited to 'src/H5Fistore.c')
-rw-r--r--src/H5Fistore.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index a5bbac7..a7c7a8a 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -121,7 +121,7 @@ static herr_t H5F_istore_encode_key(H5F_t *f, H5B_t *bt, uint8_t *raw,
void *_key);
static herr_t H5F_istore_debug_key(FILE *stream, intn indent, intn fwidth,
const void *key, const void *udata);
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
static herr_t H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout,
const hssize_t offset[],
void *_udata/*out*/);
@@ -1669,7 +1669,7 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
sub_offset_m[i] = chunk_offset[i] + offset_wrt_chunk[i] +
offset_m[i] - offset_f[i];
}
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
/*
* If MPIO is used, must bypass the chunk-cache scheme because other
* MPI processes could be writing to other elements in the same chunk.
@@ -1727,7 +1727,7 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
"unable to unlock raw data chunk");
}
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
}
#endif
@@ -1843,7 +1843,7 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
offset_m[i] - offset_f[i];
}
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
/*
* If MPIO is used, must bypass the chunk-cache scheme because other
* MPI processes could be writing to other elements in the same chunk.
@@ -1902,7 +1902,7 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
"uanble to unlock raw data chunk");
}
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
}
#endif
@@ -2146,7 +2146,7 @@ H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent,
*
*-------------------------------------------------------------------------
*/
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
static herr_t
H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout,
const hssize_t offset[], void *_udata/*out*/)
@@ -2174,7 +2174,7 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout,
FUNC_LEAVE (FAIL);
}
-#endif /* HAVE_PARALLEL */
+#endif /* H5_HAVE_PARALLEL */
/*-------------------------------------------------------------------------
@@ -2272,7 +2272,7 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
* chunk.
*/
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
/* rky 981207 Serialize access to this critical region. */
if (SUCCEED!=
H5FD_mpio_wait_for_left_neighbor(f->shared->lf)) {
@@ -2292,7 +2292,7 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
"uanble to unlock raw data chunk");
}
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
if (SUCCEED!=
H5FD_mpio_signal_right_neighbor(f->shared->lf)) {
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
@@ -2320,7 +2320,7 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
if (carry) break;
}
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
/*
* rky 980923
*