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 /test | |
| 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 'test')
| -rw-r--r-- | test/cache_common.c | 2 | ||||
| -rw-r--r-- | test/cache_tagging.c | 2 | ||||
| -rw-r--r-- | test/earray.c | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/test/cache_common.c b/test/cache_common.c index 312de3d..e6dd020 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -2694,8 +2694,6 @@ setup_cache(size_t max_cache_size, H5C_stats__reset(cache_ptr); - H5C_set_skip_flags(cache_ptr, TRUE, TRUE); - ret_val = file_ptr; } diff --git a/test/cache_tagging.c b/test/cache_tagging.c index cc1b37c..9aef651 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -3836,7 +3836,7 @@ check_invalid_tag_application(void) /* Create dxpl */ if ( (dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; - /* Call H5HL_create, an internal function that calls H5AC_set without setting up a tag */ + /* Call H5HL_create, an internal function that calls H5AC_insert_entry without setting up a tag */ /* Ensure this returns FAILURE, as a tag has not been set up. */ if ( H5HL_create(f, H5AC_ind_dxpl_id, (size_t)1024, &addr) >= 0) TEST_ERROR; diff --git a/test/earray.c b/test/earray.c index 3a29948..d3b51a4 100644 --- a/test/earray.c +++ b/test/earray.c @@ -1443,7 +1443,7 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t UNUSED /* Insert test entry into cache */ base_addr = HADDR_MAX; - if(H5AC_set(f, H5P_DATASET_XFER_DEFAULT, H5AC_EARRAY_TEST, base_addr, base_entry, H5AC__PIN_ENTRY_FLAG) < 0) + if(H5AC_insert_entry(f, H5P_DATASET_XFER_DEFAULT, H5AC_EARRAY_TEST, base_addr, base_entry, H5AC__PIN_ENTRY_FLAG) < 0) TEST_ERROR /* Set the base entry as a flush dependency for the array */ @@ -1458,7 +1458,7 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t UNUSED /* Insert test entry into cache */ addr1 = HADDR_MAX - 1; - if(H5AC_set(f, H5P_DATASET_XFER_DEFAULT, H5AC_EARRAY_TEST, addr1, entry1, H5AC__PIN_ENTRY_FLAG) < 0) + if(H5AC_insert_entry(f, H5P_DATASET_XFER_DEFAULT, H5AC_EARRAY_TEST, addr1, entry1, H5AC__PIN_ENTRY_FLAG) < 0) TEST_ERROR /* Set the test entry as a flush dependency for 0th index in the array */ @@ -1480,7 +1480,7 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t UNUSED /* Insert test entry into cache */ addr2 = HADDR_MAX - 2; - if(H5AC_set(f, H5P_DATASET_XFER_DEFAULT, H5AC_EARRAY_TEST, addr2, entry2, H5AC__PIN_ENTRY_FLAG) < 0) + if(H5AC_insert_entry(f, H5P_DATASET_XFER_DEFAULT, H5AC_EARRAY_TEST, addr2, entry2, H5AC__PIN_ENTRY_FLAG) < 0) TEST_ERROR /* Set the test entry as a flush dependency for 1st index in the array */ @@ -1502,7 +1502,7 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t UNUSED /* Insert test entry into cache */ addr3 = HADDR_MAX - 3; - if(H5AC_set(f, H5P_DATASET_XFER_DEFAULT, H5AC_EARRAY_TEST, addr3, entry3, H5AC__PIN_ENTRY_FLAG) < 0) + if(H5AC_insert_entry(f, H5P_DATASET_XFER_DEFAULT, H5AC_EARRAY_TEST, addr3, entry3, H5AC__PIN_ENTRY_FLAG) < 0) TEST_ERROR /* Set the test entry as a flush dependency for 10,000th index in the array */ |