diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 02:06:34 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 02:06:34 (GMT) |
| commit | 8a00995b3a6df681fddc71e0d54e999e346e7b66 (patch) | |
| tree | 18d1febbbb2e0a2441bf4b95ea4b88b3f04d5b1e /testpar | |
| parent | 5b320d81abb8c228f2ded592b1d725a8c668ba37 (diff) | |
| download | hdf5-8a00995b3a6df681fddc71e0d54e999e346e7b66.zip hdf5-8a00995b3a6df681fddc71e0d54e999e346e7b66.tar.gz hdf5-8a00995b3a6df681fddc71e0d54e999e346e7b66.tar.bz2 | |
[svn-r18738] Description:
Switch H5AC_resize_pinned_entry() to work on protected entries as well,
and rename to H5AC_resize_entry()
Tested on:
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
(h5committest not required on this branch)
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 be2e565..d7d6651 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -3082,7 +3082,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 ) ); @@ -3091,13 +3090,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); } @@ -4949,7 +4948,7 @@ smoke_check_4(void) * * JRM -- 7/12/06 * Added test code for H5AC_expunge_entry() and - * H5AC_resize_pinned_entry(). + * H5AC_resize_entry(). * *****************************************************************************/ @@ -5160,7 +5159,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. * @@ -5174,7 +5173,7 @@ smoke_check_5(void) * * JRM -- 7/11/06 * Updated for H5AC_expunge_entry() and - * H5AC_resize_pinned_entry(). + * H5AC_resize_entry(). * *****************************************************************************/ @@ -5206,8 +5205,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", |