diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-07-30 16:38:21 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-07-30 16:38:21 (GMT) |
commit | c7b935a9acd629929296c1ccdd05214cc5c01e5d (patch) | |
tree | 07d051649f88b4d65f98316182e6191b038fc4c7 /src | |
parent | a34534c9b8321f4de9fadd836be926497f7461d4 (diff) | |
download | hdf5-c7b935a9acd629929296c1ccdd05214cc5c01e5d.zip hdf5-c7b935a9acd629929296c1ccdd05214cc5c01e5d.tar.gz hdf5-c7b935a9acd629929296c1ccdd05214cc5c01e5d.tar.bz2 |
[svn-r547] Changes since 19980729
----------------------
./MANIFEST
./test/Makefile.in
./test/mtime.c [NEW]
Test for the modification time message.
./src/H5AC.c
./src/H5Fistore.c
Turned off printing of statistics on H5close() if H5AC_DEBUG
isn't defined.
Diffstat (limited to 'src')
-rw-r--r-- | src/.distdep | 167 | ||||
-rw-r--r-- | src/H5AC.c | 6 | ||||
-rw-r--r-- | src/H5Distore.c | 41 | ||||
-rw-r--r-- | src/H5Fistore.c | 41 |
4 files changed, 161 insertions, 94 deletions
diff --git a/src/.distdep b/src/.distdep index c8e7e52..516813c 100644 --- a/src/.distdep +++ b/src/.distdep @@ -1,13 +1,3 @@ -H5AC.o: \ - H5AC.c \ - H5private.h \ - H5public.h \ - H5config.h \ - H5ACprivate.h \ - H5ACpublic.h \ - H5Fprivate.h \ - H5Fpublic.h \ - H5Ipublic.h H5B.o: \ H5B.c \ H5private.h \ @@ -628,36 +618,6 @@ H5E.o: \ H5Eprivate.h \ H5Epublic.h \ H5MMprivate.h -H5Fistore.o: \ - H5Fistore.c \ - H5private.h \ - H5public.h \ - H5config.h \ - H5Dprivate.h \ - H5Dpublic.h \ - H5Ipublic.h \ - H5Fprivate.h \ - H5Fpublic.h \ - H5Gprivate.h \ - H5Gpublic.h \ - H5Bprivate.h \ - H5Bpublic.h \ - H5Oprivate.h \ - H5Opublic.h \ - H5HGprivate.h \ - H5HGpublic.h \ - H5Tprivate.h \ - H5Tpublic.h \ - H5Sprivate.h \ - H5Spublic.h \ - H5Zprivate.h \ - H5Zpublic.h \ - H5Eprivate.h \ - H5Epublic.h \ - H5MFprivate.h \ - H5MFpublic.h \ - H5MMprivate.h \ - H5MMpublic.h H5Oattr.o: \ H5Oattr.c \ H5private.h \ @@ -760,31 +720,6 @@ H5Ssimp.o: \ H5Tpublic.h \ H5Zprivate.h \ H5Zpublic.h -H5T.o: \ - H5T.c \ - H5private.h \ - H5public.h \ - H5config.h \ - H5Dprivate.h \ - H5Dpublic.h \ - H5Ipublic.h \ - H5Fprivate.h \ - H5Fpublic.h \ - H5Gprivate.h \ - H5Gpublic.h \ - H5Bprivate.h \ - H5Bpublic.h \ - H5Oprivate.h \ - H5Opublic.h \ - H5HGprivate.h \ - H5HGpublic.h \ - H5Tprivate.h \ - H5Tpublic.h \ - H5Sprivate.h \ - H5Spublic.h \ - H5Zprivate.h \ - H5Zpublic.h \ - H5Iprivate.h H5V.o: \ H5V.c \ H5private.h \ @@ -1089,3 +1024,105 @@ H5Omtime.o: \ H5HGpublic.h \ H5Tprivate.h \ H5Tpublic.h +H5D.o: \ + H5D.c \ + H5private.h \ + H5public.h \ + H5config.h \ + H5Iprivate.h \ + H5Ipublic.h \ + H5ACprivate.h \ + H5ACpublic.h \ + H5Fprivate.h \ + H5Fpublic.h \ + H5Dpublic.h \ + H5Dprivate.h \ + H5Gprivate.h \ + H5Gpublic.h \ + H5Bprivate.h \ + H5Bpublic.h \ + H5Oprivate.h \ + H5Opublic.h \ + H5HGprivate.h \ + H5HGpublic.h \ + H5Tprivate.h \ + H5Tpublic.h \ + H5Sprivate.h \ + H5Spublic.h \ + H5Zprivate.h \ + H5Zpublic.h \ + H5Eprivate.h \ + H5Epublic.h \ + H5HLprivate.h \ + H5HLpublic.h \ + H5MFprivate.h \ + H5MFpublic.h +H5T.o: \ + H5T.c \ + H5private.h \ + H5public.h \ + H5config.h \ + H5Dprivate.h \ + H5Dpublic.h \ + H5Ipublic.h \ + H5Fprivate.h \ + H5Fpublic.h \ + H5Gprivate.h \ + H5Gpublic.h \ + H5Bprivate.h \ + H5Bpublic.h \ + H5Oprivate.h \ + H5Opublic.h \ + H5HGprivate.h \ + H5HGpublic.h \ + H5Tprivate.h \ + H5Tpublic.h \ + H5Sprivate.h \ + H5Spublic.h \ + H5Zprivate.h \ + H5Zpublic.h \ + H5Iprivate.h \ + H5Eprivate.h \ + H5Epublic.h \ + H5MMprivate.h +H5AC.o: \ + H5AC.c \ + H5private.h \ + H5public.h \ + H5config.h \ + H5ACprivate.h \ + H5ACpublic.h \ + H5Fprivate.h \ + H5Fpublic.h \ + H5Ipublic.h \ + H5Dpublic.h \ + H5Eprivate.h \ + H5Epublic.h +H5Fistore.o: \ + H5Fistore.c \ + H5private.h \ + H5public.h \ + H5config.h \ + H5Dprivate.h \ + H5Dpublic.h \ + H5Ipublic.h \ + H5Fprivate.h \ + H5Fpublic.h \ + H5Gprivate.h \ + H5Gpublic.h \ + H5Bprivate.h \ + H5Bpublic.h \ + H5Oprivate.h \ + H5Opublic.h \ + H5HGprivate.h \ + H5HGpublic.h \ + H5Tprivate.h \ + H5Tpublic.h \ + H5Sprivate.h \ + H5Spublic.h \ + H5Zprivate.h \ + H5Zpublic.h \ + H5Eprivate.h \ + H5Epublic.h \ + H5MFprivate.h \ + H5MFpublic.h @@ -845,15 +845,18 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, const haddr_t *addr, *------------------------------------------------------------------------- */ herr_t -H5AC_debug(H5F_t *f) +H5AC_debug(H5F_t __unused__ *f) { +#ifdef H5AC_DEBUG H5AC_subid_t i; char s[32], ascii[32]; H5AC_t *cache = f->shared->cache; double miss_rate; +#endif FUNC_ENTER(H5AC_debug, FAIL); +#ifdef H5AC_DEBUG fprintf(stderr, "H5AC: meta data cache statistics for file %s\n", f->name); fprintf(stderr, " %-18s %8s %8s %8s %8s+%-8s\n", "Layer", "Hits", "Misses", "MissRate", "Inits", "Flushes"); @@ -904,6 +907,7 @@ H5AC_debug(H5F_t *f) ((long)(cache->diagnostics[i].nflushes) - (long)(cache->diagnostics[i].ninits))); } +#endif FUNC_LEAVE(SUCCEED); } diff --git a/src/H5Distore.c b/src/H5Distore.c index 262a58f..a8b321b 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -1688,21 +1688,32 @@ H5F_istore_stats (H5F_t *f, hbool_t headers) "-----", "----", "------", "--------", "-----", "-------"); } - if (rdcc->nhits>0 || rdcc->nmisses>0) { - miss_rate = 100.0 * rdcc->nmisses / - (rdcc->nhits + rdcc->nmisses); - } else { - miss_rate = 0.0; - } - if (miss_rate > 100) { - sprintf(ascii, "%7d%%", (int) (miss_rate + 0.5)); - } else { - sprintf(ascii, "%7.2f%%", miss_rate); +#ifndef H5AC_DEBUG + /* + * If we're not debugging the H5AC layer then print these statistics only + * if we printed the headers that go with them. + */ + if (headers) { +#endif + if (rdcc->nhits>0 || rdcc->nmisses>0) { + miss_rate = 100.0 * rdcc->nmisses / + (rdcc->nhits + rdcc->nmisses); + } else { + miss_rate = 0.0; + } + if (miss_rate > 100) { + sprintf(ascii, "%7d%%", (int) (miss_rate + 0.5)); + } else { + sprintf(ascii, "%7.2f%%", miss_rate); + } + + fprintf(stderr, " %-18s %8u %8u %7s %8d+%-9ld\n", + "raw data chunks", rdcc->nhits, rdcc->nmisses, ascii, + rdcc->ninits, (long)(rdcc->nflushes)-(long)(rdcc->ninits)); +#ifndef H5AC_DEBUG } - - fprintf(stderr, " %-18s %8u %8u %7s %8d+%-9ld\n", - "raw data chunks", rdcc->nhits, rdcc->nmisses, ascii, - rdcc->ninits, (long)(rdcc->nflushes)-(long)(rdcc->ninits)); +#endif + FUNC_LEAVE (SUCCEED); } @@ -1823,7 +1834,9 @@ H5F_istore_allocate (H5F_t *f, const H5O_layout_t *layout, uint8 *chunk=NULL; intn idx_hint=0; size_t chunk_size; +#ifdef AKC H5F_istore_ud1_t udata; +#endif FUNC_ENTER(H5F_istore_allocate, FAIL); #ifdef AKC diff --git a/src/H5Fistore.c b/src/H5Fistore.c index 262a58f..a8b321b 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -1688,21 +1688,32 @@ H5F_istore_stats (H5F_t *f, hbool_t headers) "-----", "----", "------", "--------", "-----", "-------"); } - if (rdcc->nhits>0 || rdcc->nmisses>0) { - miss_rate = 100.0 * rdcc->nmisses / - (rdcc->nhits + rdcc->nmisses); - } else { - miss_rate = 0.0; - } - if (miss_rate > 100) { - sprintf(ascii, "%7d%%", (int) (miss_rate + 0.5)); - } else { - sprintf(ascii, "%7.2f%%", miss_rate); +#ifndef H5AC_DEBUG + /* + * If we're not debugging the H5AC layer then print these statistics only + * if we printed the headers that go with them. + */ + if (headers) { +#endif + if (rdcc->nhits>0 || rdcc->nmisses>0) { + miss_rate = 100.0 * rdcc->nmisses / + (rdcc->nhits + rdcc->nmisses); + } else { + miss_rate = 0.0; + } + if (miss_rate > 100) { + sprintf(ascii, "%7d%%", (int) (miss_rate + 0.5)); + } else { + sprintf(ascii, "%7.2f%%", miss_rate); + } + + fprintf(stderr, " %-18s %8u %8u %7s %8d+%-9ld\n", + "raw data chunks", rdcc->nhits, rdcc->nmisses, ascii, + rdcc->ninits, (long)(rdcc->nflushes)-(long)(rdcc->ninits)); +#ifndef H5AC_DEBUG } - - fprintf(stderr, " %-18s %8u %8u %7s %8d+%-9ld\n", - "raw data chunks", rdcc->nhits, rdcc->nmisses, ascii, - rdcc->ninits, (long)(rdcc->nflushes)-(long)(rdcc->ninits)); +#endif + FUNC_LEAVE (SUCCEED); } @@ -1823,7 +1834,9 @@ H5F_istore_allocate (H5F_t *f, const H5O_layout_t *layout, uint8 *chunk=NULL; intn idx_hint=0; size_t chunk_size; +#ifdef AKC H5F_istore_ud1_t udata; +#endif FUNC_ENTER(H5F_istore_allocate, FAIL); #ifdef AKC |