diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-05-22 15:05:53 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-05-22 15:05:53 (GMT) |
commit | d392756a1b6e28ff5a28e80c5c26513e8ef54e69 (patch) | |
tree | 00479cc9a7baba6c7e8e68d375f79221729751d4 /src/H5Z.c | |
parent | 57e57ebb14aa3f5a88245965292031f25dfc7756 (diff) | |
download | hdf5-d392756a1b6e28ff5a28e80c5c26513e8ef54e69.zip hdf5-d392756a1b6e28ff5a28e80c5c26513e8ef54e69.tar.gz hdf5-d392756a1b6e28ff5a28e80c5c26513e8ef54e69.tar.bz2 |
[svn-r400] Changes since 19980513
----------------------
./html/Datasets.html
Fixed a couple of typos.
./src/H5.c
Added the `Z' modifier to HDfprintf() for `size_t' sizes. Use
it like this:
HDfprintf(stderr,"size is %Zd\n", (size_t)x);
./src/H5AC.c
./src/H5F.c
./src/H5Fprivate.h
The maximum number of meta data objects that can be cached can
be set from the application (but the library might not honor
it every time; it's a hint).
./src/H5D.c
Changed a warning message so it's not so alarming.
./src/H5Fistore.c
Chunks can be cached.
./src/H5O.c
./src/H5Oprivate.h
Added H5O_copy() and H5O_free() to copy and free messages.
./src/H5P.c
./src/H5Ppublic.h
Added H5Pset_cache() and H5Pget_cache() and changed lots of
"template" to "property list".
./src/H5Z.c
./src/H5Zpublic.h
Miscellaneous little things to clean up. Mostly just removed
H5Z_MAXVAL and added H5Z_USERDEF_MIN and H5Z_USERDEF_MAX.
./MANIFEST
./test/Makefile.in
./test/chunk.c [NEW]
Added a performance test for chunk caching. It looks at the
amount of I/O instead of timing because timing is partly
dependent on the chunk size and I wanted a measurement that
was a function of only the cache size. Run `chunk' with no
arguments and then say `gnuplot x-gnuplot' to see the plots
(press return between plots). Postscript files are created for
each plot.
./test/big.c
./test/cmpd_dset.c
./test/extend.c
./test/external.c
./test/gheap.c
Added H5F_ACC_DEBUG so we can see cache performance
statistics.
Diffstat (limited to 'src/H5Z.c')
-rw-r--r-- | src/H5Z.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -50,7 +50,7 @@ typedef struct H5Z_class_t { } uncomp; #endif } H5Z_class_t; -static H5Z_class_t H5Z_g[H5Z_MAXVAL+1]; +static H5Z_class_t H5Z_g[H5Z_USERDEF_MAX+1]; /* Compression and uncompression methods */ static size_t H5Z_zlib_c (unsigned int flags, size_t __unused__ cd_size, @@ -114,21 +114,21 @@ H5Z_term_interface (void) int i, nprint=0; char name[16]; - for (i=0; i<=H5Z_MAXVAL; i++) { + for (i=0; i<=H5Z_USERDEF_MAX; i++) { if (H5Z_g[i].comp.nbytes || H5Z_g[i].uncomp.nbytes) { if (0==nprint++) { HDfprintf (stderr, "H5Z: compression statistics accumulated " "over life of library:\n"); - HDfprintf (stderr, " %-10s %8s %8s %8s %8s %8s %8s %9s\n", + HDfprintf (stderr, " %-10s %10s %7s %7s %8s %8s %8s %9s\n", "Method", "Total", "Overrun", "Errors", "User", "System", "Elapsed", "Bandwidth"); - HDfprintf (stderr, " %-10s %8s %8s %8s %8s %8s %8s %9s\n", + HDfprintf (stderr, " %-10s %10s %7s %7s %8s %8s %8s %9s\n", "------", "-----", "-------", "------", "----", "------", "-------", "---------"); } sprintf (name, "%s-c", H5Z_g[i].name); HDfprintf (stderr, - " %-12s %8Hd %8Hd %8Hd %8.2f %8.2f %8.2f ", + " %-12s %10Hd %7Hd %7Hd %8.2f %8.2f %8.2f ", name, H5Z_g[i].comp.nbytes, H5Z_g[i].comp.over, @@ -145,7 +145,7 @@ H5Z_term_interface (void) sprintf (name, "%s-u", H5Z_g[i].name); HDfprintf (stderr, - " %-12s %8Hd %8Hd %8Hd %8.2f %8.2f %8.2f ", + " %-12s %10Hd %7Hd %7Hd %8.2f %8.2f %8.2f ", name, H5Z_g[i].uncomp.nbytes, H5Z_g[i].uncomp.over, @@ -198,7 +198,7 @@ H5Zregister (H5Z_method_t method, const char *name, H5Z_func_t cfunc, FUNC_ENTER (H5Zregister, FAIL); /* Check args */ - if (method<0 || method>H5Z_MAXVAL) { + if (method<0 || method>H5Z_USERDEF_MAX) { HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid data compression method number"); } @@ -381,7 +381,7 @@ H5Z_register (H5Z_method_t method, const char *name, H5Z_func_t cfunc, { FUNC_ENTER (H5Z_register, FAIL); - assert (method>=0 && method<=H5Z_MAXVAL); + assert (method>=0 && method<=H5Z_USERDEF_MAX); H5MM_xfree (H5Z_g[method].name); H5Z_g[method].name = H5MM_xstrdup (name); H5Z_g[method].compress = cfunc; |