diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-03 13:17:14 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-03 13:17:14 (GMT) |
| commit | d8c4700561368b378dd1fe6b708a9c01378b7dc5 (patch) | |
| tree | 6c3691a56e0138c089d5dc7682d9e62c0c1f8650 /src/H5HFtest.c | |
| parent | ebd34a6a4d390b0074799a7f1e6a2bd59882df99 (diff) | |
| download | hdf5-d8c4700561368b378dd1fe6b708a9c01378b7dc5.zip hdf5-d8c4700561368b378dd1fe6b708a9c01378b7dc5.tar.gz hdf5-d8c4700561368b378dd1fe6b708a9c01378b7dc5.tar.bz2 | |
[svn-r17807] Description:
Bring r17623 from trunk to 1.8 branch:
Bring "compress group's fractal heap" feature from feature branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.1 (amazon) in debug mode
Mac OS X/32 10.6.1 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5HFtest.c')
| -rw-r--r-- | src/H5HFtest.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/H5HFtest.c b/src/H5HFtest.c index 76611e9..30adf96 100644 --- a/src/H5HFtest.c +++ b/src/H5HFtest.c @@ -133,8 +133,26 @@ H5HF_cmp_cparam_test(const H5HF_create_t *cparam1, const H5HF_create_t *cparam2) HDassert(cparam2); /* Compare doubling table parameters */ - if((ret_value = HDmemcmp(&(cparam1->managed), &(cparam2->managed), sizeof(H5HF_dtable_cparam_t)))) - HGOTO_DONE(ret_value) + if(cparam1->managed.width < cparam2->managed.width) + HGOTO_DONE(-1) + else if(cparam1->managed.width > cparam2->managed.width) + HGOTO_DONE(1) + if(cparam1->managed.start_block_size < cparam2->managed.start_block_size) + HGOTO_DONE(-1) + else if(cparam1->managed.start_block_size > cparam2->managed.start_block_size) + HGOTO_DONE(1) + if(cparam1->managed.max_direct_size < cparam2->managed.max_direct_size) + HGOTO_DONE(-1) + else if(cparam1->managed.max_direct_size > cparam2->managed.max_direct_size) + HGOTO_DONE(1) + if(cparam1->managed.max_index < cparam2->managed.max_index) + HGOTO_DONE(-1) + else if(cparam1->managed.max_index > cparam2->managed.max_index) + HGOTO_DONE(1) + if(cparam1->managed.start_root_rows < cparam2->managed.start_root_rows) + HGOTO_DONE(-1) + else if(cparam1->managed.start_root_rows > cparam2->managed.start_root_rows) + HGOTO_DONE(1) /* Compare other general parameters for heap */ if(cparam1->max_man_size < cparam2->max_man_size) |