diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-20 18:51:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-20 18:51:24 (GMT) |
| commit | e3537b7ee7ecbcc41f7c00f0e97453d106f870ff (patch) | |
| tree | 25a279ad50a5529bbf345fc6d13f655daa91e3af /testpar/t_cache.c | |
| parent | 4e3398b9d74b44b432358642b6d1a9cb43e716b5 (diff) | |
| download | hdf5-e3537b7ee7ecbcc41f7c00f0e97453d106f870ff.zip hdf5-e3537b7ee7ecbcc41f7c00f0e97453d106f870ff.tar.gz hdf5-e3537b7ee7ecbcc41f7c00f0e97453d106f870ff.tar.bz2 | |
[svn-r19114] Description:
Rename H5AC_set() to H5AC_insert_entry()
Get rid of H5C_set_skip_flags() & related flags
Tested on:
Mac OS X/32 10.6.4 (amazon) w/debug, production & parallel
(too simple to require h5committest)
Diffstat (limited to 'testpar/t_cache.c')
| -rw-r--r-- | testpar/t_cache.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 0579829..c30a837 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -2932,7 +2932,7 @@ insert_entry(H5C_t * cache_ptr, (entry_ptr->ver)++; entry_ptr->dirty = TRUE; - result = H5AC_set(file_ptr, H5P_DATASET_XFER_DEFAULT, &(types[0]), + result = H5AC_insert_entry(file_ptr, H5P_DATASET_XFER_DEFAULT, &(types[0]), entry_ptr->base_addr, (void *)(&(entry_ptr->header)), flags); if ( ( result < 0 ) || @@ -2942,7 +2942,7 @@ insert_entry(H5C_t * cache_ptr, nerrors++; if ( verbose ) { - HDfprintf(stdout, "%d:%s: Error in H5AC_set().\n", + HDfprintf(stdout, "%d:%s: Error in H5AC_insert_entry().\n", world_mpi_rank, fcn_name); } } @@ -3944,7 +3944,6 @@ setup_cache_for_test(hid_t * fid_ptr, *fid_ptr = fid; *file_ptr_ptr = file_ptr; *cache_ptr_ptr = cache_ptr; - H5C_set_skip_flags(cache_ptr, TRUE, TRUE); H5C_stats__reset(cache_ptr); success = TRUE; } @@ -6785,7 +6784,7 @@ smoke_check_5(int metadata_write_strategy) * functions: * * - H5AC_flush() - * - H5AC_set() + * - H5AC_insert_entry() * - H5AC_mark_entry_dirty() * - H5AC_move_entry() * - H5AC_pin_protected_entry() @@ -6818,10 +6817,10 @@ trace_file_check(int metadata_write_strategy) { "### HDF5 metadata cache trace file version 1 ###\n", "H5AC_set_cache_auto_resize_config 1 0 1 0 \"t_cache_trace.txt\" 1 0 2097152 0.300000 33554432 1048576 50000 1 0.900000 2.000000 1 1.000000 0.250000 1 4194304 3 0.999000 0.900000 1 1048576 3 1 0.100000 262144 0 0\n", - "H5AC_set 0x200 25 0x0 2 0\n", - "H5AC_set 0x202 25 0x0 2 0\n", - "H5AC_set 0x204 25 0x0 4 0\n", - "H5AC_set 0x208 25 0x0 6 0\n", + "H5AC_insert_entry 0x200 25 0x0 2 0\n", + "H5AC_insert_entry 0x202 25 0x0 2 0\n", + "H5AC_insert_entry 0x204 25 0x0 4 0\n", + "H5AC_insert_entry 0x208 25 0x0 6 0\n", "H5AC_protect 0x200 25 H5AC_WRITE 2 1\n", "H5AC_mark_entry_dirty 0x200 0\n", "H5AC_unprotect 0x200 25 0 0 0\n", @@ -6846,10 +6845,10 @@ trace_file_check(int metadata_write_strategy) { "### HDF5 metadata cache trace file version 1 ###\n", "H5AC_set_cache_auto_resize_config 1 0 1 0 \"t_cache_trace.txt\" 1 0 2097152 0.300000 33554432 1048576 50000 1 0.900000 2.000000 1 1.000000 0.250000 1 4194304 3 0.999000 0.900000 1 1048576 3 1 0.100000 262144 1 0\n", - "H5AC_set 0x200 25 0x0 2 0\n", - "H5AC_set 0x202 25 0x0 2 0\n", - "H5AC_set 0x204 25 0x0 4 0\n", - "H5AC_set 0x208 25 0x0 6 0\n", + "H5AC_insert_entry 0x200 25 0x0 2 0\n", + "H5AC_insert_entry 0x202 25 0x0 2 0\n", + "H5AC_insert_entry 0x204 25 0x0 4 0\n", + "H5AC_insert_entry 0x208 25 0x0 6 0\n", "H5AC_protect 0x200 25 H5AC_WRITE 2 1\n", "H5AC_mark_entry_dirty 0x200 0\n", "H5AC_unprotect 0x200 25 0 0 0\n", |