summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-12-20 20:36:08 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-12-20 20:36:08 (GMT)
commit6878261a432d9cc8c705aa6c4f85450b29b37150 (patch)
tree765a4e072ef63bdda33320ca2c16938c5fa7a06f /tools
parent79a96581a64a4b2f8a6679100a7f369bb963ab94 (diff)
downloadhdf5-6878261a432d9cc8c705aa6c4f85450b29b37150.zip
hdf5-6878261a432d9cc8c705aa6c4f85450b29b37150.tar.gz
hdf5-6878261a432d9cc8c705aa6c4f85450b29b37150.tar.bz2
[svn-r14353] Description:
- Add hash value for skip list string types, to reduce # of string comparisons. - Fixed bug with metadata/small data block aggregator adding size == 0 block into file free space list. - Refactored metadata/small data block aggregator code into single set of common routines. - Changed block aggregator code to be smarter about releasing space in the 'other' block when the 'other' block has aggregated enough data. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.4.10 (amazon) in debug mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'tools')
-rw-r--r--tools/testfiles/h5copytst.out.ls160
1 files changed, 80 insertions, 80 deletions
diff --git a/tools/testfiles/h5copytst.out.ls b/tools/testfiles/h5copytst.out.ls
index 785c3f0..9cad76f 100644
--- a/tools/testfiles/h5copytst.out.ls
+++ b/tools/testfiles/h5copytst.out.ls
@@ -6,57 +6,57 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:96
Links: 1
/A Group
- Location: 1:90344
+ Location: 1:89936
Links: 1
/A/B1 Group
- Location: 1:91048
+ Location: 1:90640
Links: 1
/A/B1/simple Dataset {6/6}
- Location: 1:90216
+ Location: 1:89808
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/A/B2 Group
- Location: 1:94584
+ Location: 1:94176
Links: 1
/A/B2/simple2 Dataset {6/6}
- Location: 1:94456
+ Location: 1:94048
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/C Group
- Location: 1:97792
+ Location: 1:97384
Links: 1
/C/D Group
- Location: 1:98496
+ Location: 1:98088
Links: 1
/C/D/simple Dataset {6/6}
- Location: 1:97664
+ Location: 1:97256
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E Group
- Location: 1:103920
+ Location: 1:112000
Links: 1
/E/F Group
- Location: 1:103960
+ Location: 1:112704
Links: 1
/E/F/grp_dsets Group
- Location: 1:100608
+ Location: 1:100200
Links: 1
/E/F/grp_dsets/chunk Dataset {6/6}
- Location: 1:102744
+ Location: 1:104384
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/compact Dataset {6/6}
- Location: 1:103200
+ Location: 1:104840
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/compound Dataset {2/2}
- Location: 1:103336
+ Location: 1:104976
Links: 1
Storage: <details removed for portability>
Type: struct {
@@ -64,60 +64,60 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
"str2" +20 20-byte null-terminated ASCII string
} 40 bytes
/E/F/grp_dsets/compressed Dataset {6/6}
- Location: 1:103552
+ Location: 1:107288
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/E/F/grp_dsets/named_vl Dataset {2/2}
- Location: 1:103768
+ Location: 1:111600
Links: 1
Storage: <details removed for portability>
- Type: shared-1:103720 variable length of
+ Type: shared-1:107456 variable length of
32-bit little-endian integer
/E/F/grp_dsets/nested_vl Dataset {2/2}
- Location: 1:112240
+ Location: 1:111728
Links: 1
Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
/E/F/grp_dsets/simple Dataset {6/6}
- Location: 1:112384
+ Location: 1:111872
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/vl Type
- Location: 1:103720
+ Location: 1:107456
Links: 2
- Type: shared-1:103720 variable length of
+ Type: shared-1:107456 variable length of
32-bit little-endian integer
/G Group
- Location: 1:128176
+ Location: 1:127648
Links: 1
/G/H Group
- Location: 1:128880
+ Location: 1:128352
Links: 1
/G/H/grp_nested Group
- Location: 1:115160
+ Location: 1:114728
Links: 1
/G/H/grp_nested/grp_dsets Group
- Location: 1:115952
+ Location: 1:115520
Links: 1
/G/H/grp_nested/grp_dsets/chunk Dataset {6/6}
- Location: 1:118088
+ Location: 1:119704
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/compact Dataset {6/6}
- Location: 1:120688
+ Location: 1:120160
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/compound Dataset {2/2}
- Location: 1:120824
+ Location: 1:120296
Links: 1
Storage: <details removed for portability>
Type: struct {
@@ -125,34 +125,34 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
"str2" +20 20-byte null-terminated ASCII string
} 40 bytes
/G/H/grp_nested/grp_dsets/compressed Dataset {6/6}
- Location: 1:123136
+ Location: 1:122608
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/named_vl Dataset {2/2}
- Location: 1:127448
+ Location: 1:126920
Links: 1
Storage: <details removed for portability>
- Type: shared-1:123304 variable length of
+ Type: shared-1:122776 variable length of
32-bit little-endian integer
/G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2}
- Location: 1:127576
+ Location: 1:127048
Links: 1
Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
/G/H/grp_nested/grp_dsets/simple Dataset {6/6}
- Location: 1:127720
+ Location: 1:127192
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/vl Type
- Location: 1:123304
+ Location: 1:122776
Links: 2
- Type: shared-1:123304 variable length of
+ Type: shared-1:122776 variable length of
32-bit little-endian integer
/chunk Dataset {6/6}
Location: 1:6216
@@ -184,18 +184,18 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:33760
Links: 1
/grp_dsets/chunk Dataset {6/6}
- Location: 1:35896
+ Location: 1:37944
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/compact Dataset {6/6}
- Location: 1:36352
+ Location: 1:38400
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/compound Dataset {2/2}
- Location: 1:36488
+ Location: 1:38536
Links: 1
Storage: <details removed for portability>
Type: struct {
@@ -203,62 +203,62 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
"str2" +20 20-byte null-terminated ASCII string
} 40 bytes
/grp_dsets/compressed Dataset {6/6}
- Location: 1:36704
+ Location: 1:40848
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_dsets/named_vl Dataset {2/2}
- Location: 1:36920
+ Location: 1:45160
Links: 1
Storage: <details removed for portability>
- Type: shared-1:36872 variable length of
+ Type: shared-1:41016 variable length of
32-bit little-endian integer
/grp_dsets/nested_vl Dataset {2/2}
- Location: 1:45392
+ Location: 1:45288
Links: 1
Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
/grp_dsets/simple Dataset {6/6}
- Location: 1:45536
+ Location: 1:45432
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/simple_group Dataset {6/6}
- Location: 1:61744
+ Location: 1:61544
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/vl Type
- Location: 1:36872
+ Location: 1:41016
Links: 2
- Type: shared-1:36872 variable length of
+ Type: shared-1:41016 variable length of
32-bit little-endian integer
/grp_empty Group
Location: 1:32968
Links: 1
/grp_nested Group
- Location: 1:46328
+ Location: 1:46224
Links: 1
/grp_nested/grp_dsets Group
- Location: 1:47120
+ Location: 1:47016
Links: 1
/grp_nested/grp_dsets/chunk Dataset {6/6}
- Location: 1:49256
+ Location: 1:51200
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/compact Dataset {6/6}
- Location: 1:51856
+ Location: 1:51656
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/compound Dataset {2/2}
- Location: 1:51992
+ Location: 1:51792
Links: 1
Storage: <details removed for portability>
Type: struct {
@@ -266,51 +266,51 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
"str2" +20 20-byte null-terminated ASCII string
} 40 bytes
/grp_nested/grp_dsets/compressed Dataset {6/6}
- Location: 1:54304
+ Location: 1:54104
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/named_vl Dataset {2/2}
- Location: 1:58616
+ Location: 1:58416
Links: 1
Storage: <details removed for portability>
- Type: shared-1:54472 variable length of
+ Type: shared-1:54272 variable length of
32-bit little-endian integer
/grp_nested/grp_dsets/nested_vl Dataset {2/2}
- Location: 1:58744
+ Location: 1:58544
Links: 1
Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
/grp_nested/grp_dsets/simple Dataset {6/6}
- Location: 1:58888
+ Location: 1:58688
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/vl Type
- Location: 1:54472
+ Location: 1:54272
Links: 2
- Type: shared-1:54472 variable length of
+ Type: shared-1:54272 variable length of
32-bit little-endian integer
/grp_rename Group
- Location: 1:62952
+ Location: 1:62752
Links: 1
/grp_rename/chunk Dataset {6/6}
- Location: 1:65088
+ Location: 1:66936
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/compact Dataset {6/6}
- Location: 1:65544
+ Location: 1:67392
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/compound Dataset {2/2}
- Location: 1:65680
+ Location: 1:67528
Links: 1
Storage: <details removed for portability>
Type: struct {
@@ -318,28 +318,28 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
"str2" +20 20-byte null-terminated ASCII string
} 40 bytes
/grp_rename/compressed Dataset {6/6}
- Location: 1:65896
+ Location: 1:69840
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_rename/grp_dsets Group
- Location: 1:75936
+ Location: 1:75632
Links: 1
/grp_rename/grp_dsets/chunk Dataset {6/6}
- Location: 1:78072
+ Location: 1:79816
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/compact Dataset {6/6}
- Location: 1:78528
+ Location: 1:80272
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/compound Dataset {2/2}
- Location: 1:78664
+ Location: 1:80408
Links: 1
Storage: <details removed for portability>
Type: struct {
@@ -347,57 +347,57 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
"str2" +20 20-byte null-terminated ASCII string
} 40 bytes
/grp_rename/grp_dsets/compressed Dataset {6/6}
- Location: 1:78880
+ Location: 1:82720
Links: 1
Chunks: {2} 8 bytes
Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/named_vl Dataset {2/2}
- Location: 1:79096
+ Location: 1:87032
Links: 1
Storage: <details removed for portability>
- Type: shared-1:79048 variable length of
+ Type: shared-1:82888 variable length of
32-bit little-endian integer
/grp_rename/grp_dsets/nested_vl Dataset {2/2}
- Location: 1:87568
+ Location: 1:87160
Links: 1
Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
/grp_rename/grp_dsets/simple Dataset {6/6}
- Location: 1:87712
+ Location: 1:87304
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/vl Type
- Location: 1:79048
+ Location: 1:82888
Links: 2
- Type: shared-1:79048 variable length of
+ Type: shared-1:82888 variable length of
32-bit little-endian integer
/grp_rename/named_vl Dataset {2/2}
- Location: 1:66112
+ Location: 1:74152
Links: 1
Storage: <details removed for portability>
- Type: shared-1:66064 variable length of
+ Type: shared-1:70008 variable length of
32-bit little-endian integer
/grp_rename/nested_vl Dataset {2/2}
- Location: 1:74584
+ Location: 1:74280
Links: 1
Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
/grp_rename/simple Dataset {6/6}
- Location: 1:74728
+ Location: 1:74424
Links: 1
Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/vl Type
- Location: 1:66064
+ Location: 1:70008
Links: 2
- Type: shared-1:66064 variable length of
+ Type: shared-1:70008 variable length of
32-bit little-endian integer
/named_vl Dataset {2/2}
Location: 1:13104