[svn-r18230] Description:

Bring r18229 from metadata journaling "merging" branch into trunk:

	Bring r18227 from metadata_journaling branch to the merging branch:

	Small cleanups and move v1 cache maintenance macros into package header
file, to better align with changes to v2 cache.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.2 (amazon) in debug mode
        Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
This commit is contained in:
Quincey Koziol 2010-02-11 14:29:45 -05:00
parent 5adc0f3807
commit e3b4922d8d
5 changed files with 2592 additions and 2587 deletions

2581
src/H5C.c

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -15,7 +15,7 @@
/*-------------------------------------------------------------------------
*
* Created: H5Cproto.h
* Created: H5Cpublic.h
* June 4, 2005
* John Mainzer
*

View File

@ -804,7 +804,6 @@ done:
*
* Programmer: Vailin Choi; Feb 2009
*
*
*-------------------------------------------------------------------------
*/
herr_t

View File

@ -6139,7 +6139,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
*/
if ( pass ) {
spec[0].flush_ops[0].flag = TRUE;
spec[0].flush_ops[1].flag = TRUE;
test_num = 10;
check_flush_cache__flush_op_test(file_ptr,