From bb26d1fe8d87167811f32a8991b7d21a93e068d6 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 11 May 2010 18:55:48 -0500 Subject: [svn-r18768] Description: Correct a mis-merged patch when marking an entry dirty. 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-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode --- testpar/t_cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 5bfb933..8d6b546 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -2794,7 +2794,7 @@ mark_entry_dirty(H5C_t * cache_ptr, entry_ptr = &(data[idx]); - HDassert ( entry_ptr->global_pinned ); + HDassert ( entry_ptr->locked || entry_ptr->global_pinned ); HDassert ( ! (entry_ptr->local_pinned) ); (entry_ptr->ver)++; @@ -2811,7 +2811,7 @@ mark_entry_dirty(H5C_t * cache_ptr, world_mpi_rank, fcn_name); } } - else + else if ( ! ( entry_ptr->locked ) ) { global_dirty_pins++; } -- cgit v0.12