diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-04-04 17:15:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-04-04 17:15:32 (GMT) |
| commit | a4038aed6e895b9d1e686073c135f8aaacc9adab (patch) | |
| tree | 14fa69cf41b1822ab12587d4609f2dd17f0589db /src | |
| parent | db9eeb9f6ae954c0375349dc411a7ad6ddcf16cc (diff) | |
| parent | d6ea49f5cbcaa852cd0caf34278ec61108667bc3 (diff) | |
| download | hdf5-a4038aed6e895b9d1e686073c135f8aaacc9adab.zip hdf5-a4038aed6e895b9d1e686073c135f8aaacc9adab.tar.gz hdf5-a4038aed6e895b9d1e686073c135f8aaacc9adab.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'd6ea49f5cbcaa852cd0caf34278ec61108667bc3':
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.c | 10 |
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: |