diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-14 15:42:11 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-14 15:42:11 (GMT) |
| commit | d47fb4b7521f07f799221286358be99bd3bf6ffd (patch) | |
| tree | 92c2481cb92a4b5bf953d40f359d575ff7f93d8c /src/H5Fpkg.h | |
| parent | 92b37616d2a1ec34a2d7bd34d05c5f6466f7da53 (diff) | |
| download | hdf5-d47fb4b7521f07f799221286358be99bd3bf6ffd.zip hdf5-d47fb4b7521f07f799221286358be99bd3bf6ffd.tar.gz hdf5-d47fb4b7521f07f799221286358be99bd3bf6ffd.tar.bz2 | |
[svn-r17359] Description:
Bring r17336 from trunk to 1.8 branch:
Bring more changes from the file_free_space branch into the trunk.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index b69d11c..c7ac1fa 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -43,6 +43,7 @@ #include "H5Oprivate.h" /* Object header messages */ #include "H5RCprivate.h" /* Reference counted object functions */ + /* * Feature: Define this constant on the compiler command-line if you want to * see some debugging messages on the debug stream. @@ -67,6 +68,10 @@ #define H5F_FS_MERGE_METADATA 0x01 /* Section can merge with metadata aggregator */ #define H5F_FS_MERGE_RAWDATA 0x02 /* Section can merge with small 'raw' data aggregator */ +/* Macro to abstract checking whether file is using a free space manager */ +#define H5F_HAVE_FREE_SPACE_MANAGER(F) TRUE /* Currently always have a free space manager */ + + /* Structure for metadata & "small [raw] data" block aggregation fields */ struct H5F_blk_aggr_t { unsigned long feature_flag; /* Feature flag type */ @@ -230,7 +235,7 @@ H5_DLL herr_t H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nop H5_DLL herr_t H5F_super_init(H5F_t *f, hid_t dxpl_id); H5_DLL herr_t H5F_super_write(H5F_t *f, hid_t dxpl_id); H5_DLL herr_t H5F_super_read(H5F_t *f, hid_t dxpl_id); -H5_DLL herr_t H5F_super_ext_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_ext_info); +H5_DLL herr_t H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_size); /* Metadata accumulator routines */ H5_DLL htri_t H5F_accum_read(const H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, |