diff options
| -rw-r--r-- | src/H5Ddeprec.c | 3 | ||||
| -rw-r--r-- | src/H5Dint.c | 42 | ||||
| -rw-r--r-- | src/H5Dpkg.h | 5 |
3 files changed, 47 insertions, 3 deletions
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index b06bce1..b31f23b 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -366,7 +366,8 @@ H5D_extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize dataset with fill value") /* Mark the dataspace as dirty, for later writing to the file */ - dataset->shared->space_dirty = TRUE; + if(H5D_mark(dataset, dxpl_id, H5D_MARK_SPACE) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to mark dataspace as dirty") } /* end if */ done: diff --git a/src/H5Dint.c b/src/H5Dint.c index 947c0fe..40f262c 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1691,7 +1691,9 @@ H5D_alloc_storage(H5D_t *dset/*in,out*/, hid_t dxpl_id, H5D_time_alloc_t time_al * operation just sets the address and makes it constant) */ if(time_alloc != H5D_ALLOC_CREATE && addr_set) - dset->shared->layout_dirty = TRUE; + /* Mark the layout as dirty, for later writing to the file */ + if(H5D_mark(dset, dxpl_id, H5D_MARK_LAYOUT) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to mark dataspace as dirty") } /* end if */ done: @@ -2197,7 +2199,8 @@ H5D_set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id) } /* end if */ /* Mark the dataspace as dirty, for later writing to the file */ - dset->shared->space_dirty = TRUE; + if(H5D_mark(dset, dxpl_id, H5D_MARK_SPACE) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to mark dataspace as dirty") } /* end if */ done: @@ -2318,6 +2321,41 @@ done: /*------------------------------------------------------------------------- + * Function: H5D_mark + * + * Purpose: Mark some aspect of a dataset as dirty + * + * Return: Success: Non-negative + * Failure: Negative + * + * Programmer: Quincey Koziol + * July 4, 2008 + * + *------------------------------------------------------------------------- + */ +herr_t +H5D_mark(H5D_t *dataset, hid_t dxpl_id, unsigned flags) +{ + herr_t ret_value = SUCCEED; /* Return value */ + + FUNC_ENTER_NOAPI_NOINIT(H5D_mark) + + /* Check args */ + HDassert(dataset); + HDassert(!(flags & (unsigned)~(H5D_MARK_SPACE | H5D_MARK_LAYOUT))); + + /* Mark aspects of the dataset as dirty */ + if(flags & H5D_MARK_SPACE) + dataset->shared->space_dirty = TRUE; + if(flags & H5D_MARK_LAYOUT) + dataset->shared->layout_dirty = TRUE; + +done: + FUNC_LEAVE_NOAPI(ret_value) +} /* end H5D_mark() */ + + +/*------------------------------------------------------------------------- * Function: H5D_flush_cb * * Purpose: Flush any dataset information cached in memory diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h index 44b44d9..84e05cf 100644 --- a/src/H5Dpkg.h +++ b/src/H5Dpkg.h @@ -65,6 +65,10 @@ #define H5D_CHUNK_HASH(D, ADDR) H5F_addr_hash(ADDR, (D)->cache.chunk.nslots) +/* Flags for marking aspects of a dataset dirty */ +#define H5D_MARK_SPACE 0x01 +#define H5D_MARK_LAYOUT 0x02 + /****************************/ /* Package Private Typedefs */ @@ -543,6 +547,7 @@ H5_DLL herr_t H5D_check_filters(H5D_t *dataset); H5_DLL herr_t H5D_set_extent(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id); H5_DLL herr_t H5D_get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache); H5_DLL herr_t H5D_flush_sieve_buf(H5D_t *dataset, hid_t dxpl_id); +H5_DLL herr_t H5D_mark(H5D_t *dataset, hid_t dxpl_id, unsigned flags); /* Functions that perform direct serial I/O operations */ H5_DLL herr_t H5D_select_read(const H5D_io_info_t *io_info, |