mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r13488] Description:

Browse Source 
Remove unused "min. creation order" field from link info object
header message.

Tested on:
	FreeBSD/32 6.2 (duty)
	Mac OS X/32 10.4.8 (amazon)
This commit is contained in:
Quincey Koziol 2007-03-10 11:37:53 -05:00
parent 6cfd5c1462
commit a42a1b15ef
25 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/H5Gobj.c
View File

@ -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)) {

2
src/H5Gprivate.h
View File

@ -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, \

1
src/H5Gpublic.h
View File

@ -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;

7
src/H5Olinfo.c
View File

@ -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;
@ -569,8 +566,6 @@ H5O_linfo_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
"Index creation order of links:", linfo->index_corder);
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,

4
src/H5Oprivate.h
View File

@ -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 */

BIN
test/be_extlink1.h5
View File

Binary file not shown.

BIN
test/le_extlink1.h5
View File

Binary file not shown.

15
test/links.c
View File

@ -9008,7 +9008,6 @@ group_info(hid_t fapl)
/* Check (new/empty) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != 0) TEST_ERROR
@ -9029,7 +9028,6 @@ group_info(hid_t fapl)
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
@ -9044,7 +9042,6 @@ group_info(hid_t fapl)
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
} /* end if */
@ -9058,7 +9055,6 @@ group_info(hid_t fapl)
/* Check main group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
@ -9072,7 +9068,6 @@ group_info(hid_t fapl)
/* Check soft link group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
} /* end for */
@ -9103,7 +9098,6 @@ group_info(hid_t fapl)
/* Check (new/empty) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != 0) TEST_ERROR
@ -9124,7 +9118,6 @@ group_info(hid_t fapl)
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
@ -9139,7 +9132,6 @@ group_info(hid_t fapl)
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
} /* end if */
@ -9153,7 +9145,6 @@ group_info(hid_t fapl)
/* Check main group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
@ -9167,7 +9158,6 @@ group_info(hid_t fapl)
/* Check soft link group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
} /* end for */
@ -9288,7 +9278,6 @@ group_info_old(hid_t fapl)
/* Check (new/empty) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != 0) TEST_ERROR
@ -9309,7 +9298,6 @@ group_info_old(hid_t fapl)
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
@ -9324,7 +9312,6 @@ group_info_old(hid_t fapl)
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
} /* end if */
@ -9338,7 +9325,6 @@ group_info_old(hid_t fapl)
/* Check main group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
@ -9352,7 +9338,6 @@ group_info_old(hid_t fapl)
/* Check soft link group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
if(grp_info.min_corder != 0) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
} /* end for */

8
test/stab.c
View File

@ -427,9 +427,9 @@ lifecycle(hid_t fapl)
/* Check that the object header is only one chunk and the space has been allocated correctly */
if(H5Gget_objinfo(gid, ".", FALSE, &obj_stat) < 0) TEST_ERROR
#ifdef H5_HAVE_LARGE_HSIZET
if(obj_stat.ohdr.size != 206) TEST_ERROR
if(obj_stat.ohdr.size != 198) TEST_ERROR
#else /* H5_HAVE_LARGE_HSIZET */
if(obj_stat.ohdr.size != 186) TEST_ERROR
if(obj_stat.ohdr.size != 178) TEST_ERROR
#endif /* H5_HAVE_LARGE_HSIZET */
if(obj_stat.ohdr.free != 0) TEST_ERROR
if(obj_stat.ohdr.nmesgs != 6) TEST_ERROR
@ -453,9 +453,9 @@ lifecycle(hid_t fapl)
/* Check that the object header is still one chunk and the space has been allocated correctly */
if(H5Gget_objinfo(gid, ".", FALSE, &obj_stat) < 0) TEST_ERROR
#ifdef H5_HAVE_LARGE_HSIZET
if(obj_stat.ohdr.size != 206) TEST_ERROR
if(obj_stat.ohdr.size != 198) TEST_ERROR
#else /* H5_HAVE_LARGE_HSIZET */
if(obj_stat.ohdr.size != 186) TEST_ERROR
if(obj_stat.ohdr.size != 178) TEST_ERROR
#endif /* H5_HAVE_LARGE_HSIZET */
if(obj_stat.ohdr.free != 112) TEST_ERROR
if(obj_stat.ohdr.nmesgs != 3) TEST_ERROR

BIN
tools/testfiles/h5diff_types.h5
View File

Binary file not shown.

4
tools/testfiles/h5mkgrp_nested_latest.ls
View File

@ -3,10 +3,10 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_latest.h5'
#############################
Opened "../testfiles/h5mkgrp_nested_latest.h5" with sec2 driver.
/one Group
Location: 1:460
Location: 1:444
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
/one/two Group
Location: 1:254
Location: 1:246
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX

