summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2017-04-03 23:48:51 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2017-04-03 23:48:51 (GMT)
commitd6ea49f5cbcaa852cd0caf34278ec61108667bc3 (patch)
treef1991a33af86c907fd4537d38b6ae2c78b3d52c8 /src
parent6387f7099d22c66dab415c57f9fd547eb86e4ad5 (diff)
parentd522632b9e1f1d88db2117e89f3caba0dc4cf38b (diff)
downloadhdf5-d6ea49f5cbcaa852cd0caf34278ec61108667bc3.zip
hdf5-d6ea49f5cbcaa852cd0caf34278ec61108667bc3.tar.gz
hdf5-d6ea49f5cbcaa852cd0caf34278ec61108667bc3.tar.bz2
Merge pull request #390 in HDFFV/hdf5 from develop to hdf5_1_10
* commit 'd522632b9e1f1d88db2117e89f3caba0dc4cf38b': Switch to using flag in signal handler, to trigger dropping out of main loop and shutdown cleanly, instead of calling leave() from the signal handler. Fix HDFFV-8089 Description: Some code within an "ifdef H5D_CHUNK_DEBUG" block was using outdated data structure but not caught because the case of H5D_CHUNK_DEBUG being defined was never tested. It was commented out. I defined H5D_CHUNK_DEBUG, tested, and commented out again. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test)
Diffstat (limited to 'src')
-rw-r--r--src/H5Dchunk.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 7a646af..63e692f 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -6060,9 +6060,9 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
#endif
if (headers) {
- if (rdcc->nhits>0 || rdcc->nmisses>0) {
- miss_rate = 100.0 * rdcc->nmisses /
- (rdcc->nhits + rdcc->nmisses);
+ if (rdcc->stats.nhits>0 || rdcc->stats.nmisses>0) {
+ miss_rate = 100.0 * rdcc->stats.nmisses /
+ (rdcc->stats.nhits + rdcc->stats.nmisses);
} else {
miss_rate = 0.0;
}
@@ -6073,8 +6073,8 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
}
fprintf(H5DEBUG(AC), " %-18s %8u %8u %7s %8d+%-9ld\n",
- "raw data chunks", rdcc->nhits, rdcc->nmisses, ascii,
- rdcc->ninits, (long)(rdcc->nflushes)-(long)(rdcc->ninits));
+ "raw data chunks", rdcc->stats.nhits, rdcc->stats.nmisses, ascii,
+ rdcc->stats.ninits, (long)(rdcc->stats.nflushes)-(long)(rdcc->stats.ninits));
}
done: