From a42a1b15ef2cfd47cc696acf0487c35e07ecdcd3 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 10 Mar 2007 11:37:53 -0500 Subject: [PATCH] [svn-r13488] Description: 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) --- src/H5Gobj.c | 4 +--- src/H5Gprivate.h | 2 -- src/H5Gpublic.h | 1 - src/H5Olinfo.c | 7 +------ src/H5Oprivate.h | 4 +++- test/be_extlink1.h5 | Bin 936 -> 928 bytes test/le_extlink1.h5 | Bin 936 -> 928 bytes test/links.c | 15 --------------- test/stab.c | 8 ++++---- tools/testfiles/h5diff_types.h5 | Bin 4874 -> 4874 bytes tools/testfiles/h5mkgrp_nested_latest.ls | 4 ++-- tools/testfiles/h5mkgrp_nested_mult_latest.ls | 8 ++++---- tools/testfiles/h5mkgrp_several_latest.ls | 4 ++-- tools/testfiles/h5mkgrp_single_latest.ls | 2 +- tools/testfiles/h5repack_objs.h5 | Bin 19568 -> 19568 bytes tools/testfiles/tall-2A.h5.xml | 4 ++-- tools/testfiles/tall.h5 | Bin 10072 -> 10056 bytes tools/testfiles/tall.h5.xml | 4 ++-- tools/testfiles/tboot1.ddl | 2 +- tools/testfiles/textlink.h5 | Bin 992 -> 984 bytes tools/testfiles/tfcontents1.h5 | Bin 7610 -> 7610 bytes tools/testfiles/tmany.h5 | Bin 18728 -> 18720 bytes tools/testfiles/tudlink.h5 | Bin 952 -> 944 bytes tools/testfiles/twithub.h5 | Bin 10760 -> 10752 bytes tools/testfiles/twithub513.h5 | Bin 11304 -> 11280 bytes 25 files changed, 23 insertions(+), 46 deletions(-) diff --git a/src/H5Gobj.c b/src/H5Gobj.c index 81dbf2d8a3..07942c930f 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 934933e245..2a9ed2e3d9 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 160a506e76..598d04e878 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 e3ea8fdafa..d7cf9f8ab2 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; @@ -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, diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index c916f7e2c3..69635a5bae 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 */ diff --git a/test/be_extlink1.h5 b/test/be_extlink1.h5 index 551d6bda1d91ec29c86165ce15f76c28feddaf26..d8838f90d8e7d448628f57b0c8bbc0132b76bdc5 100644 GIT binary patch delta 31 jcmZ3%zJPs#2IGQ>n&FHU8yin&FHU8yir$K0!055DF_Vc?g8>W}IVb;S(w!Kg^qR0*ujp8r$K0z!^~> d_HMRdQDg^-MsXW6Do*a>j%MWC{EAzF9RT-N6X*Z{ diff --git a/tools/testfiles/h5mkgrp_nested_latest.ls b/tools/testfiles/h5mkgrp_nested_latest.ls index 229a72dbcb..c77238d668 100644 --- a/tools/testfiles/h5mkgrp_nested_latest.ls +++ b/tools/testfiles/h5mkgrp_nested_latest.ls @@ -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 diff --git a/tools/testfiles/h5mkgrp_nested_mult_latest.ls b/tools/testfiles/h5mkgrp_nested_mult_latest.ls index 1ab0757036..b155434105 100644 --- a/tools/testfiles/h5mkgrp_nested_mult_latest.ls +++ b/tools/testfiles/h5mkgrp_nested_mult_latest.ls @@ -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 diff --git a/tools/testfiles/h5mkgrp_several_latest.ls b/tools/testfiles/h5mkgrp_several_latest.ls index a20424d251..1a266cb7fa 100644 --- a/tools/testfiles/h5mkgrp_several_latest.ls +++ b/tools/testfiles/h5mkgrp_several_latest.ls @@ -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 diff --git a/tools/testfiles/h5mkgrp_single_latest.ls b/tools/testfiles/h5mkgrp_single_latest.ls index d4e8f603f5..ff62b91f35 100644 --- a/tools/testfiles/h5mkgrp_single_latest.ls +++ b/tools/testfiles/h5mkgrp_single_latest.ls @@ -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 diff --git a/tools/testfiles/h5repack_objs.h5 b/tools/testfiles/h5repack_objs.h5 index 6820e8baae97fa89625c26cdc4777febfb8a2aed..509de91bad317fc79a1a7d1518ead9cc1d972f99 100644 GIT binary patch delta 2554 zcma)8U2IfE6rOvxl5oKH3=!gkF&beFMk6Lb^g&cGo^xmBvNj}ol5c13 zIcLty{mwaa_tvC#Yf?KJ*Ke~kuU*o$3}|Yof|qT6+y0+^g`1hG)D$wX^g}R z2VGUGy~XO0xigqMh6bJaO$Vlxi_!XB$QIN7gw5WqnQ?m@$D!I7gK}FHOlJ1Uy^e+C z8g8=|8{97+lEp%)NgIs>9RV|0qx$|VxR~h`@w4C8;_!R+c4xmK+%@*Yx#>O_a&FVU zgjuKCaq|3QKX+{29AR-tI^Ai(yQK@`VIQn=J&GJmhZ;05Ot~7h1Mr>8XU5cwO8CW* zpJ~R6ug8HyMy5wwfbz`h^fklRNBlO}np4!n28VVGYq~loIi|kP5^*5>E#OP7xtH6m zc^Ma*kiyU5Z({%kbGix`6T4zOj&sBb#2kmOat34HhA~B^aNCQ^Y=*Z6J zQcd)pLnC{i8W|ql@rzi5&bWEF7;Wa z!L(CttNP9&Clop+)w%McXA)&666k2E=4DS*Sqs!bRDi_?u|v$|p70s5T#S;3ScV`` z5!Fuls9TP3lMzMf)rcL&3K1*Fh@zT7*;k@&6~aSC6sH(eoER%Y1r@bd8eDQz0etve zf>6~e?0ywWj z)FT=YiYaApL|qWE8nFgJjFBiiUC?V0O^9^}Vw1#74eoCxTT!fXMk6JfC?-*Qm3X3^ zMCpk!qF<##>4|b;l~O^X^mITE(M9e%U%ruK9o*sr%4R!@Hz z{LQ{mCNX`{ZqU1CkG=0c#@*xd`(Pln#rhuJ2t6*ou4~KhU1&&E(fL0vCdSrAbp42V z5Yy@Ax=+gfn;ZOeZx2?$oo2s0{lNJAFx(2%;iliL55b=;;$4edXHavc^%3c2o{jD{ z(@j5S@{~$|x3Ln*xz0J{auK2@e9b;1J1Vf4gJj#Y`i&fm>|GoFg6IZGbNlBO18+sz z^`cxj*R9Al#>4qwbPVaOd5cq!tgZWh1l$eR;vX(2eAKzZWbRVu1a5dB${iiDf8!b) xwiTqjx~Py>x|_An;Nxy_+h6TIE|%#(=EI#9Q8ibir;vt24|nMu%So9M;~(^;xElZf delta 2628 zcma)8Z%k8H6u<8kq=niREtWq6UJ|G$`&=6vB-2QjOsw5%;}e98P$cw zm}OFqW`ty!Gg;#NGF`J}*$jatOO}1nESoW8B4mp!WC{& zLS@N0GsUt`e!7rKP{Cm@g(+*B8nwc(%?a~%t6aF|Bz(WJOg(LbE^RfKY$2PLB_}Iv zA^6uB=(O!`n6gQeTQ;dvd@(fgPs`rDL3UbqP_o!PvFD5IQ##^<8uM5z;D!p52DSFh z$Z5abr?}yQy;ePCh5i~%=Sz!CmceZ1(9W*zo`~|qtES_cJXf9~gLF;m7SclSrzqkAVuCRk&+Zyb++9Mm5F@|KHcia!Pi>k=Bp$aZ z)2<<&v89nvKb5W8fjlmKDAQMN!(rJn;4_qVlGbM#}D>K`g;aaInCG#v>zSldi_LX0*3QkN`CxOUZ+VJgO|MSht+!?CJM_H z1?CI=mI?<>LFs|p_B`Ds8k-z~8%2B6i&l8AE}6zy_UB=yI7|eq2ovQINt$fvmyVt4 z(;;;smvqWC5-S2uYECPimP8mn)|}Op_9TXxVy9&P(VZ;tq1iR!c2IV$LQv*85rR5u zX=Pn zxUpM;!0csAXFb)TsT8peQHEHL^&}+ehaC^198rPTK({54<6?hSiT#a;XAxCI1&Lt+ zFLtXDRHi;b)ADgD**XN4E89$Tkr?Ltv0IOzs@+Odl8DgA{YCa=2!4|T!bSL4h+mRq zEK$uwWD(~i20M|qQp91oomjV197qiQBL3MF91=s4hzu10TW%LF6fY8kzsOLEA&J3G zNhssG+%D1`;|d>{3*(p8_FC6r`O0}3+Y@Z2X{>cmFt}4_;s@uz6@0Mzd?n(Q8uVTi zue8_lzRtDwNGXogG@wUgO{MyKCOs?q<91n2Q@*6))?d=E@%?G9^{Xrk_Is0sE6Ukh z*QuJbsGLnd<3EAV>i)Di^$*7iu^(E4j0xY}n~z!YA2T=*n>+zw|31T0=LEIBU97mP zzU<*A4GFt8|I1)}s6MEwFNnhkr-iNGmOc$daG-8IEN$~-$Ww)5lMz_-R^!G~+x_rw zLy1_exN#gU(~TXvn>ZhR+N4`WphO=Kx6*3Mk)3(Y)$wdWBk`~+@T=vfUToe+d6;SH zgT7|D*U=sK)uL6Yd1sq{Sk6L|SKYJ*_>Zc>&L7)o% zy4m3K)_if_>#ZZW>6`65vqLZMr~=dWT*LKcuDl)Errd;YLT)kbPH0R{Q~%C^r3RS* TciJx_8)u$tQ#;m>(Xht - + @@ -157,7 +157,7 @@ Expected output for 'h5dump --xml -A tall.h5' - + diff --git a/tools/testfiles/tall.h5 b/tools/testfiles/tall.h5 index a08eee22a5e3e55b685b18e7e35aa74027b9e9a8..aff18d8c6ce33c62516afeb72e669fa93dd7db5b 100644 GIT binary patch delta 152 zcmccNcfxOi2BXJDO?7t86>1D%uwY`NK2w0o`fAN^^~{qGtA#K+OqNiWXPhzFLR|p>q-QSb delta 183 zcmX@%cf)Uj24loVO?7t84QdQvuwr7PK2wCs`9BT&3v6#152kWngHSc(8Ty z2UY<_kI9KD>P!n%Hy-3;oa~_NH2IdQ7gSBf#Dle5Objq1CNr{0Os-P2n*2wNo5@3Y T@ - + @@ -172,7 +172,7 @@ Expected output for 'h5dump --xml tall.h5' - + diff --git a/tools/testfiles/tboot1.ddl b/tools/testfiles/tboot1.ddl index 9a7cafc99c..df1a85e242 100644 --- a/tools/testfiles/tboot1.ddl +++ b/tools/testfiles/tboot1.ddl @@ -17,7 +17,7 @@ USER_BLOCK { USERBLOCK_SIZE 0 } DATASET "dset" { - DATATYPE H5T_STD_I32BE + DATATYPE H5T_STD_I32LE DATASPACE SIMPLE { ( 4 ) / ( 4 ) } } } diff --git a/tools/testfiles/textlink.h5 b/tools/testfiles/textlink.h5 index 6dd0e8d28012caa954d8ca2e8a531b0f97c76550..d767a415ea00b538f9d00b092ba0260e7e8d8d17 100644 GIT binary patch delta 31 jcmaFBeuI622IGy1n&FHaHa4zg;?!UO14gFF*33%*r>O{` delta 34 ncmcb?{(yag2IGT?n&FH)Ha4zg;xu3Y14gEaj^dM@n5O{%#TW^i diff --git a/tools/testfiles/tfcontents1.h5 b/tools/testfiles/tfcontents1.h5 index bd0cd88b48d76163ea6c19dd57e8477bce8053e6..508b50404403a91044659816e447785c23bd952a 100644 GIT binary patch delta 149 zcmdmGy~}z+1Ea^r#!Mzo4F)h^{3jmS>ALbqutLk0svwf9qs@C delta 87 zcmZ25iE+gw#t9mX8XGl>d6>UhKi@o`hgA{8m^|NZ=4J=I7y*c=T_!W*gUuIR_?ae4 gxO6bin7q(MA1qMG#9_by28@#f`NcOUy6{~Y<^|jnSQtGv8wz}9 zVzk(-Dg2p*+3dxq&GHgUnb?60R|bZTiGsb#0t^BSAh19ZOfeWhCoX>zl) zF5`vC8>RgjIW{xOa5I4nn#?aZlc_;^qM+Pl1rCnQ7v$D6PE_F7T(4lw!FXfxZVg4S bqWc=noG^2kCl_mm0JTiMC@nnsj;0O(>&i8u delta 195 zcmZn&=?K}N!Nkb1S(8bhopHtFMkalx88VZ5BxE*EV12|mc>{~Y<^|jnSQrB~8wz}9 zVszN7Dg2p*xzzvpW_gLFOzc30D+5EvM8RHV0R{mE5Lh7zrWgz$6ay2C#mF>KP<(Qi zv>fA&$t$J(83i`~l;(yR(J)c4b@B&x0mhEa3+1jcZmw6b=3smhC<(&7#%iiihgEcF76FZRM%D~VunUSeiS%5(RtZRiNM7IHiVqju`vKX0w>cl5^$;vU_n7mTfpHX1* zPubs$+yw}QlmE+$PZnU}04frj%+BPzxn9ATgR=wb9*xPXWh9|?HUQ0P-JGDgiIH;y VRN4kfx&kO&J9&q!%H$*3J^+?5G_3#t