8
tools/testfiles/h5mkgrp_nested_mult_latest.ls
View File

@ -3,18 +3,18 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult_latest.h5'
#############################
Opened "../testfiles/h5mkgrp_nested_mult_latest.h5" with sec2 driver.
/one Group
Location: 1:460
Location: 1:444
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
/one/two Group
Location: 1:254
Location: 1:246
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
/three Group
Location: 1:872
Location: 1:840
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
/three/four Group
Location: 1:666
Location: 1:642
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX

4
tools/testfiles/h5mkgrp_several_latest.ls
View File

@ -3,10 +3,10 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_several_latest.h5'
#############################
Opened "../testfiles/h5mkgrp_several_latest.h5" with sec2 driver.
/one Group
Location: 1:254
Location: 1:246
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
/two Group
Location: 1:460
Location: 1:444
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX

2
tools/testfiles/h5mkgrp_single_latest.ls
View File

@ -3,6 +3,6 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_single_latest.h5'
#############################
Opened "../testfiles/h5mkgrp_single_latest.h5" with sec2 driver.
/latest Group
Location: 1:254
Location: 1:246
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX

BIN
tools/testfiles/h5repack_objs.h5
View File

Binary file not shown.

4
tools/testfiles/tall-2A.h5.xml
View File

@ -134,7 +134,7 @@ Expected output for 'h5dump --xml -A tall.h5'
</hdf5:Group>
</hdf5:Group>
<hdf5:Group Name="g2" OBJ-XID="xid_1848" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
<hdf5:Dataset Name="dset2.1" OBJ-XID="xid_9032" H5Path= "/g2/dset2.1" Parents="xid_1848" H5ParentPaths="/g2">
<hdf5:Dataset Name="dset2.1" OBJ-XID="xid_9024" H5Path= "/g2/dset2.1" Parents="xid_1848" H5ParentPaths="/g2">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
</hdf5:StorageLayout>
@ -157,7 +157,7 @@ Expected output for 'h5dump --xml -A tall.h5'
<hdf5:NoData/>
</hdf5:Data>
</hdf5:Dataset>
<hdf5:Dataset Name="dset2.2" OBJ-XID="xid_9632" H5Path= "/g2/dset2.2" Parents="xid_1848" H5ParentPaths="/g2">
<hdf5:Dataset Name="dset2.2" OBJ-XID="xid_9624" H5Path= "/g2/dset2.2" Parents="xid_1848" H5ParentPaths="/g2">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
</hdf5:StorageLayout>

BIN
tools/testfiles/tall.h5
View File

Binary file not shown.

4
tools/testfiles/tall.h5.xml
View File

@ -147,7 +147,7 @@ Expected output for 'h5dump --xml tall.h5'
</hdf5:Group>
</hdf5:Group>
<hdf5:Group Name="g2" OBJ-XID="xid_1848" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
<hdf5:Dataset Name="dset2.1" OBJ-XID="xid_9032" H5Path= "/g2/dset2.1" Parents="xid_1848" H5ParentPaths="/g2">
<hdf5:Dataset Name="dset2.1" OBJ-XID="xid_9024" H5Path= "/g2/dset2.1" Parents="xid_1848" H5ParentPaths="/g2">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
</hdf5:StorageLayout>
@ -172,7 +172,7 @@ Expected output for 'h5dump --xml tall.h5'
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Dataset>
<hdf5:Dataset Name="dset2.2" OBJ-XID="xid_9632" H5Path= "/g2/dset2.2" Parents="xid_1848" H5ParentPaths="/g2">
<hdf5:Dataset Name="dset2.2" OBJ-XID="xid_9624" H5Path= "/g2/dset2.2" Parents="xid_1848" H5ParentPaths="/g2">
<hdf5:StorageLayout>
<hdf5:ContiguousLayout/>
</hdf5:StorageLayout>

2
tools/testfiles/tboot1.ddl
View File

@ -17,7 +17,7 @@ USER_BLOCK {
USERBLOCK_SIZE 0
}
DATASET "dset" {
DATATYPE H5T_STD_I32BE
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
}
}

BIN
tools/testfiles/textlink.h5
View File

Binary file not shown.

BIN
tools/testfiles/tfcontents1.h5
View File

Binary file not shown.

BIN
tools/testfiles/tmany.h5
View File

Binary file not shown.

BIN
tools/testfiles/tudlink.h5
View File

Binary file not shown.

BIN
tools/testfiles/twithub.h5
View File

Binary file not shown.

BIN
tools/testfiles/twithub513.h5
View File

Binary file not shown.