diff options
Diffstat (limited to 'src/H5AC.c')
-rw-r--r-- | src/H5AC.c | 132 |
1 files changed, 66 insertions, 66 deletions
@@ -236,7 +236,7 @@ H5AC_init(void) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_init, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* FUNC_ENTER() does all the work */ done: @@ -267,7 +267,7 @@ H5AC_init_interface(void) H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5AC_init_interface) + FUNC_ENTER_NOAPI_NOINIT /* Sanity check */ HDassert(H5P_CLS_DATASET_XFER_g!=(-1)); @@ -346,7 +346,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) #else /* H5_HAVE_PARALLEL */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_init_interface) + FUNC_ENTER_NOAPI_NOINIT /* Sanity check */ assert(H5P_LST_DATASET_XFER_g!=(-1)); @@ -380,7 +380,7 @@ H5AC_term_interface(void) { int n = 0; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface) + FUNC_ENTER_NOAPI_NOINIT if (H5_interface_initialize_g) { #ifdef H5_HAVE_PARALLEL @@ -478,7 +478,7 @@ H5AC_create(const H5F_t *f, #endif /* H5_HAVE_PARALLEL */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_create, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(f); HDassert(NULL == f->shared->cache); @@ -490,7 +490,7 @@ H5AC_create(const H5F_t *f, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad cache configuration") #ifdef H5_HAVE_PARALLEL - if(IS_H5FD_MPI(f)) { + if(H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) { MPI_Comm mpi_comm; int mpi_rank; int mpi_size; @@ -541,10 +541,10 @@ H5AC_create(const H5F_t *f, sprintf(prefix, "%d:", mpi_rank); if(mpi_rank == 0) { - if(NULL == (aux_ptr->d_slist_ptr = H5SL_create(H5SL_TYPE_HADDR))) + if(NULL == (aux_ptr->d_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL))) HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create dirtied entry list.") - if(NULL == (aux_ptr->c_slist_ptr = H5SL_create(H5SL_TYPE_HADDR))) + if(NULL == (aux_ptr->c_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL))) HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create cleaned entry list.") } /* end if */ @@ -552,7 +552,7 @@ H5AC_create(const H5F_t *f, * when the distributed strategy is selected as all processes * will use it in the case of a flush. */ - if(NULL == (aux_ptr->candidate_slist_ptr = H5SL_create(H5SL_TYPE_HADDR))) + if(NULL == (aux_ptr->candidate_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL))) HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create candidate entry list.") } /* end if */ @@ -664,7 +664,7 @@ H5AC_dest(H5F_t *f, hid_t dxpl_id) #endif /* H5_HAVE_PARALLEL */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_dest, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Sanity check */ HDassert(f); @@ -743,7 +743,7 @@ H5AC_expunge_entry(H5F_t *f, #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_expunge_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(f); HDassert(f->shared); @@ -828,7 +828,7 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id) #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_flush, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(f); HDassert(f->shared); @@ -902,7 +902,7 @@ H5AC_get_entry_status(const H5F_t *f, unsigned status = 0; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_get_entry_status, FAIL) + FUNC_ENTER_NOAPI(FAIL) if((f == NULL) || (!H5F_addr_defined(addr)) || (status_ptr == NULL)) HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry.") @@ -958,7 +958,7 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_insert_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(f); HDassert(f->shared); @@ -970,7 +970,7 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add HDassert(thing); /* Check for invalid access request */ - if(0 == (f->intent & H5F_ACC_RDWR)) + if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR)) HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file") #if H5AC__TRACE_FILE_ENABLED @@ -1062,7 +1062,7 @@ H5AC_mark_entry_dirty(void *thing) #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_mark_entry_dirty, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Sanity check */ HDassert(thing); @@ -1133,7 +1133,7 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne #endif /* H5_HAVE_PARALLEL */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_move_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(f); HDassert(f->shared->cache); @@ -1211,7 +1211,7 @@ H5AC_pin_protected_entry(void *thing) #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_pin_protected_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Sanity check */ HDassert(thing); @@ -1261,7 +1261,7 @@ H5AC_create_flush_dependency(void * parent_thing, void * child_thing) #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_create_flush_dependency, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Sanity check */ HDassert(parent_thing); @@ -1330,7 +1330,7 @@ H5AC_protect(H5F_t *f, #endif /* H5AC__TRACE_FILE_ENABLED */ void * ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_protect, NULL) + FUNC_ENTER_NOAPI(NULL) /* check args */ HDassert(f); @@ -1342,7 +1342,7 @@ H5AC_protect(H5F_t *f, HDassert(H5F_addr_defined(addr)); /* Check for invalid access request */ - if(0 == (f->intent & H5F_ACC_RDWR) && rw == H5AC_WRITE) + if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR) && rw == H5AC_WRITE) HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file") #if H5AC__TRACE_FILE_ENABLED @@ -1450,7 +1450,7 @@ H5AC_resize_entry(void *thing, size_t new_size) #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_resize_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Sanity check */ HDassert(thing); @@ -1517,7 +1517,7 @@ H5AC_unpin_entry(void *thing) #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_unpin_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Sanity check */ HDassert(thing); @@ -1566,7 +1566,7 @@ H5AC_destroy_flush_dependency(void * parent_thing, void * child_thing) #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_destroy_flush_dependency, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Sanity check */ HDassert(parent_thing); @@ -1648,7 +1648,7 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_unprotect, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(f); HDassert(f->shared); @@ -1754,7 +1754,7 @@ H5AC_set_sync_point_done_callback(H5C_t * cache_ptr, { H5AC_aux_t * aux_ptr; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_set_sync_point_done_callback) + FUNC_ENTER_NOAPI_NOINIT HDassert(cache_ptr && (cache_ptr->magic == H5C__H5C_T_MAGIC)); @@ -1791,7 +1791,7 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr, { H5AC_aux_t * aux_ptr; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_set_write_done_callback) + FUNC_ENTER_NOAPI_NOINIT HDassert(cache_ptr && (cache_ptr->magic == H5C__H5C_T_MAGIC)); @@ -1824,7 +1824,7 @@ H5AC_stats(const H5F_t *f) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_stats, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(f); HDassert(f->shared); @@ -1856,7 +1856,7 @@ H5AC_dump_cache(const H5F_t *f) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_dump_cache, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(f); HDassert(f->shared); @@ -1893,7 +1893,7 @@ H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr, hbool_t evictions_enabled; H5C_auto_size_ctl_t internal_config; - FUNC_ENTER_NOAPI(H5AC_get_cache_auto_resize_config, FAIL) + FUNC_ENTER_NOAPI(FAIL) if ( ( cache_ptr == NULL ) || @@ -2015,7 +2015,7 @@ H5AC_get_cache_size(H5AC_t * cache_ptr, herr_t result; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_get_cache_size, FAIL) + FUNC_ENTER_NOAPI(FAIL) result = H5C_get_cache_size((H5C_t *)cache_ptr, max_size_ptr, @@ -2053,7 +2053,7 @@ H5AC_get_cache_hit_rate(H5AC_t * cache_ptr, double * hit_rate_ptr) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_get_cache_hit_rate, FAIL) + FUNC_ENTER_NOAPI(FAIL) if(H5C_get_cache_hit_rate((H5C_t *)cache_ptr, hit_rate_ptr) < 0) HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_cache_hit_rate() failed.") @@ -2081,7 +2081,7 @@ H5AC_reset_cache_hit_rate_stats(H5AC_t * cache_ptr) herr_t result; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_reset_cache_hit_rate_stats, FAIL) + FUNC_ENTER_NOAPI(FAIL) result = H5C_reset_cache_hit_rate_stats((H5C_t *)cache_ptr); @@ -2122,7 +2122,7 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr, FILE * trace_file_ptr = NULL; #endif /* H5AC__TRACE_FILE_ENABLED */ - FUNC_ENTER_NOAPI(H5AC_set_cache_auto_resize_config, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr ); @@ -2299,7 +2299,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr) H5C_auto_size_ctl_t internal_config; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_validate_config, FAIL) + FUNC_ENTER_NOAPI(FAIL) if(config_ptr == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.") @@ -2393,7 +2393,7 @@ H5AC_close_trace_file(H5AC_t * cache_ptr) herr_t ret_value = SUCCEED; /* Return value */ FILE * trace_file_ptr = NULL; - FUNC_ENTER_NOAPI(H5AC_close_trace_file, FAIL) + FUNC_ENTER_NOAPI(FAIL) if ( cache_ptr == NULL ) { @@ -2455,7 +2455,7 @@ H5AC_open_trace_file(H5AC_t * cache_ptr, H5AC_aux_t * aux_ptr = NULL; #endif /* H5_HAVE_PARALLEL */ - FUNC_ENTER_NOAPI(H5AC_open_trace_file, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(cache_ptr); @@ -2568,7 +2568,7 @@ H5AC_add_candidate(H5AC_t * cache_ptr, H5AC_slist_entry_t * slist_entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_add_candidate, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -2650,7 +2650,7 @@ H5AC_broadcast_candidate_list(H5AC_t * cache_ptr, int num_entries = 0; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_broadcast_candidate_list, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -2761,7 +2761,7 @@ H5AC_broadcast_clean_list(H5AC_t * cache_ptr) int mpi_result; int num_entries = 0; - FUNC_ENTER_NOAPI(H5AC_broadcast_clean_list, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -2952,7 +2952,7 @@ H5AC_check_if_write_permitted(const H5F_t UNUSED * f, #endif /* H5_HAVE_PARALLEL */ - FUNC_ENTER_NOAPI(H5AC_check_if_write_permitted, FAIL) + FUNC_ENTER_NOAPI(FAIL) #ifdef H5_HAVE_PARALLEL HDassert( f != NULL ); @@ -3014,7 +3014,7 @@ H5AC_construct_candidate_list(H5AC_t * cache_ptr, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_construct_candidate_list, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -3105,7 +3105,7 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr, int i = 0; int num_entries = 0; - FUNC_ENTER_NOAPI(H5AC_copy_candidate_list_to_buffer, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -3227,7 +3227,7 @@ H5AC_ext_config_2_int_config(H5AC_cache_config_t * ext_conf_ptr, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_ext_config_2_int_config, FAIL) + FUNC_ENTER_NOAPI(FAIL) if ( ( ext_conf_ptr == NULL ) || ( ext_conf_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION ) || @@ -3306,7 +3306,7 @@ H5AC_log_deleted_entry(H5AC_t * cache_ptr, H5AC_slist_entry_t * slist_entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_log_deleted_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -3398,7 +3398,7 @@ H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_log_dirtied_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( entry_ptr ); HDassert( entry_ptr->addr == addr ); @@ -3521,7 +3521,7 @@ H5AC_log_flushed_entry(H5C_t * cache_ptr, H5AC_slist_entry_t * slist_entry_ptr = NULL; - FUNC_ENTER_NOAPI(H5AC_log_flushed_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -3648,7 +3648,7 @@ H5AC_log_inserted_entry(H5F_t * f, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_log_inserted_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(cache_ptr != NULL); HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC); @@ -3760,7 +3760,7 @@ H5AC_log_moved_entry(const H5F_t *f, H5AC_slist_entry_t * slist_entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_log_moved_entry, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( f ); HDassert( f->shared ); @@ -4010,7 +4010,7 @@ H5AC_propagate_and_apply_candidate_list(H5F_t * f, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_propagate_and_apply_candidate_list, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -4174,7 +4174,7 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t * f, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_propagate_flushed_and_still_clean_entries_list, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(cache_ptr != NULL); HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC); @@ -4234,7 +4234,7 @@ H5AC_receive_and_apply_clean_list(H5F_t * f, int num_entries = 0; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_receive_and_apply_clean_list, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( f != NULL ); HDassert( f->shared->cache == cache_ptr ); @@ -4345,7 +4345,7 @@ H5AC_receive_candidate_list(H5AC_t * cache_ptr, int num_entries; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_receive_candidate_list, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -4491,7 +4491,7 @@ H5AC_rsp__dist_md_write__flush(H5F_t *f, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_rsp__dist_md_write__flush, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( f != NULL ); HDassert( f->shared->cache == cache_ptr ); @@ -4642,7 +4642,7 @@ H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_rsp__dist_md_write__flush_to_min_clean, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( f != NULL ); HDassert( f->shared->cache == cache_ptr ); @@ -4725,7 +4725,7 @@ H5AC_rsp__p0_only__flush(H5F_t *f, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_rsp__p0_only__flush, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( f != NULL ); HDassert( f->shared->cache == cache_ptr ); @@ -4827,7 +4827,7 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_rsp__p0_only__flush_to_min_clean, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( f != NULL ); HDassert( f->shared->cache == cache_ptr ); @@ -4939,7 +4939,7 @@ H5AC_run_sync_point(H5F_t *f, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_run_sync_point, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( f != NULL ); @@ -5076,7 +5076,7 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr, H5AC_aux_t * aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_tidy_cache_0_lists, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -5169,7 +5169,7 @@ H5AC_flush_entries(H5F_t *f) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5AC_flush_entries) + FUNC_ENTER_NOAPI_NOINIT HDassert(f); HDassert(f->shared->cache); @@ -5208,7 +5208,7 @@ H5AC_ignore_tags(H5F_t * f) herr_t ret_value = SUCCEED; /* Function Enter Macro */ - FUNC_ENTER_NOAPI(H5AC_ignore_tags, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Assertions */ HDassert(f); @@ -5245,7 +5245,7 @@ H5AC_tag(hid_t dxpl_id, haddr_t metadata_tag, haddr_t * prev_tag) herr_t ret_value = SUCCEED; /* return value */ /* Function Enter Macro */ - FUNC_ENTER_NOAPI(H5AC_tag, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Check Arguments */ if(NULL == (dxpl = (H5P_genplist_t *)H5I_object_verify(dxpl_id, H5I_GENPROP_LST))) @@ -5305,7 +5305,7 @@ H5AC_retag_copied_metadata(H5F_t * f, haddr_t metadata_tag) herr_t ret_value = SUCCEED; /* Function Enter Macro */ - FUNC_ENTER_NOAPI(H5AC_retag_copied_metadata, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Assertions */ HDassert(f); @@ -5339,7 +5339,7 @@ H5AC_flush_tagged_metadata(H5F_t * f, haddr_t metadata_tag, hid_t dxpl_id) herr_t ret_value = SUCCEED; /* Function Enter Macro */ - FUNC_ENTER_NOAPI(H5AC_flush_tagged_metadata, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Assertions */ HDassert(f); @@ -5375,7 +5375,7 @@ H5AC_evict_tagged_metadata(H5F_t * f, haddr_t metadata_tag, hid_t dxpl_id) herr_t ret_value = SUCCEED; /* Function Enter Macro */ - FUNC_ENTER_NOAPI(H5AC_evict_tagged_metadata, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Assertions */ HDassert(f); @@ -5413,7 +5413,7 @@ H5AC_verify_tag(hid_t dxpl_id, H5AC_class_t * type) H5P_genplist_t * dxpl; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI(H5AC_verify_tag, FAIL) + FUNC_ENTER_NOAPI_NOINIT /* Get the dataset transfer property list */ if(NULL == (dxpl = (H5P_genplist_t *)H5I_object_verify(dxpl_id, H5I_GENPROP_LST))) |