diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2010-11-11 21:10:30 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2010-11-11 21:10:30 (GMT) |
commit | 1b8033b5946e43613c98f40fb23282bdc4b49d0a (patch) | |
tree | 94fa65f7e96e6e2b5c982a680f729de0c75f9f30 /src/H5Pdxpl.c | |
parent | a32d6d79a3f1e30401aa7077949ff4c38e967587 (diff) | |
download | hdf5-1b8033b5946e43613c98f40fb23282bdc4b49d0a.zip hdf5-1b8033b5946e43613c98f40fb23282bdc4b49d0a.tar.gz hdf5-1b8033b5946e43613c98f40fb23282bdc4b49d0a.tar.bz2 |
[svn-r19765] Purpose:
fix a few minor issues related to flush/refresh code
Description:
- Replaced the globality macros with an enum typedef, to
better encapsulate of the values that can be assigned
to the variable.
- Combined 'tag' and 'globality' properties into a single
property by creating a new structure housing both values,
since they are always accessed at the same time anyways.
- Added an extra parameter check to H5Tflush/H5Trefresh
routines to make sure the supplied datatype is a committed
datatype.
- Renamed and reworked some code to move "metadata" (H5AC)
specific things out of the generic cache (H5C) level of code.
Tested:
h5committest
Diffstat (limited to 'src/H5Pdxpl.c')
-rw-r--r-- | src/H5Pdxpl.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 054ec6a..0e81727 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -195,8 +195,7 @@ H5P_dxfr_reg_prop(H5P_genclass_t *pclass) hid_t def_vfl_id = H5D_XFER_VFL_ID_DEF; /* Default value for file driver ID */ void *def_vfl_info = H5D_XFER_VFL_INFO_DEF; /* Default value for file driver info */ size_t def_hyp_vec_size = H5D_XFER_HYPER_VECTOR_SIZE_DEF; /* Default value for vector size */ - haddr_t metadata_tag = H5AC_METADATA_TAG_DEF; /* Default value for metadata tag */ - int globality = H5C_GLOBALITY_DEF; /* Default value for metadata tag globality value */ + H5C_tag_t tag = H5C_TAG_DEF; /* Default value for cache entry tag */ #ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t def_io_xfer_mode = H5D_XFER_IO_XFER_MODE_DEF; /* Default value for I/O transfer mode */ H5FD_mpio_chunk_opt_t def_mpio_chunk_opt_mode = H5D_XFER_MPIO_CHUNK_OPT_HARD_DEF; @@ -216,12 +215,8 @@ H5P_dxfr_reg_prop(H5P_genclass_t *pclass) if(H5P_register_real(pclass, H5D_XFER_MAX_TEMP_BUF_NAME, H5D_XFER_MAX_TEMP_BUF_SIZE, &def_max_temp_buf, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") - /* Register the metadata tag property */ - if(H5P_register_real(pclass, H5AC_METADATA_TAG_NAME, H5AC_METADATA_TAG_SIZE, &metadata_tag, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") - - /* Register the tag globality property */ - if(H5P_register_real(pclass, H5C_GLOBALITY_NAME, H5C_GLOBALITY_SIZE, &globality, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + /* Register the cache tag property */ + if(H5P_register_real(pclass, H5C_TAG_NAME, H5C_TAG_SIZE, &tag, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the type conversion buffer property */ |