diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-22 17:02:26 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-22 17:02:26 (GMT) |
| commit | 3e48f9be0067b9df317d000aa83e6ad8ed6f583a (patch) | |
| tree | 2f3fc77453c39d8c9daf28152547570e5a6aa69a /src/H5Fpkg.h | |
| parent | 06763537dabab2043d7df4cf05ed21f7d01977c0 (diff) | |
| download | hdf5-3e48f9be0067b9df317d000aa83e6ad8ed6f583a.zip hdf5-3e48f9be0067b9df317d000aa83e6ad8ed6f583a.tar.gz hdf5-3e48f9be0067b9df317d000aa83e6ad8ed6f583a.tar.bz2 | |
[svn-r19122] Description:
Bring metadata journaling branch closer to trunk by bringing back
updates to internal error reporting macros, routines that deal with writing
object header messages to the superblock extension, and some object header
query routines.
Also cleanups to journaling code & tests to use this code and to clean
up in general.
Tested on:
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 2f6ff27..219d6e3 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -100,7 +100,6 @@ typedef struct H5F_file_t { size_t sizeof_size; /* Size of offsets in file */ haddr_t super_addr; /* Absolute address of super block */ haddr_t base_addr; /* Absolute base address for rel.addrs. */ - hbool_t extension_ok; /* TRUE iff version permits SB extensions */ haddr_t extension_addr; /* Relative address of superblock extension */ haddr_t sohm_addr; /* Relative address of shared object header message table */ unsigned sohm_vers; /* Version of shared message table on disk */ @@ -191,10 +190,12 @@ H5_DLL herr_t H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nop /* Superblock related routines */ 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_write_mdj_msg(H5F_t *f, hid_t dxpl_id); H5_DLL herr_t H5F_super_read(H5F_t *f, hid_t dxpl_id, H5G_loc_t *root_loc); -H5_DLL herr_t H5F_super_ext_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_ext_info); +/* Superblock extension related routines */ +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_ext_write_msg(H5F_t *f, hid_t dxpl_id, void *mesg, unsigned id, hbool_t may_create); +H5_DLL herr_t H5F_super_ext_remove_msg(H5F_t *f, hid_t dxpl_id, unsigned id); /* Shared file list related routines */ H5_DLL herr_t H5F_sfile_add(H5F_file_t *shared); |