diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2012-09-25 21:29:40 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2012-09-25 21:29:40 (GMT) |
| commit | 6edac6e2df7e30807bd41b09765a44c37d1f1bc1 (patch) | |
| tree | e8d12cb7a41969177179ef7257199862cbe7fd56 /src/H5FSprivate.h | |
| parent | 6de27c149724322135ad1049e55d2b3f6245a4d7 (diff) | |
| download | hdf5-6edac6e2df7e30807bd41b09765a44c37d1f1bc1.zip hdf5-6edac6e2df7e30807bd41b09765a44c37d1f1bc1.tar.gz hdf5-6edac6e2df7e30807bd41b09765a44c37d1f1bc1.tar.bz2 | |
[svn-r22812] Purpose:
Mainly to add SWMR flush dependencies to the free space manager (H5FS) code.
Also fixes a few issues with the local heap and the fixed array code, and
brings the MANIFEST up to date.
Tested on: jam
Diffstat (limited to 'src/H5FSprivate.h')
| -rw-r--r-- | src/H5FSprivate.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/H5FSprivate.h b/src/H5FSprivate.h index f6a0034..9dd7022 100644 --- a/src/H5FSprivate.h +++ b/src/H5FSprivate.h @@ -15,11 +15,11 @@ /*------------------------------------------------------------------------- * - * Created: H5FSprivate.h - * May 2 2006 - * Quincey Koziol <koziol@ncsa.uiuc.edu> + * Created: H5FSprivate.h + * May 2 2006 + * Quincey Koziol <koziol@hdfgroup.org> * - * Purpose: Private header for library accessible file free space routines. + * Purpose: Private header for library accessible file free space routines. * *------------------------------------------------------------------------- */ @@ -31,6 +31,7 @@ #include "H5FSpublic.h" /* Private headers needed by this file */ +#include "H5ACprivate.h" /* Metadata cache */ #include "H5Fprivate.h" /* File access */ #include "H5FLprivate.h" /* Free Lists */ @@ -127,8 +128,8 @@ struct H5FS_section_info_t { /* Free space client IDs for identifying user of free space */ typedef enum H5FS_client_t { - H5FS_CLIENT_FHEAP_ID = 0, /* Free space is used by fractal heap */ - H5FS_CLIENT_FILE_ID, /* Free space is used by file */ + H5FS_CLIENT_FHEAP_ID = 0, /* Free space is used by fractal heap */ + H5FS_CLIENT_FILE_ID, /* Free space is used by file */ H5FS_NUM_CLIENT_ID /* Number of free space client IDs (must be last) */ } H5FS_client_t; @@ -147,11 +148,11 @@ typedef struct H5FS_stat_t { hsize_t tot_sect_count; /* Total # of sections tracked */ hsize_t serial_sect_count; /* # of serializable sections tracked */ hsize_t ghost_sect_count; /* # of un-serializable sections tracked */ - haddr_t addr; /* Address of free space header on disk */ - hsize_t hdr_size; /* Size of the free-space header on disk */ + haddr_t addr; /* Address of free space header on disk */ + hsize_t hdr_size; /* Size of the free-space header on disk */ haddr_t sect_addr; /* Address of the section info in the file */ hsize_t alloc_sect_size; /* Allocated size of the section info in the file */ - hsize_t sect_size; /* Size of the section info in the file */ + hsize_t sect_size; /* Size of the section info in the file */ } H5FS_stat_t; /* Typedef for iteration operations */ @@ -183,6 +184,8 @@ H5_DLL herr_t H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace); H5_DLL herr_t H5FS_alloc_hdr(H5F_t *f, H5FS_t *fspace, haddr_t *fs_addr, hid_t dxpl_id); H5_DLL herr_t H5FS_alloc_sect(H5F_t *f, H5FS_t *fspace, hid_t dxpl_id); H5_DLL herr_t H5FS_free(H5F_t *f, H5FS_t *fspace, hid_t dxpl_id); +H5_DLL herr_t H5FS_depend(H5AC_info_t *parent_entry, H5FS_t *fs); +H5_DLL herr_t H5FS_undepend(H5AC_info_t *parent_entry, H5FS_t *fs); /* Free space section routines */ H5_DLL herr_t H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, |