summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/H5Gobj.c4
-rw-r--r--src/H5Gprivate.h2
-rw-r--r--src/H5Gpublic.h1
-rw-r--r--src/H5Olinfo.c7
-rw-r--r--src/H5Oprivate.h4
5 files changed, 5 insertions, 13 deletions
diff --git a/src/H5Gobj.c b/src/H5Gobj.c
index 81dbf2d..07942c9 100644
--- a/src/H5Gobj.c
+++ b/src/H5Gobj.c
@@ -686,7 +686,6 @@ H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
if(H5O_msg_read(oloc, H5O_LINFO_ID, &linfo, dxpl_id)) {
/* Retrieve the information about the links */
grp_info->nlinks = linfo.nlinks;
- grp_info->min_corder = linfo.min_corder;
grp_info->max_corder = linfo.max_corder;
/* Check if the group is using compact or dense storage for its links */
@@ -705,7 +704,6 @@ H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
/* Set the other information about the group */
grp_info->storage_type = H5G_STORAGE_TYPE_SYMBOL_TABLE;
- grp_info->min_corder = 0;
grp_info->max_corder = 0;
} /* end else */
@@ -867,7 +865,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
/* Reset the creation order min/max if there's no more links in group */
if(linfo->nlinks == 0)
- linfo->min_corder = linfo->max_corder = 0;
+ linfo->max_corder = 0;
/* Check for transitioning out of dense storage, if we are using it */
if(H5F_addr_defined(linfo->link_fheap_addr)) {
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 934933e..2a9ed2e 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -62,7 +62,6 @@
/* Defaults for link info values */
#define H5G_CRT_LINFO_INDEX_CORDER FALSE
#define H5G_CRT_LINFO_NLINKS 0
-#define H5G_CRT_LINFO_MIN_CORDER 0
#define H5G_CRT_LINFO_MAX_CORDER 0
#define H5G_CRT_LINFO_LINK_FHEAP_ADDR HADDR_UNDEF
#define H5G_CRT_LINFO_NAME_BT2_ADDR HADDR_UNDEF
@@ -72,7 +71,6 @@
#define H5G_CRT_LINK_INFO_NAME "link info"
#define H5G_CRT_LINK_INFO_SIZE sizeof(H5O_linfo_t)
#define H5G_CRT_LINK_INFO_DEF {H5G_CRT_LINFO_INDEX_CORDER, \
- H5G_CRT_LINFO_MIN_CORDER, \
H5G_CRT_LINFO_MAX_CORDER, \
H5G_CRT_LINFO_CORDER_BT2_ADDR, \
H5G_CRT_LINFO_NLINKS, \
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 160a506..598d04e 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -74,7 +74,6 @@ typedef enum H5G_storage_type_t {
typedef struct H5G_info_t {
H5G_storage_type_t storage_type; /* Type of storage for links in group */
hsize_t nlinks; /* Number of links in group */
- int64_t min_corder; /* Current min. creation order value for group */
int64_t max_corder; /* Current max. creation order value for group */
} H5G_info_t;
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index e3ea8fd..d7cf9f8 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -141,7 +141,6 @@ H5O_linfo_decode(H5F_t *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_flags,
H5F_DECODE_LENGTH(f, p, linfo->nlinks)
/* Min. & max creation order value for the group */
- INT64DECODE(p, linfo->min_corder)
INT64DECODE(p, linfo->max_corder)
/* Address of fractal heap to store "dense" links */
@@ -206,7 +205,6 @@ H5O_linfo_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void
H5F_ENCODE_LENGTH(f, p, linfo->nlinks)
/* Min. & max creation order value for the group */
- INT64ENCODE(p, linfo->min_corder)
INT64ENCODE(p, linfo->max_corder)
/* Address of fractal heap to store "dense" links */
@@ -293,7 +291,6 @@ H5O_linfo_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
ret_value = 1 /* Version */
+ 1 /* Index flags */
+ H5F_SIZEOF_SIZE(f) /* Number of links */
- + 8 /* Curr. min. creation order value */
+ 8 /* Curr. max. creation order value */
+ H5F_SIZEOF_ADDR(f) /* Address of fractal heap to store "dense" links */
+ H5F_SIZEOF_ADDR(f) /* Address of v2 B-tree for indexing names of links */
@@ -400,7 +397,7 @@ H5O_linfo_copy_file(H5F_t UNUSED *file_src, void *native_src, H5F_t *file_dst,
*/
if(cpy_info->max_depth >= 0 && cpy_info->curr_depth >= cpy_info->max_depth) {
linfo_dst->nlinks = 0;
- linfo_dst->min_corder = linfo_dst->max_corder = 0;
+ linfo_dst->max_corder = 0;
linfo_dst->link_fheap_addr = HADDR_UNDEF;
linfo_dst->name_bt2_addr = HADDR_UNDEF;
linfo_dst->corder_bt2_addr = HADDR_UNDEF;
@@ -570,8 +567,6 @@ H5O_linfo_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
"Number of links:", linfo->nlinks);
HDfprintf(stream, "%*s%-*s %Hd\n", indent, "", fwidth,
- "Min. creation order value:", linfo->min_corder);
- HDfprintf(stream, "%*s%-*s %Hd\n", indent, "", fwidth,
"Max. creation order value:", linfo->max_corder);
HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
"'Dense' link storage fractal heap address:", linfo->link_fheap_addr);
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index c916f7e..69635a5 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -173,11 +173,13 @@ typedef struct H5O_shared_t {
* link info structure in src/H5Gprivate.h - QAK)
* (if the fields in this struct are changed, also look at the code that
* creates intermediate groups in src/H5Gtraverse.c - QAK)
+ * (The "max. creation order" field is signed so that we might have an easy
+ * way to add links to the front of the creation ordering (with negative
+ * values) as well as the end of the creation ordering - QAK)
*/
typedef struct H5O_linfo_t {
/* (creation order info) */
hbool_t index_corder; /* Are creation order values indexed on links? */
- int64_t min_corder; /* Current min. creation order value for group */
int64_t max_corder; /* Current max. creation order value for group */
haddr_t corder_bt2_addr; /* Address of v2 B-tree for indexing creation order values of links */