mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r9447] Purpose:

Browse Source 
Bug fix

Description:
    Correct values used in "space utilization" equation: the 'used' and
'total' values were backwards.

Platforms tested:
    FreeBSD 4.10 (sleipnir)
    Too minor to require h5committest
This commit is contained in:
Quincey Koziol 2004-10-22 16:03:50 -05:00
parent cacc8fa4c6
commit b4d39e7adb
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release_docs/RELEASE.txt
View File

@ -386,6 +386,8 @@ Bug Fixes since HDF5-1.6.0 release
Tools
-----
- Fixed space utilization reported in h5ls to correct error in formula
used. QAK - 2004/10/22
- Fixed h5redeploy which sometimes complain too many argument for the
test command. (The complain did not hinder the h5redploy to
proceed correctly.) AKC - 2003/11/03

21
tools/h5ls/h5ls.c
View File

@ -1534,24 +1534,19 @@ dataset_list2(hid_t dset, const char UNUSED *name)
}
/* Print total raw storage size */
used = H5Sget_simple_extent_npoints(space) * H5Tget_size(type);
total = H5Dget_storage_size(dset);
total = H5Sget_simple_extent_npoints(space) * H5Tget_size(type);
used = H5Dget_storage_size(dset);
printf(" %-10s ", "Storage:");
printf("%lu logical byte%s, %lu allocated byte%s",
(unsigned long)used, 1==used?"":"s",
(unsigned long)total, 1==total?"":"s");
if (total>0) {
(unsigned long)total, 1==total?"":"s",
(unsigned long)used, 1==used?"":"s");
if (used>0) {
#ifdef WIN32
hsize_t mask = (hsize_t)1 << (8*sizeof(hsize_t)-1);
if ((used & mask) || (total & mask)) {
total = 0; /*prevent utilization printing*/
} else {
utilization = (hssize_t)used*100.0 /(hssize_t)total;
}
utilization = (hssize_t)used*100.0 /(hssize_t)total;
#else
utilization = (used*100.0)/total;
utilization = (used*100.0)/total;
#endif
printf(", %1.2f%% utilization", utilization/*(used*100.0)/total*/);
printf(", %1.2f%% utilization", utilization);
}
putchar('\n');