diff options
Diffstat (limited to 'src/H5SMpkg.h')
| -rwxr-xr-x | src/H5SMpkg.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h index 0643ebb..7af60f6 100755 --- a/src/H5SMpkg.h +++ b/src/H5SMpkg.h @@ -32,7 +32,7 @@ #include "H5SMprivate.h" /* Shared Object Header Messages */ /* Other private headers needed by this file */ -#include "H5ACprivate.h" /* Metadata cache */ +#include "H5AC2private.h" /* Metadata Cache */ #include "H5B2private.h" /* B-trees */ #include "H5HFprivate.h" /* Fractal heaps */ @@ -174,7 +174,7 @@ typedef struct { /* Typedef for a SOHM list */ typedef struct { /* Information for H5AC cache functions, _must_ be first field in structure */ - H5AC_info_t cache_info; + H5AC2_info_t cache_info; H5SM_index_header_t *header; /* Pointer to the corresponding index header */ H5SM_sohm_t *messages; /* Actual list, stored as an array */ @@ -184,7 +184,7 @@ typedef struct { /* Typedef for shared object header message master table */ struct H5SM_master_table_t { /* Information for H5AC cache functions, _must_ be first field in structure */ - H5AC_info_t cache_info; + H5AC2_info_t cache_info; unsigned num_indexes; /* Number of indexes */ H5SM_index_header_t *indexes; /* Array of num_indexes indexes */ @@ -221,6 +221,12 @@ typedef struct { hid_t dxpl_id; } H5SM_incr_ref_opdata; +/* Callback info for loading a shared message index into the cache */ +typedef struct H5SM_list_cache_ud_t { + H5F_t *f; /* File that shared message index stored as a list is in */ + H5SM_index_header_t *header; /* Index header for this list */ +} H5SM_list_cache_ud_t; + /****************************/ /* Package Variables */ @@ -232,8 +238,8 @@ H5FL_ARR_EXTERN(H5SM_index_header_t); H5FL_EXTERN(H5SM_list_t); H5FL_ARR_EXTERN(H5SM_sohm_t); -H5_DLLVAR const H5AC_class_t H5AC_SOHM_TABLE[1]; -H5_DLLVAR const H5AC_class_t H5AC_SOHM_LIST[1]; +H5_DLLVAR const H5AC2_class_t H5AC2_SOHM_TABLE[1]; +H5_DLLVAR const H5AC2_class_t H5AC2_SOHM_LIST[1]; H5_DLLVAR const H5B2_class_t H5SM_INDEX[1]; /****************************/ @@ -262,6 +268,10 @@ H5_DLL herr_t H5SM_btree_convert_to_list_op(const void * record, void *op_data); /* Fractal heap 'op' callback to compute hash value for message "in place" */ H5_DLL herr_t H5SM_get_hash_fh_cb(const void *obj, size_t obj_len, void *_udata); +herr_t H5SM_table_dest(H5SM_master_table_t * table); + +herr_t H5SM_list_dest(H5SM_list_t * list); + /* Testing functions */ #ifdef H5SM_TESTING H5_DLL herr_t H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id, |