diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 02:48:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 02:48:15 (GMT) |
| commit | 5d8a2cca07e42684a323f0f007149f549bdbf307 (patch) | |
| tree | 6d04c84977990ab0f332203e2703bf4235fbd902 /testpar | |
| parent | ec7f4dc603484d18cde1af79c2906c68cec1ad3b (diff) | |
| download | hdf5-5d8a2cca07e42684a323f0f007149f549bdbf307.zip hdf5-5d8a2cca07e42684a323f0f007149f549bdbf307.tar.gz hdf5-5d8a2cca07e42684a323f0f007149f549bdbf307.tar.bz2 | |
[svn-r18740] Description:
Bring r18738 from metadata journaling 'merging' branch to trunk:
Switch H5AC_resize_pinned_entry() to work on protected entries as well,
and rename to H5AC_resize_entry()
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
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_cache.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 5a6235d..5bfb933 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -3114,7 +3114,6 @@ resize_entry(int32_t idx, entry_ptr = &(data[idx]); HDassert( ((entry_ptr->header).type)->id == DATUM_ENTRY_TYPE ); - HDassert( !(entry_ptr->header.is_protected) ); HDassert( !(entry_ptr->locked) ); HDassert( ( entry_ptr->global_pinned ) && ( ! entry_ptr->local_pinned ) ); @@ -3123,13 +3122,13 @@ resize_entry(int32_t idx, HDassert( new_size > 0 ); HDassert( new_size <= entry_ptr->len ); - result = H5AC_resize_pinned_entry((void *)entry_ptr, new_size); + result = H5AC_resize_entry((void *)entry_ptr, new_size); if ( result < 0 ) { nerrors++; if ( verbose ) { - HDfprintf(stdout, "%d:%s: H5AC_resize_pinned_entry() failed.\n", + HDfprintf(stdout, "%d:%s: H5AC_resize_entry() failed.\n", world_mpi_rank, fcn_name); } @@ -5033,7 +5032,7 @@ smoke_check_4(void) * * JRM -- 7/12/06 * Added test code for H5AC_expunge_entry() and - * H5AC_resize_pinned_entry(). + * H5AC_resize_entry(). * *****************************************************************************/ @@ -5305,7 +5304,7 @@ smoke_check_5(void) * - H5AC_unprotect() * - H5AC_set_cache_auto_resize_config() * - H5AC_expunge_entry() - * - H5AC_resize_pinned_entry() + * - H5AC_resize_entry() * * This test is skipped if H5_METADATA_TRACE_FILE is undefined. * @@ -5319,7 +5318,7 @@ smoke_check_5(void) * * JRM -- 7/11/06 * Updated for H5AC_expunge_entry() and - * H5AC_resize_pinned_entry(). + * H5AC_resize_entry(). * *****************************************************************************/ @@ -5351,8 +5350,8 @@ trace_file_check(void) "H5AC_pin_protected_entry 4 0\n", "H5AC_unprotect 4 15 0 0 0\n", "H5AC_mark_entry_dirty 0x4 0 0 0\n", - "H5AC_resize_pinned_entry 0x4 2 0\n", - "H5AC_resize_pinned_entry 0x4 4 0\n", + "H5AC_resize_entry 0x4 2 0\n", + "H5AC_resize_entry 0x4 4 0\n", "H5AC_unpin_entry 4 0\n", "H5AC_move_entry 0 8a65 15 0\n", "H5AC_move_entry 8a65 0 15 0\n", |