summaryrefslogtreecommitdiffstats
path: root/src/H5S.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-04-30 15:54:52 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-04-30 15:54:52 (GMT)
commitcc2184b6efd25633b8a27cb23d57380e2f28a5b4 (patch)
tree6b276ffc0f426d101a06c84d271e64e882fa66a9 /src/H5S.c
parent2be6b9f63c53e20add431b497a13929d2df049a8 (diff)
downloadhdf5-cc2184b6efd25633b8a27cb23d57380e2f28a5b4.zip
hdf5-cc2184b6efd25633b8a27cb23d57380e2f28a5b4.tar.gz
hdf5-cc2184b6efd25633b8a27cb23d57380e2f28a5b4.tar.bz2
[svn-r1240] Changes since 19990427
---------------------- ./tools/h5ls.c Added a `--address' (`-a') switch which causes h5ls to display file addresses for raw data. For contiguous datasets it's just a nice simple number, but for chunked datasets it's a list of logical dataset coordinates, file addresses, filter masks, and storage sizes. Changed `--dump' switch to `--data'. ./src/H5D.c ./src/H5F.c ./src/H5Fprivate.h Enhanced the indexed-storage B-tree iterator so it can dump raw data addresses (and other info) to the standard error stream. Added H5Ddebug() so h5ls has a way to dump addresses for datasets. I'm not sure what else this API function should do, so I think we should discuss it before we document it. So far, h5ls is the only thing that uses it, and we can easily change that. ./src/H5Tconv.c ./test/dtypes.c Finally had a chance to verify Paul's H5T_conv_s_s (general string to string conversions) bug fixes and incorporate them into H5T_conv_f_f (general floating-point to floating-point conversions) and H5T_conv_i_i (general integer to integer conversons). Thanks Paul. ./src/H5D.c ./src/H5S.c ./src/H5Sprivate.h Added performance timers around data space read and write callbacks. They were already there for the gather/scatter callbacks. The timings for read/write callbacks are displayed along with gather/scatter when data space debugging is turned on. ./bin/iostats Updated to print totals. Added a `--fast' option that doesn't do any output except the totals and is much faster. ./bin/trace Changed __unused__ to UNUSED to match source code. ./config/gnu-flags Updated error message for pgcc. I've sent bug reports to the pgcc people but the new version still has the same bug. ./configure.in ./config/conclude.in ./config/depend.in Fixed dependencies for non-GNU makes when run in a directory other than the hdf5 source tree. Updated GNU `make dep' rules to copy the distributed dependencies for non-GNU makes into the source tree when run in some other directory.
Diffstat (limited to 'src/H5S.c')
-rw-r--r--src/H5S.c36
1 files changed, 35 insertions, 1 deletions
diff --git a/src/H5S.c b/src/H5S.c
index b2874ce06..bf4e9cd 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -134,7 +134,9 @@ H5S_term_interface(void)
for (j=0; j<2; j++) {
if (0==path->stats[j].gath_ncalls &&
0==path->stats[j].scat_ncalls &&
- 0==path->stats[j].bkg_ncalls) {
+ 0==path->stats[j].bkg_ncalls &&
+ 0==path->stats[j].read_ncalls &&
+ 0==path->stats[j].write_ncalls) {
continue;
}
if (0==nprints++) {
@@ -202,6 +204,38 @@ H5S_term_interface(void)
path->stats[j].bkg_timer.etime,
buf);
}
+
+ /* Read */
+ if (path->stats[j].read_ncalls) {
+ H5_bandwidth(buf,
+ (double)(path->stats[j].read_nbytes),
+ path->stats[j].read_timer.etime);
+ HDfprintf(H5DEBUG(S),
+ " %16s %10Hu %10Hu %8.2f %8.2f %8.2f "
+ "%10s\n", "read",
+ path->stats[j].read_nbytes,
+ path->stats[j].read_ncalls,
+ path->stats[j].read_timer.utime,
+ path->stats[j].read_timer.stime,
+ path->stats[j].read_timer.etime,
+ buf);
+ }
+
+ /* Write */
+ if (path->stats[j].write_ncalls) {
+ H5_bandwidth(buf,
+ (double)(path->stats[j].write_nbytes),
+ path->stats[j].write_timer.etime);
+ HDfprintf(H5DEBUG(S),
+ " %16s %10Hu %10Hu %8.2f %8.2f %8.2f "
+ "%10s\n", "write",
+ path->stats[j].write_nbytes,
+ path->stats[j].write_ncalls,
+ path->stats[j].write_timer.utime,
+ path->stats[j].write_timer.stime,
+ path->stats[j].write_timer.etime,
+ buf);
+ }
}
}
}