summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-05-11 23:55:48 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-05-11 23:55:48 (GMT)
commitbb26d1fe8d87167811f32a8991b7d21a93e068d6 (patch)
tree53380d9517d20f5176d20e26f8e0fe7ccc3634dc /testpar
parent33f060108b04495e91cd7c458e647d34cc2d5b71 (diff)
downloadhdf5-bb26d1fe8d87167811f32a8991b7d21a93e068d6.zip
hdf5-bb26d1fe8d87167811f32a8991b7d21a93e068d6.tar.gz
hdf5-bb26d1fe8d87167811f32a8991b7d21a93e068d6.tar.bz2
[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
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_cache.c4
1 files 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++;
}