diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2020-11-25 05:58:16 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-25 05:58:16 (GMT) |
commit | b7bfe68968330c3ac39f4d4179498caec1e0ae24 (patch) | |
tree | 83784a6cfd580f3d70f44195b2e0b0b7e150560b /src/H5Ipkg.h | |
parent | ea17afe305d40de1ae8682c62978edf42763469b (diff) | |
download | hdf5-b7bfe68968330c3ac39f4d4179498caec1e0ae24.zip hdf5-b7bfe68968330c3ac39f4d4179498caec1e0ae24.tar.gz hdf5-b7bfe68968330c3ac39f4d4179498caec1e0ae24.tar.bz2 |
Cherry pick of Minor/id code cleanup (#114) (#124)
* Revert "Switch ID code to use a hash table instead of a skip list (#52)"
This reverts commit a50d211755cb272b2e468144e7d892a4c90813c4.
* H5I_id_type_t and H5I_class_t are no longer managed via free lists
* Fixed commenting issues
* Naming and commenting cleanup in H5I.c
* H5I cleanup
* Header cleanup
* Commenting
* More uniform naming
* Renames H5I_id_type_t and related in H5I.c
* Adds gcc pragmas to ignore H5I const casting
* Split H5I code into multiple files
* Rename id_type to simply type in H5I code
* Minor typo in H5Itest.c
Diffstat (limited to 'src/H5Ipkg.h')
-rw-r--r-- | src/H5Ipkg.h | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/src/H5Ipkg.h b/src/H5Ipkg.h index 25b4a97..7fc2668 100644 --- a/src/H5Ipkg.h +++ b/src/H5Ipkg.h @@ -30,13 +30,14 @@ #include "H5Iprivate.h" /* Other private headers needed by this file */ +#include "H5SLprivate.h" /* Skip Lists */ /**************************/ /* Package Private Macros */ /**************************/ /* - * Number of bits to use for ID Type in each atom. Increase if more types + * Number of bits to use for ID Type in each ID. Increase if more types * are needed (though this will decrease the number of available IDs per * type). This is the only number that must be changed since all other bit * field sizes and masks are calculated from TYPE_BITS. @@ -47,23 +48,62 @@ #define H5I_MAX_NUM_TYPES TYPE_MASK /* - * Number of bits to use for the Atom index in each atom (assumes 8-bit + * Number of bits to use for the ID index in each ID (assumes 8-bit * bytes). We don't use the sign bit. */ #define ID_BITS ((sizeof(hid_t) * 8) - (TYPE_BITS + 1)) #define ID_MASK (((hid_t)1 << ID_BITS) - 1) -/* Map an atom to an ID type number */ +/* Map an ID to an ID type number */ #define H5I_TYPE(a) ((H5I_type_t)(((hid_t)(a) >> ID_BITS) & TYPE_MASK)) /****************************/ /* Package Private Typedefs */ /****************************/ +/* ID information structure used */ +typedef struct H5I_id_info_t { + hid_t id; /* ID for this info */ + unsigned count; /* Ref. count for this ID */ + unsigned app_count; /* Ref. count of application visible IDs */ + const void *object; /* Pointer associated with the ID */ +} H5I_id_info_t; + +/* Type information structure used */ +typedef struct H5I_type_info_t { + const H5I_class_t *cls; /* Pointer to ID class */ + unsigned init_count; /* # of times this type has been initialized */ + uint64_t id_count; /* Current number of IDs held */ + uint64_t nextid; /* ID to use for the next object */ + H5I_id_info_t * last_id_info; /* Info for most recent ID looked up */ + H5SL_t * ids; /* Pointer to skip list that stores IDs */ +} H5I_type_info_t; + +/*****************************/ +/* Package Private Variables */ +/*****************************/ + +/* Array of pointers to ID types */ +H5_DLLVAR H5I_type_info_t *H5I_type_info_array_g[H5I_MAX_NUM_TYPES]; + +/* Variable to keep track of the number of types allocated. Its value is the */ +/* next type ID to be handed out, so it is always one greater than the number */ +/* of types. */ +/* Starts at 1 instead of 0 because it makes trace output look nicer. If more */ +/* types (or IDs within a type) are needed, adjust TYPE_BITS in H5Ipkg.h */ +/* and/or increase size of hid_t */ +H5_DLLVAR int H5I_next_type_g; + /******************************/ /* Package Private Prototypes */ /******************************/ +H5_DLL int H5I__destroy_type(H5I_type_t type); +H5_DLL void * H5I__remove_verify(hid_t id, H5I_type_t type); +H5_DLL int H5I__inc_type_ref(H5I_type_t type); +H5_DLL int H5I__get_type_ref(H5I_type_t type); +H5_DLL H5I_id_info_t *H5I__find_id(hid_t id); + /* Testing functions */ #ifdef H5I_TESTING H5_DLL ssize_t H5I__get_name_test(hid_t id, char *name /*out*/, size_t size, hbool_t *cached); |