diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-15 06:26:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-15 06:26:08 (GMT) |
| commit | 173083e1a5c9696be01bd983dd8c9bb87eb5a433 (patch) | |
| tree | c8c4aa2dd961d18b48d0c734da3e16ea107e6c6f /src/H5FDprivate.h | |
| parent | ec7ca0dea2fba8071ce57e4f61d685c3e4d0d111 (diff) | |
| download | hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.zip hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.tar.gz hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.tar.bz2 | |
[svn-r17365] Description:
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
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5FDprivate.h')
| -rw-r--r-- | src/H5FDprivate.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index 25b2f24..6b2e4fe 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -35,6 +35,7 @@ /* Forward declarations for prototype arguments */ struct H5P_genplist_t; +struct H5F_t; /* Prototypes */ H5_DLL int H5FD_term_interface(void); @@ -55,10 +56,12 @@ H5_DLL H5FD_t *H5FD_open(const char *name, unsigned flags, hid_t fapl_id, H5_DLL herr_t H5FD_close(H5FD_t *file); H5_DLL int H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2); H5_DLL int H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/); -H5_DLL haddr_t H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, hsize_t size, haddr_t *align_addr, hsize_t *align_size); -H5_DLL herr_t H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, hsize_t size); -H5_DLL htri_t H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, haddr_t blk_end, - hsize_t extra_requested); +H5_DLL haddr_t H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f, + hsize_t size, haddr_t *align_addr, hsize_t *align_size); +H5_DLL herr_t H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f, + haddr_t addr, hsize_t size); +H5_DLL htri_t H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, struct H5F_t *f, + haddr_t blk_end, hsize_t extra_requested); H5_DLL haddr_t H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type); H5_DLL herr_t H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr); H5_DLL haddr_t H5FD_get_eof(const H5FD_t *file); |