diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-07-20 02:32:47 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-07-20 02:32:47 (GMT) |
| commit | d08619bfe1a3cbc593bdaae5a5bd393e1d33f150 (patch) | |
| tree | 57ec6ef4e2167462f2a10b5739b0f79f2299584d /src/H5AC2pkg.h | |
| parent | 90497050b818e914ab814e40811b1c0ff98384ea (diff) | |
| download | hdf5-d08619bfe1a3cbc593bdaae5a5bd393e1d33f150.zip hdf5-d08619bfe1a3cbc593bdaae5a5bd393e1d33f150.tar.gz hdf5-d08619bfe1a3cbc593bdaae5a5bd393e1d33f150.tar.bz2 | |
[svn-r15388] Description:
Convert object header cache client to use the new metadata journaling
cache, which included adding a new client for handling continuation chunks.
Added "real" protect calls around modifying chunks in object headers.
Switched a few more metadata cache library API routines to drop the
file pointer, when it is not needed (pinning/unpinning entries, etc.)
Fixed bug in journaling cache handling of 'image_len' callbacks and
also changed cache to retry deserializing entries when the entry's size is
larger than the speculative size initially tried.
Retrying for 'image_len' callbacks has problems with the 'multi' VFD,
so the h5dump and FORTRAN 'multi' tests are commented out, until the changes to
the 'multi' VFD from the file free space branch are brought back into the
trunk.
Currently, the 'h5recover' tool has a bug which requires it to be run
twice before replaying the journal "sticks". However, this is from an earlier
checkin, since the code in the branch already has this behavior... :-(
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.5.4 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5AC2pkg.h')
| -rw-r--r-- | src/H5AC2pkg.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/H5AC2pkg.h b/src/H5AC2pkg.h index 202f4e3..ddf78bd 100644 --- a/src/H5AC2pkg.h +++ b/src/H5AC2pkg.h @@ -42,15 +42,12 @@ #ifndef _H5AC2pkg_H #define _H5AC2pkg_H -#define H5C2_PACKAGE /*suppress error about including H5C2pkg */ - /* Get package's private header */ -#include "H5AC2private.h" -#include "H5C2private.h" +#include "H5AC2private.h" /* Metadata cache */ /* Get needed headers */ -#include "H5C2pkg.h" /* Cache */ +#include "H5C2private.h" /* Cache */ #include "H5SLprivate.h" /* Skip lists */ @@ -332,4 +329,5 @@ typedef struct H5AC2_aux_t #endif /* H5_HAVE_PARALLEL */ -#endif /* _H5C2pkg_H */ +#endif /* _H5AC2pkg_H */ + |