mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Align with name change of "user" ring in incoming cache image changes.

Browse Source
This commit is contained in:
Quincey Koziol 2016-12-30 02:22:00 -08:00
parent eecc0a26ef
commit e500f2d3da
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/H5ACprivate.h
View File

@ -153,7 +153,7 @@ typedef enum {
/* Aliases for the "ring" type and values */
typedef H5C_ring_t H5AC_ring_t;
#define H5AC_RING_INV H5C_RING_UNDEFINED
#define H5AC_RING_US H5C_RING_USER
#define H5AC_RING_USER H5C_RING_USER
#define H5AC_RING_FSM H5C_RING_FSM
#define H5AC_RING_SBE H5C_RING_SBE
#define H5AC_RING_SB H5C_RING_SB

2
src/H5Pdxpl.c
View File

@ -173,7 +173,7 @@
#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF 0
/* Ring type - private property */
#define H5AC_XFER_RING_SIZE sizeof(unsigned)
#define H5AC_XFER_RING_DEF H5AC_RING_US
#define H5AC_XFER_RING_DEF H5AC_RING_USER
#define H5AC_XFER_RING_ENC H5P__encode_unsigned
#define H5AC_XFER_RING_DEC H5P__decode_unsigned
#ifdef H5_DEBUG_BUILD

4
src/H5SM.c
View File

@ -144,7 +144,7 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d
HDassert(!H5F_addr_defined(H5F_SOHM_ADDR(f)));
/* Set the ring type in the DXPL */
if(H5AC_set_ring(dxpl_id, H5AC_RING_US, &dxpl, &orig_ring) < 0)
if(H5AC_set_ring(dxpl_id, H5AC_RING_USER, &dxpl, &orig_ring) < 0)
HGOTO_ERROR(H5E_SOHM, H5E_CANTSET, FAIL, "unable to set ring value")
/* Initialize master table */
@ -2021,7 +2021,7 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
cache_udata.f = f;
/* Set the ring type in the DXPL */
if(H5AC_set_ring(dxpl_id, H5AC_RING_US, &dxpl, &orig_ring) < 0)
if(H5AC_set_ring(dxpl_id, H5AC_RING_USER, &dxpl, &orig_ring) < 0)
HGOTO_ERROR(H5E_SOHM, H5E_CANTSET, FAIL, "unable to set ring value")
/* Read the rest of the SOHM table information from the cache */