summaryrefslogtreecommitdiffstats
path: root/src/H5D.c
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>1998-07-13 05:31:12 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>1998-07-13 05:31:12 (GMT)
commit46cb3388eaf13420e06ae7319291e19b712f69dc (patch)
tree6481b8d2d888a40d4f85792ca298030fce3d88f9 /src/H5D.c
parentff17db8aefe295e835d1a1497ab5fbc8c93bb5a2 (diff)
downloadhdf5-46cb3388eaf13420e06ae7319291e19b712f69dc.zip
hdf5-46cb3388eaf13420e06ae7319291e19b712f69dc.tar.gz
hdf5-46cb3388eaf13420e06ae7319291e19b712f69dc.tar.bz2
[svn-r482] Cleanup some code for final alpha-2 release.
Allocate chunks only if MPIO is used. Do not attempt to run H5D_allocate if H5D_extend does not change anything.
Diffstat (limited to 'src/H5D.c')
-rw-r--r--src/H5D.c47
1 files changed, 27 insertions, 20 deletions
diff --git a/src/H5D.c b/src/H5D.c
index b44d8f4..562d8fa 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1099,13 +1099,16 @@ H5D_open(H5G_t *loc, const char *name)
#ifdef HAVE_PARALLEL
/*
* If the dataset uses chunk storage and is accessed via
- * parallel I/O, allocate file space for all chunks now.
+ * parallel I/O, and file is open writable,
+ * allocate file space for chunks that have not been
+ * allocated in its "previous access".
*/
- if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO &&
- dataset->layout.type == H5D_CHUNKED){
+ if (dataset->ent.file->shared->access_parms->driver==H5F_LOW_MPIO &&
+ dataset->layout.type == H5D_CHUNKED &&
+ (f->intent & H5F_ACC_RDWR)){
if (H5D_allocate(dataset)==FAIL){
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL,
- "fail in file space allocation for chunks");
+ "fail in file space allocation dataset");
}
}
#endif /* HAVE_PARALLEL */
@@ -1890,25 +1893,27 @@ H5D_extend (H5D_t *dataset, const hsize_t *size)
}
/* Save the new dataspace in the file if necessary */
- if (changed>0 &&
- H5S_modify (&(dataset->ent), space)<0) {
- HGOTO_ERROR (H5E_DATASET, H5E_WRITEERROR, FAIL,
+ if (changed>0){
+ if (H5S_modify (&(dataset->ent), space)<0) {
+ HGOTO_ERROR (H5E_DATASET, H5E_WRITEERROR, FAIL,
"unable to update file with new dataspace");
- }
-
+ }
#ifdef HAVE_PARALLEL
- /*
- * If the dataset uses chunk storage and is accessed via
- * parallel I/O, need to allocate file space for all chunks now.
- */
- if (/*dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO &&*/
- dataset->layout.type == H5D_CHUNKED){
- if (H5D_allocate(dataset)==FAIL){
- HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
- "fail in file space allocation for chunks");
+ /*
+ * If the dataset uses chunk storage and is accessed via
+ * parallel I/O, need to allocate file space for all extended
+ * chunks now.
+ */
+ if (dataset->ent.file->shared->access_parms->driver==H5F_LOW_MPIO &&
+ dataset->layout.type==H5D_CHUNKED){
+ if (H5D_allocate(dataset)==FAIL){
+ HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+ "fail in file space allocation for chunks");
+ }
}
- }
#endif /* HAVE_PARALLEL */
+ }
+
ret_value = SUCCEED;
@@ -1993,7 +1998,7 @@ static herr_t
H5D_allocate (H5D_t *dataset)
{
H5S_t *space = NULL;
- herr_t ret_value = SUCCEED;
+ herr_t ret_value = FAIL;
hsize_t space_dim[H5O_LAYOUT_NDIMS];
intn space_ndims;
H5O_layout_t *layout;
@@ -2040,6 +2045,8 @@ printf("Enter %s:\n", FUNC);
HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "not implemented yet");
}
+ ret_value = SUCCEED;
+
done:
if (space)
H5S_close(space);