summaryrefslogtreecommitdiffstats
path: root/src/H5D.c
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>1998-07-09 21:21:50 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>1998-07-09 21:21:50 (GMT)
commit26d0f66a4530fdfc6c2bafe465a6ce1a9b67604b (patch)
tree62e721ee40ba1678d46634268070e98e443185d9 /src/H5D.c
parent6ac0688ab4cf54e545703453dc6f1437d9e8d282 (diff)
downloadhdf5-26d0f66a4530fdfc6c2bafe465a6ce1a9b67604b.zip
hdf5-26d0f66a4530fdfc6c2bafe465a6ce1a9b67604b.tar.gz
hdf5-26d0f66a4530fdfc6c2bafe465a6ce1a9b67604b.tar.bz2
[svn-r477] Changed the way file-space allocation for the data part of a dataset.
H5D.c: Created a new function H5D_allocation to do allocation of all datasets. According to the storage layout, it calls the appropriate function. H5Fprivate.h: H5Fistore.c: H5F_istore_allocation now takes a dimension array, (old version used a space pointer) to determine how many chunks to allocate. Changed H5F_istore_get_addr to a private (static) function. No one outside of H5Fistore.c is calling it. Removed three forward declarations now that they are not needed. Tested platform: O2K
Diffstat (limited to 'src/H5D.c')
-rw-r--r--src/H5D.c99
1 files changed, 88 insertions, 11 deletions
diff --git a/src/H5D.c b/src/H5D.c
index 364cef4..ff5668f 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -88,6 +88,9 @@ static hbool_t interface_initialize_g = FALSE;
#define INTERFACE_INIT H5D_init_interface
static herr_t H5D_init_interface(void);
static void H5D_term_interface(void);
+#ifdef HAVE_PARALLEL
+static herr_t H5D_allocate (H5D_t *dataset);
+#endif
/*--------------------------------------------------------------------------
@@ -944,11 +947,9 @@ H5D_create(H5G_t *loc, const char *name, const H5T_t *type, const H5S_t *space,
* If the dataset uses chunk storage and is accessed via
* parallel I/O, allocate file space for all chunks now.
*/
- if (/*new_dset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO &&*/
+ if (new_dset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO &&
new_dset->layout.type == H5D_CHUNKED){
- if (H5F_istore_allocate(new_dset, new_dset->ent.file,
- &(new_dset->layout), space,
- &(new_dset->create_parms->compress))==FAIL){
+ if (H5D_allocate(new_dset)==FAIL){
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL,
"fail in file space allocation for chunks");
}
@@ -1100,11 +1101,9 @@ H5D_open(H5G_t *loc, const char *name)
* If the dataset uses chunk storage and is accessed via
* parallel I/O, allocate file space for all chunks now.
*/
- if (/*dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO &&*/
+ if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO &&
dataset->layout.type == H5D_CHUNKED){
- if (H5F_istore_allocate(dataset, dataset->ent.file,
- &(dataset->layout), space,
- &(dataset->create_parms->compress))==FAIL){
+ if (H5D_allocate(dataset)==FAIL){
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL,
"fail in file space allocation for chunks");
}
@@ -1906,9 +1905,7 @@ H5D_extend (H5D_t *dataset, const hsize_t *size)
*/
if (/*dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO &&*/
dataset->layout.type == H5D_CHUNKED){
- if (H5F_istore_allocate(dataset, dataset->ent.file,
- &(dataset->layout), space,
- &(dataset->create_parms->compress))==FAIL){
+ if (H5D_allocate(dataset)==FAIL){
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
"fail in file space allocation for chunks");
}
@@ -1972,3 +1969,83 @@ H5D_typeof (H5D_t *dset)
FUNC_LEAVE (dset->type);
}
+
+#ifdef HAVE_PARALLEL
+/*-------------------------------------------------------------------------
+ * Function: H5D_allocate
+ *
+ * Purpose: Allocate file space for the data storage of the dataset.
+ * Return SUCCEED if all needed allocation succeed, otherwise
+ * FAIL.
+ *
+ * Return: Success: SUCCEED
+ *
+ * Failure: FAIL
+ *
+ * Note: Current implementation allocates chunked dataset only.
+ *
+ * Programmer: Albert Cheng
+ * July 9, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5D_allocate (H5D_t *dataset)
+{
+ H5S_t *space = NULL;
+ herr_t ret_value = SUCCEED;
+ hsize_t space_dim[H5O_LAYOUT_NDIMS];
+ intn space_ndims;
+ H5O_layout_t *layout;
+
+ FUNC_ENTER(H5D_allocate, FAIL);
+#ifdef AKC
+printf("Enter %s:\n", FUNC);
+#endif
+
+ /* Check args */
+ assert(dataset);
+ assert(&(dataset->layout));
+ layout = &(dataset->layout);
+ assert(layout->ndims>0 && layout->ndims<=H5O_LAYOUT_NDIMS);
+ assert(H5F_addr_defined(&(layout->addr)));
+
+
+ switch (layout->type) {
+ case H5D_CONTIGUOUS:
+ HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "not implemented yet");
+
+ case H5D_CHUNKED:
+ if (NULL==(space=H5S_read (&(dataset->ent)))) {
+ HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
+ "unable to read data space info from dataset header");
+ }
+ /* get current dims of dataset */
+ if ((space_ndims=H5S_get_dims(space, space_dim, NULL)) <= 0 ||
+ space_ndims+1 != layout->ndims){
+ HRETURN_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+ "unable to allocate chunk storage");
+ }
+ /* copy the element size over */
+ space_dim[space_ndims] = layout->dim[space_ndims];
+
+ if (H5F_istore_allocate(dataset->ent.file,
+ (layout), space_dim,
+ &(dataset->create_parms->compress))==FAIL){
+ HRETURN(FAIL);
+ }
+ break;
+
+ default:
+ HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "not implemented yet");
+ }
+
+ done:
+ if (space)
+ H5S_close(space);
+
+ FUNC_LEAVE(ret_value);
+}
+#endif