diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 03:02:03 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 03:02:03 (GMT) |
| commit | ae6f5891b5794325ee5702fec0da55bafdce1afe (patch) | |
| tree | 907e8fd4d6cdd73dd007f10efb27e682a58f7df6 /testpar | |
| parent | e87f3dd558a96c6ebedd03a8ac8acb91cb5e1be8 (diff) | |
| download | hdf5-ae6f5891b5794325ee5702fec0da55bafdce1afe.zip hdf5-ae6f5891b5794325ee5702fec0da55bafdce1afe.tar.gz hdf5-ae6f5891b5794325ee5702fec0da55bafdce1afe.tar.bz2 | |
[svn-r18741] Description:
Bring r18740 from trunk to 1.8 branch:
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
(h5committested on trunk)
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 d70c0a2..d53a227 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -3113,7 +3113,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 ) ); @@ -3122,13 +3121,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); } @@ -5032,7 +5031,7 @@ smoke_check_4(void) * * JRM -- 7/12/06 * Added test code for H5AC_expunge_entry() and - * H5AC_resize_pinned_entry(). + * H5AC_resize_entry(). * *****************************************************************************/ @@ -5304,7 +5303,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. * @@ -5318,7 +5317,7 @@ smoke_check_5(void) * * JRM -- 7/11/06 * Updated for H5AC_expunge_entry() and - * H5AC_resize_pinned_entry(). + * H5AC_resize_entry(). * *****************************************************************************/ @@ -5350,8 +5349,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", |