diff options
| -rw-r--r-- | src/H5F.c | 10 | ||||
| -rw-r--r-- | src/H5Fpublic.h | 2 | ||||
| -rw-r--r-- | test/cache.c | 8 |
3 files changed, 12 insertions, 8 deletions
@@ -4963,11 +4963,12 @@ H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr, size_t *cur_size_ptr, - int32_t *cur_num_entries_ptr) + int *cur_num_entries_ptr) { H5F_t *file=NULL; /* File object for file ID */ herr_t ret_value = SUCCEED; /* Return value */ herr_t result; + int32_t cur_num_entries; FUNC_ENTER_API(H5Fget_mdc_size, FAIL) H5TRACE5("e","i*z*z*z*Is",file_id,max_size_ptr,min_clean_size_ptr, @@ -4984,14 +4985,17 @@ H5Fget_mdc_size(hid_t file_id, max_size_ptr, min_clean_size_ptr, cur_size_ptr, - cur_num_entries_ptr); + &cur_num_entries); if ( result != SUCCEED ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "H5AC_get_cache_size() failed."); + + } else if ( cur_num_entries_ptr != NULL ) { + + *cur_num_entries_ptr = (int)cur_num_entries; } - done: diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index a0e3780..79a2769 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -125,7 +125,7 @@ H5_DLL herr_t H5Fget_mdc_size(hid_t file_id, size_t * max_size_ptr, size_t * min_clean_size_ptr, size_t * cur_size_ptr, - int32_t * cur_num_entries_ptr); + int * cur_num_entries_ptr); H5_DLL herr_t H5Freset_mdc_hit_rate_stats(hid_t file_id); H5_DLL ssize_t H5Fget_name(hid_t obj_id, char *name, size_t size); diff --git a/test/cache.c b/test/cache.c index 85d08cd..c6f4795 100644 --- a/test/cache.c +++ b/test/cache.c @@ -18139,7 +18139,7 @@ check_file_mdc_api_calls(void) size_t max_size; size_t min_clean_size; size_t cur_size; - int32_t cur_num_entries; + int cur_num_entries; double hit_rate; H5AC_cache_config_t default_config = H5AC__DEFAULT_CACHE_CONFIG; H5AC_cache_config_t mod_config_1 = @@ -18591,7 +18591,7 @@ check_and_validate_cache_size(hid_t file_id, size_t expected_cur_size; size_t cur_size; int32_t expected_cur_num_entries; - int32_t cur_num_entries; + int cur_num_entries; H5F_t * file_ptr = NULL; H5C_t * cache_ptr = NULL; @@ -18644,7 +18644,7 @@ check_and_validate_cache_size(hid_t file_id, } else if ( ( max_size != expected_max_size ) || ( min_clean_size != expected_min_clean_size ) || ( cur_size != expected_cur_size ) || - ( cur_num_entries != expected_cur_num_entries ) ) { + ( cur_num_entries != (int)expected_cur_num_entries ) ) { pass = FALSE; failure_mssg = "H5Fget_mdc_size() returned unexpected value(s)."; @@ -20220,7 +20220,7 @@ check_file_mdc_api_errs(void) size_t max_size; size_t min_clean_size; size_t cur_size; - int32_t cur_num_entries; + int cur_num_entries; double hit_rate; H5AC_cache_config_t default_config = H5AC__DEFAULT_CACHE_CONFIG; H5AC_cache_config_t scratch; |