summaryrefslogtreecommitdiffstats
path: root/src/H5Dint.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2011-02-22 00:03:37 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2011-02-22 00:03:37 (GMT)
commitcab5c372bfc34773014c13a38ca8dc30d5a89441 (patch)
tree4d45ce180a967261d3416590749389b65e4f0b6c /src/H5Dint.c
parentcf7f31f0c6deccc787291205dabed9b11fc8feee (diff)
downloadhdf5-cab5c372bfc34773014c13a38ca8dc30d5a89441.zip
hdf5-cab5c372bfc34773014c13a38ca8dc30d5a89441.tar.gz
hdf5-cab5c372bfc34773014c13a38ca8dc30d5a89441.tar.bz2
[svn-r20135] Description:
Bring r20134 from metadata journaling merging branch to trunk: Bring changes from metadata journaling branch to "merging" branch: Unify routine to mark a dataset's metadata as changed. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, w/threadsafe, in production mode Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Diffstat (limited to 'src/H5Dint.c')
-rw-r--r--src/H5Dint.c42
1 files changed, 40 insertions, 2 deletions
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