diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-18 18:25:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-18 18:25:49 (GMT) |
| commit | ebde7af78ab5cfacc8a55105f1de0e53ccffa5a4 (patch) | |
| tree | bded46cf03fd13d3311cd959dcb9b091e7379dca /src/H5Fprivate.h | |
| parent | 339471fe0d38ce9527c6c6a91f9a9cfb3810bb9c (diff) | |
| download | hdf5-ebde7af78ab5cfacc8a55105f1de0e53ccffa5a4.zip hdf5-ebde7af78ab5cfacc8a55105f1de0e53ccffa5a4.tar.gz hdf5-ebde7af78ab5cfacc8a55105f1de0e53ccffa5a4.tar.bz2 | |
[svn-r17374] Description:
Bring r17365 from trunk to 1.8 branch:
Final merge of changes from sblock_mdc branch back to trunk. The
superblock is now managed by the metadata cache.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committest performed on trunk)
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index e3fe864..442c59b 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -248,12 +248,12 @@ typedef struct H5F_blk_aggr_t H5F_blk_aggr_t; #define H5F_FCPL(F) ((F)->shared->fcpl_id) #define H5F_SIZEOF_ADDR(F) ((F)->shared->sizeof_addr) #define H5F_SIZEOF_SIZE(F) ((F)->shared->sizeof_size) -#define H5F_SYM_LEAF_K(F) ((F)->shared->sym_leaf_k) -#define H5F_KVALUE(F,T) ((F)->shared->btree_k[(T)->id]) +#define H5F_SYM_LEAF_K(F) ((F)->shared->sblock->sym_leaf_k) +#define H5F_KVALUE(F,T) ((F)->shared->sblock->btree_k[(T)->id]) #define H5F_RDCC_NSLOTS(F) ((F)->shared->rdcc_nslots) #define H5F_RDCC_NBYTES(F) ((F)->shared->rdcc_nbytes) #define H5F_RDCC_W0(F) ((F)->shared->rdcc_w0) -#define H5F_BASE_ADDR(F) ((F)->shared->base_addr) +#define H5F_BASE_ADDR(F) ((F)->shared->sblock->base_addr) #define H5F_GRP_BTREE_SHARED(F) ((F)->shared->grp_btree_shared) #define H5F_SIEVE_BUF_SIZE(F) ((F)->shared->sieve_buf_size) #define H5F_GC_REF(F) ((F)->shared->gc_ref) @@ -529,6 +529,9 @@ H5_DLL herr_t H5F_sfile_assert_num(unsigned n); H5_DLL H5F_t *H5F_fake_alloc(size_t sizeof_size); H5_DLL herr_t H5F_fake_free(H5F_t *f); +/* Superblock related routines */ +H5_DLL herr_t H5F_super_dirty(H5F_t *f); + /* Parallel I/O (i.e. MPI) related routines */ #ifdef H5_HAVE_PARALLEL H5_DLL int H5F_mpi_get_rank(const H5F_t *f); |