From 211baa5e46802352cac761533f3f9a0749f1dd6c Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 6 Dec 2003 15:40:12 -0500 Subject: [svn-r7918] Purpose: Code cleanup Description: Clean up compiler warnings, especially the 'FUNC' variable not used which comes out in production mode. Solution: Had to add a new FUNC_ENTER_NOAPI_NOINIT_NOFUNC macro for those non-API functions which don't need the 'FUNC' variable defined. (This will be _so_ much easier when C99 is standard on all our supposed platforms, since it has a __FUNC__ macro... ) Platforms tested: FreeBSD 4.9 (sleipnir) too minor for h5committest (although there were lots of files changed, the change was minor in each one) --- src/H5.c | 6 ++-- src/H5A.c | 18 +++++----- src/H5AC.c | 8 ++--- src/H5B.c | 14 ++++---- src/H5D.c | 32 ++++++++--------- src/H5Dcontig.c | 3 +- src/H5Dio.c | 32 ++++++++--------- src/H5Distore.c | 22 ++++++------ src/H5E.c | 6 ++-- src/H5F.c | 62 ++++++++++++++++---------------- src/H5FD.c | 14 ++++---- src/H5FDfphdf5.c | 4 +-- src/H5FDmpio.c | 4 +-- src/H5FDstream.c | 4 +-- src/H5FL.c | 32 ++++++++--------- src/H5FPclient.c | 4 +-- src/H5FPserver.c | 56 ++++++++++++++--------------- src/H5Fcontig.c | 3 +- src/H5Fistore.c | 22 ++++++------ src/H5Fprivate.h | 3 +- src/H5G.c | 26 +++++++------- src/H5Gnode.c | 10 +++--- src/H5HG.c | 6 ++-- src/H5HL.c | 6 ++-- src/H5HP.c | 8 ++--- src/H5I.c | 6 ++-- src/H5MM.c | 20 +++++------ src/H5O.c | 42 +++++++++++----------- src/H5Odtype.c | 4 +-- src/H5P.c | 74 +++++++++++++++++++------------------- src/H5R.c | 14 ++++---- src/H5RS.c | 4 +-- src/H5S.c | 4 +-- src/H5ST.c | 12 +++---- src/H5Sall.c | 14 ++++---- src/H5Shyper.c | 102 ++++++++++++++++++++++++++-------------------------- src/H5Smpio.c | 10 +++--- src/H5Snone.c | 14 ++++---- src/H5Spoint.c | 20 +++++------ src/H5Sselect.c | 8 ++--- src/H5T.c | 22 ++++++------ src/H5TB.c | 22 ++++++------ src/H5Tarray.c | 2 +- src/H5Tbit.c | 8 ++--- src/H5Tcommit.c | 6 ++-- src/H5Tcompound.c | 4 +-- src/H5Tconv.c | 4 +-- src/H5Tcset.c | 2 +- src/H5Tenum.c | 2 +- src/H5Tfields.c | 2 +- src/H5Tfixed.c | 2 +- src/H5Tfloat.c | 2 +- src/H5Tnative.c | 2 +- src/H5Toffset.c | 2 +- src/H5Topaque.c | 2 +- src/H5Torder.c | 2 +- src/H5Tpad.c | 2 +- src/H5Tprecis.c | 2 +- src/H5Tstrpad.c | 2 +- src/H5Tvlen.c | 38 ++++++++++---------- src/H5V.c | 8 ++--- src/H5Vprivate.h | 20 +++++------ src/H5Z.c | 6 ++-- src/H5Zfletcher32.c | 2 +- src/H5detect.c | 2 +- src/H5private.h | 83 ++++++++++++++++++++++++------------------ 66 files changed, 506 insertions(+), 498 deletions(-) diff --git a/src/H5.c b/src/H5.c index 72ea2a8..ed754a3 100644 --- a/src/H5.c +++ b/src/H5.c @@ -185,8 +185,8 @@ H5_term_library(void) #ifdef H5_HAVE_THREADSAFE /* explicit locking of the API */ - H5_FIRST_THREAD_INIT; - H5_LOCK_API_MUTEX; + H5_FIRST_THREAD_INIT + H5_API_LOCK #endif /* Don't do anything if the library is already closed */ @@ -275,7 +275,7 @@ H5_term_library(void) H5_INIT_GLOBAL = FALSE; done: #ifdef H5_HAVE_THREADSAFE - H5_UNLOCK_API_MUTEX; + H5_API_UNLOCK #endif return; } diff --git a/src/H5A.c b/src/H5A.c index e477669..a893849 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -67,7 +67,7 @@ H5A_init_interface(void) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5A_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5A_init_interface); /* * Create attribute group. @@ -101,7 +101,7 @@ H5A_term_interface(void) { int n=0; - FUNC_ENTER_NOINIT(H5A_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_term_interface); if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_ATTR))) { @@ -221,7 +221,7 @@ H5A_create(const H5G_entry_t *ent, const char *name, const H5T_t *type, int seq=0; hid_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5A_create); + FUNC_ENTER_NOAPI_NOINIT(H5A_create); /* check args */ assert(ent); @@ -343,7 +343,7 @@ H5A_get_index(H5G_entry_t *ent, const char *name, hid_t dxpl_id) int i; /* Index variable */ int ret_value=FAIL; /* Return value */ - FUNC_ENTER_NOINIT(H5A_get_index); + FUNC_ENTER_NOAPI_NOINIT(H5A_get_index); assert(ent); assert(name); @@ -509,7 +509,7 @@ H5A_open(H5G_entry_t *ent, unsigned idx, hid_t dxpl_id) H5A_t *attr = NULL; hid_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5A_open); + FUNC_ENTER_NOAPI_NOINIT(H5A_open); /* check args */ assert(ent); @@ -622,7 +622,7 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id) int idx; /* index of attribute in object header */ herr_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5A_write); + FUNC_ENTER_NOAPI_NOINIT(H5A_write); assert(attr); assert(mem_type); @@ -769,7 +769,7 @@ H5A_read(H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id) size_t buf_size; /* desired buffer size */ herr_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5A_read); + FUNC_ENTER_NOAPI_NOINIT(H5A_read); assert(attr); assert(mem_type); @@ -1071,7 +1071,7 @@ H5A_get_storage_size(H5A_t *attr) { hsize_t ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5A_get_storage_size); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_get_storage_size); /* Set return value */ ret_value = attr->data_size; @@ -1203,7 +1203,7 @@ H5A_rename(H5G_entry_t *ent, const char *old_name, const char *new_name, hid_t d H5A_t *found_attr; /* Attribute with OLD_NAME */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5A_rename); + FUNC_ENTER_NOAPI_NOINIT(H5A_rename); /* Check arguments */ assert(ent); diff --git a/src/H5AC.c b/src/H5AC.c index 41661af..3cb9b2d 100644 --- a/src/H5AC.c +++ b/src/H5AC.c @@ -197,7 +197,7 @@ H5AC_init_interface(void) #endif /* H5_HAVE_PARALLEL */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5AC_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5AC_init_interface); /* Sanity check */ assert(H5P_CLS_DATASET_XFER_g!=(-1)); @@ -305,7 +305,7 @@ H5AC_term_interface(void) { int n=0; - FUNC_ENTER_NOINIT(H5AC_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface); if (interface_initialize_g) { if(H5AC_dxpl_id>0 || H5AC_noblock_dxpl_id>0 || H5AC_ind_dxpl_id>0) { @@ -708,8 +708,8 @@ H5AC_compare(const void *_a, const void *_b) H5AC_info_t *slot_a; H5AC_info_t *slot_b; - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5AC_compare); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_compare); assert(current_cache_g); diff --git a/src/H5B.c b/src/H5B.c index 3c50882..9002ebd 100644 --- a/src/H5B.c +++ b/src/H5B.c @@ -524,7 +524,7 @@ done: static herr_t H5B_dest(H5F_t UNUSED *f, H5B_t *bt) { - FUNC_ENTER_NOINIT(H5B_dest); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_dest); /* * Check arguments. @@ -564,7 +564,7 @@ H5B_clear(H5B_t *bt) { int i; /* Local index variable */ - FUNC_ENTER_NOINIT(H5B_clear); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_clear); /* * Check arguments. @@ -704,7 +704,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, H5B_t *old_bt, haddr int i, k, nleft, nright; size_t recsize = 0; - FUNC_ENTER_NOINIT(H5B_split); + FUNC_ENTER_NOAPI_NOINIT(H5B_split); /* * Check arguments. @@ -848,7 +848,7 @@ H5B_decode_key(H5F_t *f, H5B_t *bt, int idx) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5B_decode_key); + FUNC_ENTER_NOAPI_NOINIT(H5B_decode_key); assert(bt->key[idx].dirty==0); @@ -880,7 +880,7 @@ H5B_decode_keys(H5F_t *f, H5B_t *bt, int idx) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5B_decode_keys); + FUNC_ENTER_NOAPI_NOINIT(H5B_decode_keys); assert(f); assert(bt); @@ -1078,7 +1078,7 @@ H5B_insert_child(H5F_t *f, const H5B_class_t *type, H5B_t *bt, size_t recsize; int i; - FUNC_ENTER_NOINIT(H5B_insert_child); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_insert_child); assert(bt); assert(bt->nchildren<2*H5F_KVALUE(f, type)); @@ -1210,7 +1210,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type H5B_ins_t my_ins = H5B_INS_ERROR; H5B_ins_t ret_value = H5B_INS_ERROR; - FUNC_ENTER_NOINIT(H5B_insert_helper); + FUNC_ENTER_NOAPI_NOINIT(H5B_insert_helper); /* * Check arguments diff --git a/src/H5D.c b/src/H5D.c index ecab019..5125a08 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -194,7 +194,7 @@ H5D_init_interface(void) size_t nprops; /* Number of properties */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5D_init_interface); /* Initialize the atom group for the dataset IDs */ if (H5I_init_group(H5I_DATASET, H5I_DATASETID_HASHSIZE, H5D_RESERVED_ATOMS, (H5I_free_t)H5D_close)<0) @@ -404,7 +404,7 @@ H5D_term_interface(void) { int n=0; - FUNC_ENTER_NOINIT(H5D_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_term_interface); if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_DATASET))) { @@ -1019,7 +1019,7 @@ static herr_t H5D_get_space_status(H5D_t *dset, H5D_space_status_t *allocation, hsize_t full_size; /* The number of bytes in the dataset when fully populated */ herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5D_get_space_status); + FUNC_ENTER_NOAPI_NOINIT(H5D_get_space_status); assert(dset); @@ -2358,8 +2358,8 @@ done: H5G_entry_t * H5D_entof (H5D_t *dataset) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5D_entof); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_entof); FUNC_LEAVE_NOAPI( dataset ? &(dataset->ent) : NULL); } @@ -2385,8 +2385,8 @@ H5D_entof (H5D_t *dataset) H5T_t * H5D_typeof (H5D_t *dset) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5D_typeof); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_typeof); assert (dset); assert (dset->type); @@ -2414,8 +2414,8 @@ H5D_typeof (H5D_t *dset) static H5F_t * H5D_get_file (const H5D_t *dset) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5D_get_file); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_get_file); assert (dset); assert (dset->ent.file); @@ -2451,7 +2451,7 @@ H5D_alloc_storage (H5F_t *f, hid_t dxpl_id, H5D_t *dset/*in,out*/, H5D_time_allo unsigned addr_set=0; /* Flag to indicate that the dataset's storage address was set */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_alloc_storage); + FUNC_ENTER_NOAPI_NOINIT(H5D_alloc_storage); /* check args */ assert (f); @@ -2598,10 +2598,9 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hid_t dxpl_id) hssize_t snpoints; /* Number of points in space (for error checking) */ size_t npoints; /* Number of points in space */ H5S_t *space; /* Dataset's dataspace */ - H5P_genplist_t *plist; /* Property list */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_init_storage); + FUNC_ENTER_NOAPI_NOINIT(H5D_init_storage); assert(dset); @@ -2630,12 +2629,8 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hid_t dxpl_id) /* Don't write default fill values to external files */ /* If we will be immediately overwriting the values, don't bother to clear them */ if((dset->efl.nused==0 || dset->fill.buf) && !full_overwrite) { - /* Get dataset's creation property list */ - if (NULL == (plist = H5I_object(dset->dcpl_id))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list"); - if (H5F_contig_fill(dset->ent.file, dxpl_id, &(dset->layout), - plist, space, &dset->fill, H5T_get_size(dset->type))<0) + space, &dset->fill, H5T_get_size(dset->type))<0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to allocate all chunks of dataset"); } /* end if */ break; @@ -2646,7 +2641,7 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hid_t dxpl_id) * for all chunks now and initialize each chunk with the fill value. */ { - /* We only handle simple data spaces so far */ + H5P_genplist_t *plist; /* Property list */ int ndims; hsize_t dim[H5O_LAYOUT_NDIMS]; @@ -2654,6 +2649,7 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hid_t dxpl_id) if (NULL == (plist = H5I_object(dset->dcpl_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list"); + /* We only handle simple data spaces so far */ if ((ndims=H5S_get_simple_extent_dims(space, dim, NULL))<0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get simple data space info"); dim[ndims] = dset->layout.dim[ndims]; diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index f47f725..bb64916 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -125,7 +125,7 @@ done: */ herr_t H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout, - struct H5P_genplist_t *dc_plist, const struct H5S_t *space, + const struct H5S_t *space, const struct H5O_fill_t *fill, size_t elmt_size) { hssize_t snpoints; /* Number of points in space (for error checking) */ @@ -154,7 +154,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout, assert(layout && H5D_CONTIGUOUS==layout->type); assert(layout->ndims>0 && layout->ndims<=H5O_LAYOUT_NDIMS); assert(H5F_addr_defined(layout->addr)); - assert(dc_plist!=NULL); assert(space); assert(elmt_size>0); diff --git a/src/H5Dio.c b/src/H5Dio.c index c4d0087..3a25059 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -217,7 +217,7 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf, const H5T_t *buf_t size_t buf_size; /* Desired buffer size */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_fill); + FUNC_ENTER_NOAPI_NOINIT(H5D_fill); /* Check args */ assert(buf); @@ -525,7 +525,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, unsigned sconv_flags=0; /* Flags for the space conversion */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_read); + FUNC_ENTER_NOAPI_NOINIT(H5D_read); /* check args */ assert(dataset && dataset->ent.file); @@ -746,7 +746,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, unsigned sconv_flags=0; /* Flags for the space conversion */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_write); + FUNC_ENTER_NOAPI_NOINIT(H5D_write); /* check args */ assert(dataset && dataset->ent.file); @@ -961,7 +961,7 @@ H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S hsize_t n, smine_nelmts; /*elements per strip */ herr_t ret_value = SUCCEED; /*return value */ - FUNC_ENTER_NOINIT(H5D_contig_read); + FUNC_ENTER_NOAPI_NOINIT(H5D_contig_read); /* * If there is no type conversion then read directly into the @@ -1180,7 +1180,7 @@ H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5 hsize_t n, smine_nelmts; /*elements per strip */ herr_t ret_value = SUCCEED; /*return value */ - FUNC_ENTER_NOINIT(H5D_contig_write); + FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write); /* * If there is no type conversion then write directly from the @@ -1406,7 +1406,7 @@ UNUSED H5D_storage_t store; /*union of EFL and chunk pointer in file space */ herr_t ret_value = SUCCEED; /*return value */ - FUNC_ENTER_NOINIT(H5D_chunk_read); + FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_read); /* Map elements between file and memory for each chunk*/ if(H5D_create_chunk_map(dataset, mem_type, file_space, mem_space, &fm)<0) @@ -1703,7 +1703,7 @@ nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, H5D_storage_t store; /*union of EFL and chunk pointer in file space */ herr_t ret_value = SUCCEED; /*return value */ - FUNC_ENTER_NOINIT(H5D_chunk_write); + FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_write); #ifdef QAK { @@ -2016,7 +2016,7 @@ H5D_io_assist_mpio(H5P_genplist_t *dx_plist, H5FD_mpio_xfer_t xfer_mode, { herr_t ret_value = SUCCEED; /*return value */ - FUNC_ENTER_NOINIT(H5D_io_assist_mpio); + FUNC_ENTER_NOAPI_NOINIT(H5D_io_assist_mpio); /* The following may not handle a collective call correctly * since it does not ensure all processes can handle the write @@ -2068,7 +2068,7 @@ H5D_chunk_coords_assist(hssize_t *coords, size_t ndims, const hsize_t chunks[], hsize_t tmp; /* Size of "down elements" in each dimension */ size_t i, j; /* Local index variables */ - FUNC_ENTER_NOINIT(H5D_chunk_coords_assist); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_coords_assist); for(i=0; ifsel) @@ -2483,7 +2483,7 @@ H5D_create_chunk_file_map_hyper(const fm_map *fm) unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_create_chunk_file_map_hyper); + FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_file_map_hyper); /* Make a copy of file dataspace */ if((tmp_fspace = H5S_copy(fm->file_space))==NULL) @@ -2652,7 +2652,7 @@ H5D_create_chunk_mem_map_hyper(const fm_map *fm) unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_create_chunk_mem_map_hyper); + FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_mem_map_hyper); #ifdef QAK { hsize_t mem_dims[H5O_LAYOUT_NDIMS]; /* Dimensions of memory space */ @@ -2798,7 +2798,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, hsize_t ndims, hssize unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_chunk_file_cb) + FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_file_cb) /* Calculate the index of this chunk */ if(H5V_chunk_index((unsigned)ndims,coords,fm->layout->dim,fm->chunks,fm->down_chunks,&chunk_index)<0) @@ -2909,7 +2909,7 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, hsize_t ndims, hssize_ hsize_t chunk_index; /* Chunk index */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5D_chunk_mem_cb); + FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_mem_cb); /* Calculate the index of this chunk */ if(H5V_chunk_index((unsigned)ndims,coords,fm->layout->dim,fm->chunks,fm->down_chunks,&chunk_index)<0) diff --git a/src/H5Distore.c b/src/H5Distore.c index 93c25e4..eaf0671 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -245,8 +245,8 @@ H5F_istore_sizeof_rkey(H5F_t UNUSED *f, const void *_udata) const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *) _udata; size_t nbytes; - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_istore_sizeof_rkey); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_sizeof_rkey); assert(udata); assert(udata->mesg.ndims > 0 && udata->mesg.ndims <= H5O_LAYOUT_NDIMS); @@ -799,7 +799,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, H5F_istore_ud1_t *bt_udata = (H5F_istore_ud1_t *)_udata; H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key; - FUNC_ENTER_NOINIT(H5F_istore_iter_allocated); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_iter_allocated); bt_udata->total_storage += lt_key->nbytes; @@ -836,7 +836,7 @@ H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, hadd H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key; unsigned u; - FUNC_ENTER_NOINIT(H5F_istore_iter_dump); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_iter_dump); if (bt_udata->stream) { if (0==bt_udata->total_storage) { @@ -923,7 +923,7 @@ H5F_istore_flush_entry(H5F_t *f, hid_t dxpl_id, H5F_rdcc_ent_t *ent, hbool_t res size_t alloc; /*bytes allocated for BUF */ hbool_t point_of_no_return = FALSE; - FUNC_ENTER_NOINIT(H5F_istore_flush_entry); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_flush_entry); assert(f); assert(ent); @@ -1055,7 +1055,7 @@ H5F_istore_preempt(H5F_t *f, hid_t dxpl_id, H5F_rdcc_ent_t * ent, hbool_t flush) H5F_rdcc_t *rdcc = &(f->shared->rdcc); herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5F_istore_preempt); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_preempt); assert(f); assert(ent); @@ -1227,7 +1227,7 @@ H5F_istore_prune (H5F_t *f, hid_t dxpl_id, size_t size) H5F_rdcc_ent_t *n[2]; /*list next pointers */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5F_istore_prune); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_prune); /* * Preemption is accomplished by having multiple pointers (currently two) @@ -1371,7 +1371,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, H5Z_EDC_t edc; H5Z_cb_t cb_struct; - FUNC_ENTER_NOINIT(H5F_istore_lock); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_lock); assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); plist=H5I_object(dxpl_id); @@ -1634,7 +1634,7 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, unsigned u; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER_NOINIT(H5F_istore_unlock); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_unlock); if (UINT_MAX==*idx_hint) { /*not in cache*/ @@ -2074,7 +2074,7 @@ H5F_istore_get_addr(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, unsigned u; haddr_t ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5F_istore_get_addr); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_get_addr); assert(f); assert(layout && (layout->ndims > 0)); @@ -2616,7 +2616,7 @@ H5F_istore_prune_extent(H5F_t *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED a * storage that contains the beginning of the logical address space represented by UDATA. */ - FUNC_ENTER_NOINIT(H5F_istore_prune_extent); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_prune_extent); /* Figure out what chunks are no longer in use for the specified extent and release them */ for(u = 0; u < bt_udata->mesg.ndims - 1; u++) diff --git a/src/H5E.c b/src/H5E.c index 1a756ed..511f3f2 100644 --- a/src/H5E.c +++ b/src/H5E.c @@ -301,7 +301,7 @@ done: static herr_t H5E_init_interface (void) { - FUNC_ENTER_NOINIT(H5E_init_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_init_interface); H5E_auto_data_g = stderr; @@ -542,7 +542,7 @@ H5E_walk_cb(int n, H5E_error_t *err_desc, void *client_data) const char *min_str = NULL; const int indent = 2; - FUNC_ENTER_NOINIT(H5E_walk_cb); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_walk_cb); /*NO TRACE*/ /* Check arguments */ @@ -685,7 +685,7 @@ H5E_push(H5E_major_t maj_num, H5E_minor_t min_num, const char *function_name, * HERROR(). HERROR() is called by HRETURN_ERROR() which could * be called by FUNC_ENTER(). */ - FUNC_ENTER_NOINIT(H5E_push); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_push); /* * Don't fail if arguments are bad. Instead, substitute some default diff --git a/src/H5F.c b/src/H5F.c index 586e416..934525e 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -230,7 +230,7 @@ H5F_init_interface(void) H5P_genclass_t *mnt_pclass; hbool_t local = H5F_MNT_SYM_LOCAL_DEF; - FUNC_ENTER_NOINIT(H5F_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5F_init_interface); #ifdef OLD_METADATA_WRITE #ifdef H5_HAVE_PARALLEL @@ -478,7 +478,7 @@ H5F_term_interface(void) { int n = 0; - FUNC_ENTER_NOINIT(H5F_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_term_interface); if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_FILE))) { @@ -664,7 +664,7 @@ H5F_flush_all_cb(void *_f, hid_t UNUSED fid, void *_invalidate) H5F_t *f=(H5F_t *)_f; unsigned invalidate = (*((hbool_t*)_invalidate); - FUNC_ENTER_NOINIT(H5F_flush_all_cb); + FUNC_ENTER_NOAPI_NOINIT(H5F_flush_all_cb); H5F_flush(f, H5F_SCOPE_LOCAL, (invalidate ? H5F_FLUSH_INVALIDATE : H5F_FLUSH_NONE)); @@ -989,7 +989,7 @@ H5F_get_obj_count(H5F_t *f, unsigned types) { int ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5F_get_obj_count); + FUNC_ENTER_NOAPI_NOINIT(H5F_get_obj_count); if((ret_value=H5F_get_objects(f, types, -1, NULL)) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get counts of opened file IDs and object IDs in the file"); @@ -1054,7 +1054,7 @@ H5F_get_obj_ids(H5F_t *f, unsigned types, int max_objs, hid_t *oid_list) { int ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5F_get_obj_ids); + FUNC_ENTER_NOAPI_NOINIT(H5F_get_obj_ids); if((ret_value=H5F_get_objects(f, types, max_objs, oid_list)) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get object IDs opened in the file"); @@ -1086,7 +1086,7 @@ H5F_get_objects(H5F_t *f, unsigned types, int max_index, hid_t *obj_id_list) H5F_olist_t olist; /* Structure to hold search results */ int ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5F_get_object); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_object); /* Set up search information */ olist.obj_id_list = (max_index==0 ? NULL : obj_id_list); @@ -1165,7 +1165,7 @@ H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key) H5F_olist_t *olist = (H5F_olist_t *)key; /* Alias for search info */ int ret_value = FALSE; /* Return value */ - FUNC_ENTER_NOINIT(H5F_get_objects_cb); + FUNC_ENTER_NOAPI_NOINIT(H5F_get_objects_cb); assert(obj_ptr); assert(olist); @@ -1293,7 +1293,7 @@ H5F_get_vfd_handle(H5F_t *file, hid_t fapl, void**file_handle) { herr_t ret_value; - FUNC_ENTER_NOINIT(H5F_get_vfd_handle); + FUNC_ENTER_NOAPI_NOINIT(H5F_get_vfd_handle); assert(file_handle); if((ret_value=H5FD_get_vfd_handle(file->shared->lf, fapl, file_handle)) < 0) @@ -1328,7 +1328,7 @@ H5F_equal(void *_haystack, hid_t UNUSED id, void *_needle) const H5FD_t *needle = (const H5FD_t*)_needle; int retval; - FUNC_ENTER_NOINIT(H5F_equal); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_equal); retval = (0==H5FD_cmp(haystack->shared->lf, needle)); @@ -1363,7 +1363,7 @@ H5F_locate_signature(H5FD_t *file, hid_t dxpl_id) unsigned n, maxpow; haddr_t ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5F_locate_signature); + FUNC_ENTER_NOAPI_NOINIT(H5F_locate_signature); /* Find the least N such that 2^N is larger than the file size */ if (HADDR_UNDEF==(addr=H5FD_get_eof(file)) || @@ -1489,7 +1489,7 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id) int n; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER_NOINIT(H5F_new); + FUNC_ENTER_NOAPI_NOINIT(H5F_new); if (NULL==(f=H5FL_CALLOC(H5F_t))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); @@ -1630,7 +1630,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id) { herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5F_dest); + FUNC_ENTER_NOAPI_NOINIT(H5F_dest); if (f && 1==f->nrefs) { if (1==f->shared->nrefs) { @@ -2590,7 +2590,7 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags) H5P_genplist_t *plist; /* Property list */ herr_t ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5F_flush); + FUNC_ENTER_NOAPI_NOINIT(H5F_flush); /* Sanity check arguments */ assert(f); @@ -3217,7 +3217,7 @@ H5F_mount(H5G_entry_t *loc, const char *name, H5F_t *child, H5RS_str_t *name_r; /* Ref-counted version of name */ herr_t ret_value = SUCCEED; /*return value */ - FUNC_ENTER_NOINIT(H5F_mount); + FUNC_ENTER_NOAPI_NOINIT(H5F_mount); assert(loc); assert(name && *name); @@ -3338,7 +3338,7 @@ H5F_unmount(H5G_entry_t *loc, const char *name, hid_t dxpl_id) unsigned i; /*coutners */ int lt, rt, md=(-1), cmp; /*binary search indices */ - FUNC_ENTER_NOINIT(H5F_unmount); + FUNC_ENTER_NOAPI_NOINIT(H5F_unmount); assert(loc); assert(name && *name); @@ -3725,8 +3725,8 @@ done: unsigned H5F_get_intent(const H5F_t *f) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_get_intent); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_intent); assert(f); @@ -3756,8 +3756,8 @@ H5F_get_intent(const H5F_t *f) size_t H5F_sizeof_addr(const H5F_t *f) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_sizeof_addr); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sizeof_addr); assert(f); assert(f->shared); @@ -3788,8 +3788,8 @@ H5F_sizeof_addr(const H5F_t *f) size_t H5F_sizeof_size(const H5F_t *f) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_sizeof_size); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sizeof_size); assert(f); assert(f->shared); @@ -3821,8 +3821,8 @@ H5F_sizeof_size(const H5F_t *f) */ unsigned H5F_sym_leaf_k(const H5F_t *f) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_sym_leaf_k); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sym_leaf_k); assert(f); assert(f->shared); @@ -3855,8 +3855,8 @@ unsigned H5F_sym_leaf_k(const H5F_t *f) int H5F_Kvalue(const H5F_t *f, const H5B_class_t *type) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_Kvalue); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_Kvalue); assert(f); assert(f->shared); @@ -3885,8 +3885,8 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type) hid_t H5F_get_driver_id(const H5F_t *f) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_get_driver_id); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_driver_id); assert(f); assert(f->shared); @@ -3952,8 +3952,8 @@ done: haddr_t H5F_get_base_addr(const H5F_t *f) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_get_base_addr); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_base_addr); assert(f); assert(f->shared); @@ -4189,8 +4189,8 @@ herr_t H5F_addr_pack(H5F_t UNUSED *f, haddr_t *addr_p/*out*/, const unsigned long objno[2]) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_addr_pack); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_pack); assert(f); assert(objno); diff --git a/src/H5FD.c b/src/H5FD.c index d9bf120..803e305 100644 --- a/src/H5FD.c +++ b/src/H5FD.c @@ -110,7 +110,7 @@ H5FD_init_interface(void) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5FD_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5FD_init_interface); if (H5I_init_group(H5I_VFL, H5I_VFL_HASHSIZE, 0, (H5I_free_t)H5FD_free_cls)<0) @@ -149,7 +149,7 @@ H5FD_term_interface(void) { int n = 0; - FUNC_ENTER_NOINIT(H5FD_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_term_interface); if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_VFL))) { @@ -185,7 +185,7 @@ H5FD_term_interface(void) static herr_t H5FD_free_cls(H5FD_class_t *cls) { - FUNC_ENTER_NOINIT(H5FD_free_cls); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_free_cls); H5MM_xfree(cls); @@ -493,7 +493,7 @@ H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size, const void *old_p void *new_pl = NULL; /* Copy of property list */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5FD_pl_copy) + FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_copy) /* Copy old pl, if one exists */ if (old_pl) { @@ -538,7 +538,7 @@ H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *), void *pl) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5FD_pl_close) + FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_close) /* Allow driver to free or do it ourselves */ if (pl && free_func) { @@ -2026,7 +2026,7 @@ H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) { haddr_t ret_value = HADDR_UNDEF; - FUNC_ENTER_NOINIT(H5FD_real_alloc); + FUNC_ENTER_NOAPI_NOINIT(H5FD_real_alloc); /* check args */ assert(file); @@ -2074,7 +2074,7 @@ H5FD_update_eoa(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) hsize_t wasted; haddr_t ret_value = HADDR_UNDEF; - FUNC_ENTER_NOINIT(H5FD_update_eoa); + FUNC_ENTER_NOAPI_NOINIT(H5FD_update_eoa); /* check args */ assert(file); diff --git a/src/H5FDfphdf5.c b/src/H5FDfphdf5.c index 3cbe426..b93c4d4 100644 --- a/src/H5FDfphdf5.c +++ b/src/H5FDfphdf5.c @@ -1754,7 +1754,7 @@ H5FD_fphdf5_MPIOff_to_haddr(MPI_Offset mpi_off) { haddr_t ret_value; - FUNC_ENTER_NOINIT(H5FD_fphdf5_MPIOff_to_haddr); + FUNC_ENTER_NOAPI_NOINIT(H5FD_fphdf5_MPIOff_to_haddr); ret_value = (mpi_off != (MPI_Offset)(haddr_t)mpi_off ? HADDR_UNDEF : (haddr_t)mpi_off); FUNC_LEAVE_NOAPI(ret_value); } @@ -1776,7 +1776,7 @@ H5FD_fphdf5_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off) { herr_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5FD_fphdf5_haddr_to_MPIOff); + FUNC_ENTER_NOAPI_NOINIT(H5FD_fphdf5_haddr_to_MPIOff); if (mpi_off) *mpi_off = (MPI_Offset)addr; diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 492cba3..ea4a9fc 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -2114,7 +2114,7 @@ H5FD_mpio_MPIOff_to_haddr(MPI_Offset mpi_off) { haddr_t ret_value=HADDR_UNDEF; - FUNC_ENTER_NOINIT(H5FD_mpio_MPIOff_to_haddr); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpio_MPIOff_to_haddr); if (mpi_off != (MPI_Offset)(haddr_t)mpi_off) ret_value=HADDR_UNDEF; @@ -2155,7 +2155,7 @@ H5FD_mpio_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/) { herr_t ret_value=FAIL; - FUNC_ENTER_NOINIT(H5FD_mpio_haddr_to_MPIOff); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpio_haddr_to_MPIOff); if (mpi_off) *mpi_off = (MPI_Offset)addr; diff --git a/src/H5FDstream.c b/src/H5FDstream.c index 0596fc3..72cf0d1 100644 --- a/src/H5FDstream.c +++ b/src/H5FDstream.c @@ -385,7 +385,7 @@ H5FD_stream_open_socket (const char *filename, int o_flags, int on = 1; H5FD_STREAM_SOCKET_TYPE ret_value=H5FD_STREAM_INVALID_SOCKET; - FUNC_ENTER_NOINIT(H5FD_stream_open_socket); + FUNC_ENTER_NOAPI_NOINIT(H5FD_stream_open_socket); /* Parse "hostname:port" from filename argument */ for (separator = filename; *separator != ':' && *separator; separator++) @@ -489,7 +489,7 @@ H5FD_stream_read_from_socket (H5FD_stream_t *stream) unsigned char *ptr=NULL; herr_t ret_value=SUCCEED; - FUNC_ENTER_NOINIT(H5FD_stream_read_from_socket); + FUNC_ENTER_NOAPI_NOINIT(H5FD_stream_read_from_socket); stream->eof = 0; stream->mem = NULL; diff --git a/src/H5FL.c b/src/H5FL.c index 8237a60..758015b 100644 --- a/src/H5FL.c +++ b/src/H5FL.c @@ -169,7 +169,7 @@ H5FL_reg_init(H5FL_reg_head_t *head) H5FL_reg_gc_node_t *new_node; /* Pointer to the node for the new list to garbage collect */ herr_t ret_value=SUCCEED; /* return value*/ - FUNC_ENTER_NOINIT(H5FL_reg_init); + FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_init); /* Allocate a new garbage collection node */ if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_reg_gc_node_t)))) @@ -376,7 +376,7 @@ H5FL_reg_gc_list(H5FL_reg_head_t *head) void *tmp; /* Temporary node pointer */ size_t total_mem; /* Total memory used on list */ - FUNC_ENTER_NOINIT(H5FL_reg_gc_list); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_gc_list); /* Calculate the total memory used on this list */ total_mem=head->onlist*head->size; @@ -433,7 +433,7 @@ H5FL_reg_gc(void) { H5FL_reg_gc_node_t *gc_node; /* Pointer into the list of things to garbage collect */ - FUNC_ENTER_NOINIT(H5FL_reg_gc); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_gc); /* Walk through all the free lists, free()'ing the nodes */ gc_node=H5FL_reg_gc_head.first; @@ -483,7 +483,7 @@ H5FL_reg_term(void) H5FL_reg_gc_node_t *left; /* pointer to garbage collection lists with work left */ H5FL_reg_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */ - FUNC_ENTER_NOINIT(H5FL_reg_term); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_term); if (interface_initialize_g) { /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */ @@ -549,7 +549,7 @@ H5FL_blk_find_list(H5FL_blk_node_t **head, size_t size) H5FL_blk_node_t *temp; /* Temp. pointer to node in the native list */ H5FL_blk_node_t *ret_value; - FUNC_ENTER_NOINIT(H5FL_blk_find_list); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_find_list); /* Find the correct free list */ temp=*head; @@ -603,7 +603,7 @@ H5FL_blk_create_list(H5FL_blk_node_t **head, size_t size) H5FL_blk_node_t *temp; /* Temp. pointer to node in the list */ H5FL_blk_node_t *ret_value; - FUNC_ENTER_NOINIT(H5FL_blk_create_list); + FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_create_list); /* Allocate room for the new free list node */ if(NULL==(temp=H5FL_MALLOC(H5FL_blk_node_t))) @@ -654,7 +654,7 @@ H5FL_blk_init(H5FL_blk_head_t *head) H5FL_blk_gc_node_t *new_node; /* Pointer to the node for the new list to garbage collect */ herr_t ret_value=SUCCEED; /* return value*/ - FUNC_ENTER_NOINIT(H5FL_blk_init); + FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_init); /* Allocate a new garbage collection node */ if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_blk_gc_node_t)))) @@ -977,7 +977,7 @@ H5FL_blk_gc_list(H5FL_blk_head_t *head) void *next; /* Temp. ptr to the free list list node */ void *temp; /* Temp. ptr to the free list page node */ - FUNC_ENTER_NOINIT(H5FL_blk_gc_list); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_gc_list); /* Loop through all the nodes in the block free list queue */ while(head->head!=NULL) { @@ -1039,7 +1039,7 @@ H5FL_blk_gc(void) { H5FL_blk_gc_node_t *gc_node; /* Pointer into the list of things to garbage collect */ - FUNC_ENTER_NOINIT(H5FL_blk_gc); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_gc); /* Walk through all the free lists, free()'ing the nodes */ gc_node=H5FL_blk_gc_head.first; @@ -1083,7 +1083,7 @@ H5FL_blk_term(void) H5FL_blk_gc_node_t *left; /* pointer to garbage collection lists with work left */ H5FL_blk_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */ - FUNC_ENTER_NOINIT(H5FL_blk_term); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_term); /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */ left=NULL; @@ -1141,7 +1141,7 @@ H5FL_arr_init(H5FL_arr_head_t *head) H5FL_gc_arr_node_t *new_node; /* Pointer to the node for the new list to garbage collect */ herr_t ret_value=SUCCEED; /* return value*/ - FUNC_ENTER_NOINIT(H5FL_arr_init); + FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_init); /* Allocate a new garbage collection node */ if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_gc_arr_node_t)))) @@ -1469,7 +1469,7 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head) int i; /* Counter for array of free lists */ size_t total_mem; /* Total memory used on list */ - FUNC_ENTER_NOINIT(H5FL_arr_gc_list); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_gc_list); /* Check if the array has a fixed maximum number of elements */ if(head->maxelem>0) { @@ -1536,7 +1536,7 @@ H5FL_arr_gc(void) { H5FL_gc_arr_node_t *gc_arr_node; /* Pointer into the list of things to garbage collect */ - FUNC_ENTER_NOINIT(H5FL_arr_gc); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_gc); /* Walk through all the free lists, free()'ing the nodes */ gc_arr_node=H5FL_arr_gc_head.first; @@ -1580,7 +1580,7 @@ H5FL_arr_term(void) H5FL_gc_arr_node_t *left; /* pointer to garbage collection lists with work left */ H5FL_gc_arr_node_t *tmp; /* Temporary pointer to a garbage collection node */ - FUNC_ENTER_NOINIT(H5FL_arr_term); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_term); /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */ left=NULL; @@ -1662,7 +1662,7 @@ printf("H5FL_arr_term: head->name=%s, head->allocated=%d\n", H5FL_arr_gc_head.fi herr_t H5FL_garbage_coll(void) { - FUNC_ENTER_NOINIT(H5FL_garbage_coll); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_garbage_coll); /* Garbage collect the free lists for array objects */ H5FL_arr_gc(); @@ -1757,7 +1757,7 @@ H5FL_term_interface(void) { int ret_value=0; - FUNC_ENTER_NOINIT(H5FL_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_term_interface); /* Garbage collect any nodes on the free lists */ H5FL_garbage_coll(); diff --git a/src/H5FPclient.c b/src/H5FPclient.c index 75149e8..1b3110a 100644 --- a/src/H5FPclient.c +++ b/src/H5FPclient.c @@ -735,7 +735,7 @@ static unsigned H5FP_gen_request_id() { static unsigned int i = 0; - FUNC_ENTER_NOINIT(H5FP_gen_request_id); + FUNC_ENTER_NOAPI_NOINIT(H5FP_gen_request_id); FUNC_LEAVE_NOAPI(i++); } @@ -756,7 +756,7 @@ H5FP_dump_to_file(H5FD_t *file, hid_t dxpl_id) unsigned dumping = 1; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5FP_dump_to_file); + FUNC_ENTER_NOAPI_NOINIT(H5FP_dump_to_file); /* check args */ assert(file); diff --git a/src/H5FPserver.c b/src/H5FPserver.c index 1e980c3..cdedb33 100644 --- a/src/H5FPserver.c +++ b/src/H5FPserver.c @@ -276,7 +276,7 @@ H5FP_sap_receive(H5FP_request_t *req, int source, int tag, char **buf) herr_t ret_value = SUCCEED; int mrc; - FUNC_ENTER_NOINIT(H5FP_sap_receive); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_receive); HDmemset(&status, 0, sizeof(status)); @@ -304,7 +304,7 @@ H5FP_object_lock_cmp(H5FP_object_lock *o1, H5FP_object_lock *o2, int UNUSED cmparg) { - FUNC_ENTER_NOINIT(H5FP_object_lock_cmp); + FUNC_ENTER_NOAPI_NOINIT(H5FP_object_lock_cmp); assert(o1); assert(o2); FUNC_LEAVE_NOAPI(HDmemcmp(o1->oid, o2->oid, sizeof(o1->oid))); @@ -330,7 +330,7 @@ H5FP_new_object_lock(const unsigned char *oid, unsigned rank, { H5FP_object_lock *ret_value = NULL; - FUNC_ENTER_NOINIT(H5FP_new_object_lock); + FUNC_ENTER_NOAPI_NOINIT(H5FP_new_object_lock); assert(oid); if ((ret_value = (H5FP_object_lock *)H5MM_malloc(sizeof(H5FP_object_lock))) == NULL) @@ -356,7 +356,7 @@ done: static herr_t H5FP_free_object_lock(H5FP_object_lock *ol) { - FUNC_ENTER_NOINIT(H5FP_free_object_lock); + FUNC_ENTER_NOAPI_NOINIT(H5FP_free_object_lock); HDfree(ol); FUNC_LEAVE_NOAPI(SUCCEED); } @@ -374,7 +374,7 @@ H5FP_find_object_lock(H5FP_file_info *info, unsigned char *oid) { H5FP_object_lock *ret_value = NULL; - FUNC_ENTER_NOINIT(H5FP_find_object_lock); + FUNC_ENTER_NOAPI_NOINIT(H5FP_find_object_lock); assert(info); assert(oid); @@ -411,7 +411,7 @@ H5FP_remove_object_lock_from_list(H5FP_file_info *info, H5TB_NODE *node; herr_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5FP_remove_object_lock_from_list); + FUNC_ENTER_NOAPI_NOINIT(H5FP_remove_object_lock_from_list); if ((node = H5TB_dfind(info->locks, (void *)ol, NULL)) != NULL) { H5FP_free_object_lock(H5TB_rem(&info->locks->root, node, NULL)); @@ -433,7 +433,7 @@ H5FP_file_mod_cmp(H5FP_mdata_mod *k1, H5FP_mdata_mod *k2, int UNUSED cmparg) { - FUNC_ENTER_NOINIT(H5FP_file_mod_cmp); + FUNC_ENTER_NOAPI_NOINIT(H5FP_file_mod_cmp); assert(k1); assert(k2); FUNC_LEAVE_NOAPI(k1->addr - k2->addr); @@ -450,7 +450,7 @@ H5FP_file_mod_cmp(H5FP_mdata_mod *k1, static herr_t H5FP_free_mod_node(H5FP_mdata_mod *info) { - FUNC_ENTER_NOINIT(H5FP_free_mod_node); + FUNC_ENTER_NOAPI_NOINIT(H5FP_free_mod_node); if (info) { HDfree(info->metadata); @@ -476,7 +476,7 @@ H5FP_new_file_mod_node(unsigned UNUSED rank, H5FD_mem_t mem_type, { H5FP_mdata_mod *ret_value = NULL; - FUNC_ENTER_NOINIT(H5FP_new_file_mod_node); + FUNC_ENTER_NOAPI_NOINIT(H5FP_new_file_mod_node); if ((ret_value = (H5FP_mdata_mod *)H5MM_malloc(sizeof(H5FP_mdata_mod))) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory"); @@ -510,7 +510,7 @@ H5FP_add_file_mod_to_list(H5FP_file_info *info, H5FD_mem_t mem_type, H5TB_NODE *node; herr_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5FP_add_file_mod_to_list); + FUNC_ENTER_NOAPI_NOINIT(H5FP_add_file_mod_to_list); /* check args */ assert(info); @@ -554,7 +554,7 @@ done: static herr_t H5FP_free_file_info_node(H5FP_file_info *info) { - FUNC_ENTER_NOINIT(H5FP_free_file_info_node); + FUNC_ENTER_NOAPI_NOINIT(H5FP_free_file_info_node); if (info) { H5TB_dfree(info->mod_tree, (void (*)(void*))H5FP_free_mod_node, NULL); @@ -576,7 +576,7 @@ H5FP_free_file_info_node(H5FP_file_info *info) static int H5FP_file_info_cmp(H5FP_file_info *k1, H5FP_file_info *k2, int UNUSED cmparg) { - FUNC_ENTER_NOINIT(H5FP_file_info_cmp); + FUNC_ENTER_NOAPI_NOINIT(H5FP_file_info_cmp); assert(k1); assert(k2); FUNC_LEAVE_NOAPI(k1->file_id - k2->file_id); @@ -595,7 +595,7 @@ H5FP_new_file_info_node(unsigned file_id) { H5FP_file_info *ret_value; - FUNC_ENTER_NOINIT(H5FP_new_file_info_node); + FUNC_ENTER_NOAPI_NOINIT(H5FP_new_file_info_node); if ((ret_value = (H5FP_file_info *)H5MM_malloc(sizeof(H5FP_file_info))) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory"); @@ -635,7 +635,7 @@ H5FP_find_file_info(unsigned file_id) H5TB_NODE *node = NULL; H5FP_file_info *ret_value = NULL; - FUNC_ENTER_NOINIT(H5FP_find_file_info); + FUNC_ENTER_NOAPI_NOINIT(H5FP_find_file_info); if (file_info_tree && file_info_tree->root) { H5FP_file_info s; @@ -668,7 +668,7 @@ H5FP_add_new_file_info_to_list(unsigned file_id, haddr_t maxaddr, H5FP_file_info *info; herr_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5FP_add_new_file_info_to_list); + FUNC_ENTER_NOAPI_NOINIT(H5FP_add_new_file_info_to_list); if ((info = H5FP_new_file_info_node(file_id)) != NULL) { int mrc; @@ -727,7 +727,7 @@ H5FP_remove_file_id_from_list(unsigned file_id) H5TB_NODE *node; herr_t ret_value = FAIL; - FUNC_ENTER_NOINIT(H5FP_remove_file_id_from_list); + FUNC_ENTER_NOAPI_NOINIT(H5FP_remove_file_id_from_list); s.file_id = file_id; /* This is the key field for the TBBT */ @@ -760,7 +760,7 @@ H5FP_send_reply(unsigned to, unsigned req_id, unsigned file_id, H5FP_status_t st herr_t ret_value = SUCCEED; int mrc; - FUNC_ENTER_NOINIT(H5FP_send_reply); + FUNC_ENTER_NOAPI_NOINIT(H5FP_send_reply); reply.req_id = req_id; reply.file_id = file_id; @@ -791,7 +791,7 @@ H5FP_dump(H5FP_file_info *info, unsigned to, unsigned req_id, unsigned file_id) herr_t ret_value = SUCCEED; int mrc; - FUNC_ENTER_NOINIT(H5FP_dump); + FUNC_ENTER_NOAPI_NOINIT(H5FP_dump); /* check args */ assert(info); @@ -865,7 +865,7 @@ static unsigned H5FP_gen_sap_file_id() { static unsigned i = 0; - FUNC_ENTER_NOINIT(H5FP_gen_sap_file_id); + FUNC_ENTER_NOAPI_NOINIT(H5FP_gen_sap_file_id); FUNC_LEAVE_NOAPI(i++); } @@ -883,7 +883,7 @@ H5FP_sap_handle_open_request(H5FP_request_t *req, unsigned UNUSED md_size) herr_t ret_value = SUCCEED; int mrc; - FUNC_ENTER_NOINIT(H5FP_sap_handle_open_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_open_request); if (req->obj_type == H5FP_OBJ_FILE) { unsigned new_file_id = H5FP_gen_sap_file_id(); @@ -936,7 +936,7 @@ H5FP_sap_handle_lock_request(H5FP_request_t *req) herr_t ret_value = SUCCEED; unsigned i, j; - FUNC_ENTER_NOINIT(H5FP_sap_handle_lock_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_lock_request); if ((oids = (struct lock_group *)H5MM_malloc(list_size * sizeof(struct lock_group))) == NULL) { @@ -1139,7 +1139,7 @@ H5FP_sap_handle_release_lock_request(H5FP_request_t *req) herr_t ret_value; unsigned i, j; - FUNC_ENTER_NOINIT(H5FP_sap_handle_release_lock_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_release_lock_request); if ((oids = (struct release_group *)H5MM_malloc(list_size * sizeof(struct release_group))) == NULL) { @@ -1243,7 +1243,7 @@ H5FP_sap_handle_read_request(H5FP_request_t *req) char *metadata = NULL; int mrc; - FUNC_ENTER_NOINIT(H5FP_sap_handle_read_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_read_request); r.req_id = req->req_id; r.file_id = req->file_id; @@ -1313,7 +1313,7 @@ H5FP_sap_handle_write_request(H5FP_request_t *req, char *mdata, unsigned md_size H5FP_status_t exit_state = H5FP_STATUS_OK; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5FP_sap_handle_write_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_write_request); if ((info = H5FP_find_file_info(req->file_id)) != NULL) { #if 0 @@ -1397,7 +1397,7 @@ H5FP_sap_handle_flush_request(H5FP_request_t *req) H5FP_status_t exit_state = H5FP_STATUS_OK; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5FP_sap_handle_flush_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_flush_request); if ((info = H5FP_find_file_info(req->file_id)) != NULL) if (info->num_mods) { @@ -1439,7 +1439,7 @@ H5FP_sap_handle_close_request(H5FP_request_t *req) H5FP_status_t exit_state = H5FP_STATUS_OK; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5FP_sap_handle_close_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_close_request); if ((info = H5FP_find_file_info(req->file_id)) != NULL) { int comm_size; @@ -1482,7 +1482,7 @@ H5FP_sap_handle_alloc_request(H5FP_request_t *req) int mrc; herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5FP_sap_handle_alloc_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_alloc_request); sap_alloc.req_id = req->req_id; sap_alloc.file_id = req->file_id; @@ -1545,7 +1545,7 @@ H5FP_sap_handle_free_request(H5FP_request_t *req) herr_t ret_value = SUCCEED; int mrc; - FUNC_ENTER_NOINIT(H5FP_sap_handle_free_request); + FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_free_request); sap_alloc.req_id = req->req_id; sap_alloc.file_id = req->file_id; diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c index f47f725..bb64916 100644 --- a/src/H5Fcontig.c +++ b/src/H5Fcontig.c @@ -125,7 +125,7 @@ done: */ herr_t H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout, - struct H5P_genplist_t *dc_plist, const struct H5S_t *space, + const struct H5S_t *space, const struct H5O_fill_t *fill, size_t elmt_size) { hssize_t snpoints; /* Number of points in space (for error checking) */ @@ -154,7 +154,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout, assert(layout && H5D_CONTIGUOUS==layout->type); assert(layout->ndims>0 && layout->ndims<=H5O_LAYOUT_NDIMS); assert(H5F_addr_defined(layout->addr)); - assert(dc_plist!=NULL); assert(space); assert(elmt_size>0); diff --git a/src/H5Fistore.c b/src/H5Fistore.c index 93c25e4..eaf0671 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -245,8 +245,8 @@ H5F_istore_sizeof_rkey(H5F_t UNUSED *f, const void *_udata) const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *) _udata; size_t nbytes; - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5F_istore_sizeof_rkey); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_sizeof_rkey); assert(udata); assert(udata->mesg.ndims > 0 && udata->mesg.ndims <= H5O_LAYOUT_NDIMS); @@ -799,7 +799,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, H5F_istore_ud1_t *bt_udata = (H5F_istore_ud1_t *)_udata; H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key; - FUNC_ENTER_NOINIT(H5F_istore_iter_allocated); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_iter_allocated); bt_udata->total_storage += lt_key->nbytes; @@ -836,7 +836,7 @@ H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, hadd H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key; unsigned u; - FUNC_ENTER_NOINIT(H5F_istore_iter_dump); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_iter_dump); if (bt_udata->stream) { if (0==bt_udata->total_storage) { @@ -923,7 +923,7 @@ H5F_istore_flush_entry(H5F_t *f, hid_t dxpl_id, H5F_rdcc_ent_t *ent, hbool_t res size_t alloc; /*bytes allocated for BUF */ hbool_t point_of_no_return = FALSE; - FUNC_ENTER_NOINIT(H5F_istore_flush_entry); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_flush_entry); assert(f); assert(ent); @@ -1055,7 +1055,7 @@ H5F_istore_preempt(H5F_t *f, hid_t dxpl_id, H5F_rdcc_ent_t * ent, hbool_t flush) H5F_rdcc_t *rdcc = &(f->shared->rdcc); herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5F_istore_preempt); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_preempt); assert(f); assert(ent); @@ -1227,7 +1227,7 @@ H5F_istore_prune (H5F_t *f, hid_t dxpl_id, size_t size) H5F_rdcc_ent_t *n[2]; /*list next pointers */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5F_istore_prune); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_prune); /* * Preemption is accomplished by having multiple pointers (currently two) @@ -1371,7 +1371,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, H5Z_EDC_t edc; H5Z_cb_t cb_struct; - FUNC_ENTER_NOINIT(H5F_istore_lock); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_lock); assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); plist=H5I_object(dxpl_id); @@ -1634,7 +1634,7 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, unsigned u; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER_NOINIT(H5F_istore_unlock); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_unlock); if (UINT_MAX==*idx_hint) { /*not in cache*/ @@ -2074,7 +2074,7 @@ H5F_istore_get_addr(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, unsigned u; haddr_t ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5F_istore_get_addr); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_get_addr); assert(f); assert(layout && (layout->ndims > 0)); @@ -2616,7 +2616,7 @@ H5F_istore_prune_extent(H5F_t *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED a * storage that contains the beginning of the logical address space represented by UDATA. */ - FUNC_ENTER_NOINIT(H5F_istore_prune_extent); + FUNC_ENTER_NOAPI_NOINIT(H5F_istore_prune_extent); /* Figure out what chunks are no longer in use for the specified extent and release them */ for(u = 0; u < bt_udata->mesg.ndims - 1; u++) diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index e6b5bf7..8b302f0 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -434,8 +434,7 @@ H5_DLL ssize_t H5F_seq_writevv(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *lay H5_DLL herr_t H5F_contig_create(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout); H5_DLL herr_t H5F_contig_fill(H5F_t *f, hid_t dxpl_id, - struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, - const struct H5S_t *space, + struct H5O_layout_t *layout, const struct H5S_t *space, const struct H5O_fill_t *fill, size_t elmt_size); H5_DLL herr_t H5F_contig_delete(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout); diff --git a/src/H5G.c b/src/H5G.c index 233583a..b120231 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -983,7 +983,7 @@ H5G_init_interface(void) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5G_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5G_init_interface); /* Initialize the atom group for the group IDs */ if (H5I_init_group(H5I_GROUP, H5I_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS, @@ -1028,7 +1028,7 @@ H5G_term_interface(void) size_t i; int n=0; - FUNC_ENTER_NOINIT(H5G_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_term_interface); if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_GROUP))) { @@ -1156,8 +1156,8 @@ done: static const char * H5G_component(const char *name, size_t *size_p) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5G_component); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_component); assert(name); @@ -1197,7 +1197,7 @@ H5G_basename(const char *name, size_t *size_p) { size_t i; - FUNC_ENTER_NOINIT(H5G_basename); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_basename); /* Find the end of the base name */ i = HDstrlen(name); @@ -1240,7 +1240,7 @@ H5G_normalize(const char *name) unsigned last_slash; /* Flag to indicate last character was a slash */ char *ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5G_normalize); + FUNC_ENTER_NOAPI_NOINIT(H5G_normalize); /* Sanity check */ assert(name); @@ -1391,7 +1391,7 @@ H5G_namei(H5G_entry_t *loc_ent, const char *name, const char **rest/*out*/, unsigned last_comp = 0; /* Flag to indicate that a component is the last component in the name */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5G_namei); + FUNC_ENTER_NOAPI_NOINIT(H5G_namei); /* Set up "out" parameters */ if (rest) @@ -2187,8 +2187,8 @@ done: H5G_entry_t * H5G_entof (H5G_t *grp) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5G_entof); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_entof); FUNC_LEAVE_NOAPI(grp ? &(grp->ent) : NULL); } @@ -2213,8 +2213,8 @@ H5G_entof (H5G_t *grp) H5F_t * H5G_fileof (H5G_t *grp) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5G_fileof); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_fileof); assert (grp); @@ -3358,7 +3358,7 @@ H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r) size_t nchars1,nchars2; /* Number of characters in components */ htri_t ret_value=FALSE; /* Return value */ - FUNC_ENTER_NOINIT(H5G_common_path); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_common_path); /* Get component of each name */ fullpath=H5RS_get_str(fullpath_r); @@ -3428,7 +3428,7 @@ H5G_replace_ent(void *obj_ptr, hid_t obj_id, void *key) H5F_t *top_loc_file; /* Top file in location's mounted file chain */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5G_replace_ent); + FUNC_ENTER_NOAPI_NOINIT(H5G_replace_ent); assert(obj_ptr); diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 2440234..a7a23b3 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -161,8 +161,8 @@ H5FL_BLK_DEFINE_STATIC(symbol_node); static size_t H5G_node_sizeof_rkey(H5F_t *f, const void UNUSED * udata) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5G_node_sizeof_rkey); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_sizeof_rkey); FUNC_LEAVE_NOAPI(H5F_SIZEOF_SIZE(f)); /*the name offset */ } @@ -295,7 +295,7 @@ done: static size_t H5G_node_size(H5F_t *f) { - FUNC_ENTER_NOINIT(H5G_node_size); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_size); FUNC_LEAVE_NOAPI(H5G_NODE_SIZEOF_HDR(f) + (2 * H5F_SYM_LEAF_K(f)) * H5G_SIZEOF_ENTRY(f)); @@ -516,7 +516,7 @@ done: static herr_t H5G_node_dest(H5F_t UNUSED *f, H5G_node_t *sym) { - FUNC_ENTER_NOINIT(H5G_node_dest); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_dest); /* * Check arguments. @@ -554,7 +554,7 @@ H5G_node_clear(H5G_node_t *sym) { int i; /* Local index variable */ - FUNC_ENTER_NOINIT(H5G_node_clear); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_clear); /* * Check arguments. diff --git a/src/H5HG.c b/src/H5HG.c index f463b1c..26d7a3d 100644 --- a/src/H5HG.c +++ b/src/H5HG.c @@ -516,7 +516,7 @@ H5HG_dest (H5F_t *f, H5HG_heap_t *heap) { int i; - FUNC_ENTER_NOINIT(H5HG_dest); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_dest); /* Check arguments */ assert (heap); @@ -556,7 +556,7 @@ H5HG_dest (H5F_t *f, H5HG_heap_t *heap) static herr_t H5HG_clear(H5HG_heap_t *heap) { - FUNC_ENTER_NOINIT(H5HG_clear); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_clear); /* Check arguments */ assert (heap); @@ -595,7 +595,7 @@ H5HG_alloc (H5F_t *f, H5HG_heap_t *heap, int cwfsno, size_t size) uint8_t *p = NULL; size_t need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(size); - FUNC_ENTER_NOINIT(H5HG_alloc); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_alloc); /* Check args */ assert (heap); diff --git a/src/H5HL.c b/src/H5HL.c index bacf87b..2ca4c08 100644 --- a/src/H5HL.c +++ b/src/H5HL.c @@ -552,7 +552,7 @@ H5HL_dest(H5F_t UNUSED *f, H5HL_t *heap) { H5HL_free_t *fl; - FUNC_ENTER_NOINIT(H5HL_dest); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_dest); /* check arguments */ assert(heap); @@ -591,7 +591,7 @@ H5HL_dest(H5F_t UNUSED *f, H5HL_t *heap) static herr_t H5HL_clear(H5HL_t *heap) { - FUNC_ENTER_NOINIT(H5HL_clear); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_clear); /* check arguments */ assert(heap); @@ -735,7 +735,7 @@ done: static H5HL_free_t * H5HL_remove_free(H5HL_t *heap, H5HL_free_t *fl) { - FUNC_ENTER_NOINIT(H5HL_remove_free); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_remove_free); if (fl->prev) fl->prev->next = fl->next; if (fl->next) fl->next->prev = fl->prev; diff --git a/src/H5HP.c b/src/H5HP.c index d62bd4e..2cf4287 100644 --- a/src/H5HP.c +++ b/src/H5HP.c @@ -93,7 +93,7 @@ H5HP_swim_max(H5HP_t *heap, size_t loc) H5HP_info_t *obj; /* Temporary pointer to object to move in heap */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5HP_swim_max); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HP_swim_max); /* Get copies of the information about the object to move in the heap */ val=heap->heap[loc].val; @@ -151,7 +151,7 @@ H5HP_swim_min(H5HP_t *heap, size_t loc) H5HP_info_t *obj; /* Temporary pointer to object to move in heap */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5HP_swim_min); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HP_swim_min); /* Get copies of the information about the object to move in the heap */ val=heap->heap[loc].val; @@ -209,7 +209,7 @@ H5HP_sink_max(H5HP_t *heap, size_t loc) void *obj; /* Temporary pointer to object to move in heap */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5HP_sink_max); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HP_sink_max); /* Get copies of the information about the object to move in the heap */ val=heap->heap[loc].val; @@ -278,7 +278,7 @@ H5HP_sink_min(H5HP_t *heap, size_t loc) void *obj; /* Temporary pointer to object to move in heap */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5HP_sink_min); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HP_sink_min); /* Get copies of the information about the object to move in the heap */ val=heap->heap[loc].val; diff --git a/src/H5I.c b/src/H5I.c index 284b9b8..d2b2975 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -140,7 +140,7 @@ static herr_t H5I_debug(H5I_type_t grp); static herr_t H5I_init_interface(void) { - FUNC_ENTER_NOINIT(H5I_init_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_init_interface); /* * Make certain the ID types don't overflow the number of bits allocated @@ -177,7 +177,7 @@ H5I_term_interface(void) H5I_type_t grp; int n=0; - FUNC_ENTER_NOINIT(H5I_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_term_interface); if (interface_initialize_g) { /* How many groups are still being used? */ @@ -1077,7 +1077,7 @@ H5I_find_id(hid_t id) unsigned hash_loc; /*bucket pointer */ H5I_id_info_t *ret_value = NULL; /*return value */ - FUNC_ENTER_NOINIT(H5I_find_id); + FUNC_ENTER_NOAPI_NOINIT(H5I_find_id); /* Check arguments */ grp = H5I_GROUP(id); diff --git a/src/H5MM.c b/src/H5MM.c index 9701bb9..dc3cd2c 100644 --- a/src/H5MM.c +++ b/src/H5MM.c @@ -58,8 +58,8 @@ static int interface_initialize_g = 0; void * H5MM_malloc(size_t size) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5MM_malloc); + /* Use FUNC_ENTER_NOAPI_NOINIT here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT(H5MM_malloc); assert(size); @@ -91,8 +91,8 @@ H5MM_malloc(size_t size) void * H5MM_calloc(size_t size) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5MM_calloc); + /* Use FUNC_ENTER_NOAPI_NOINIT here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT(H5MM_calloc); assert(size); @@ -129,8 +129,8 @@ H5MM_realloc(void *mem, size_t size) { void *ret_value; - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5MM_realloc); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_realloc); if (!mem) { if (0 == size) @@ -177,8 +177,8 @@ H5MM_xstrdup(const char *s) { char *ret_value=NULL; - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5MM_xstrdup); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_xstrdup); if (s) { ret_value = H5MM_malloc(HDstrlen(s) + 1); @@ -254,8 +254,8 @@ done: void * H5MM_xfree(void *mem) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5MM_xfree); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_xfree); if (mem) HDfree(mem); diff --git a/src/H5O.c b/src/H5O.c index 115e69f..bb4ae4c 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -170,7 +170,7 @@ H5FL_EXTERN(time_t); static herr_t H5O_init_interface(void) { - FUNC_ENTER_NOINIT(H5O_init_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_init_interface); /* * Initialize functions that decode messages from symbol table entries. @@ -265,7 +265,7 @@ H5O_init(H5F_t *f, hid_t dxpl_id, size_t size_hint, H5G_entry_t *ent/*out*/, had haddr_t tmp_addr; herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER_NOINIT(H5O_init); + FUNC_ENTER_NOAPI_NOINIT(H5O_init); /* check args */ assert(f); @@ -815,7 +815,7 @@ H5O_dest(H5F_t UNUSED *f, H5O_t *oh) { unsigned i; - FUNC_ENTER_NOINIT(H5O_dest); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dest); /* check args */ assert(oh); @@ -871,7 +871,7 @@ H5O_clear(H5O_t *oh) { unsigned u; /* Local index variable */ - FUNC_ENTER_NOINIT(H5O_clear); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_clear); /* check args */ assert(oh); @@ -956,7 +956,7 @@ H5O_reset_real(const H5O_class_t *type, void *native) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_reset_real); + FUNC_ENTER_NOAPI_NOINIT(H5O_reset_real); /* check args */ assert(type); @@ -1035,7 +1035,7 @@ H5O_free_real(const H5O_class_t *type, void *mesg) { void * ret_value=NULL; /* Return value */ - FUNC_ENTER_NOINIT(H5O_free_real); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_free_real); /* check args */ assert(type); @@ -1117,7 +1117,7 @@ H5O_copy_real (const H5O_class_t *type, const void *mesg, void *dst) { void *ret_value = NULL; - FUNC_ENTER_NOINIT(H5O_copy_real); + FUNC_ENTER_NOAPI_NOINIT(H5O_copy_real); /* check args */ assert (type); @@ -1389,7 +1389,7 @@ H5O_exists_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, hid_t d unsigned u; htri_t ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5O_exists_real); + FUNC_ENTER_NOAPI_NOINIT(H5O_exists_real); assert(ent); assert(ent->file); @@ -1505,7 +1505,7 @@ H5O_read_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, void *mes H5G_type_t cache_type; void *ret_value = NULL; - FUNC_ENTER_NOINIT(H5O_read_real); + FUNC_ENTER_NOAPI_NOINIT(H5O_read_real); /* check args */ assert(ent); @@ -1587,7 +1587,7 @@ H5O_find_in_ohdr(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_class_t **type_p, const H5O_class_t *type = NULL; unsigned ret_value; - FUNC_ENTER_NOINIT(H5O_find_in_ohdr); + FUNC_ENTER_NOAPI_NOINIT(H5O_find_in_ohdr); /* Check args */ assert(f); @@ -1987,7 +1987,7 @@ H5O_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_class_t *type, H5O_shared_t sh_mesg; int ret_value = FAIL; - FUNC_ENTER_NOINIT(H5O_append_real); + FUNC_ENTER_NOAPI_NOINIT(H5O_append_real); /* check args */ assert(f); @@ -2035,7 +2035,7 @@ H5O_new_mesg(H5F_t *f, H5O_t *oh, unsigned *flags, const H5O_class_t *orig_type, size_t size; /* Size of space allocated for object header */ unsigned ret_value=UFAIL; /* Return value */ - FUNC_ENTER_NOINIT(H5O_new_mesg); + FUNC_ENTER_NOAPI_NOINIT(H5O_new_mesg); /* check args */ assert(f); @@ -2109,7 +2109,7 @@ H5O_write_mesg(H5O_t *oh, unsigned idx, const H5O_class_t *type, H5O_mesg_t *idx_msg; /* Pointer to message to modify */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_write_mesg); + FUNC_ENTER_NOAPI_NOINIT(H5O_write_mesg); /* check args */ assert(oh); @@ -2162,7 +2162,7 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force) size_t size; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_touch_oh); + FUNC_ENTER_NOAPI_NOINIT(H5O_touch_oh); assert(oh); @@ -2444,7 +2444,7 @@ H5O_remove_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, hid_t d unsigned u; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_remove_real); + FUNC_ENTER_NOAPI_NOINIT(H5O_remove_real); /* check args */ assert(ent); @@ -2540,7 +2540,7 @@ H5O_alloc_extend_chunk(H5O_t *oh, unsigned chunkno, size_t size) uint8_t *old_addr; unsigned ret_value; - FUNC_ENTER_NOINIT(H5O_alloc_extend_chunk); + FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_extend_chunk); /* check args */ assert(oh); @@ -2675,7 +2675,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size) unsigned u; unsigned ret_value; /*return value */ - FUNC_ENTER_NOINIT(H5O_alloc_new_chunk); + FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_new_chunk); /* check args */ assert (oh); @@ -2858,7 +2858,7 @@ H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size) size_t aligned_size = H5O_ALIGN(size); unsigned ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5O_alloc); + FUNC_ENTER_NOAPI_NOINIT(H5O_alloc); /* check args */ assert (oh); @@ -2983,7 +2983,7 @@ H5O_share (H5F_t *f, hid_t dxpl_id, const H5O_class_t *type, const void *mesg, void *buf = NULL; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_share); + FUNC_ENTER_NOAPI_NOINIT(H5O_share); /* Check args */ assert (f); @@ -3169,7 +3169,7 @@ H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh) unsigned u; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_delete_oh); + FUNC_ENTER_NOAPI_NOINIT(H5O_delete_oh); /* Check args */ assert (f); @@ -3231,7 +3231,7 @@ H5O_delete_mesg(H5F_t *f, hid_t dxpl_id, H5O_mesg_t *mesg) const H5O_class_t *type; /* Type of object to free */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_delete_mesg); + FUNC_ENTER_NOAPI_NOINIT(H5O_delete_mesg); /* Check args */ assert (f); diff --git a/src/H5Odtype.c b/src/H5Odtype.c index bbba11b..88403ea 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -97,7 +97,7 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt) size_t z; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_dtype_decode_helper); + FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_decode_helper); /* check args */ assert(pp && *pp); @@ -452,7 +452,7 @@ H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt) size_t n, z, aligned; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5O_dtype_encode_helper); + FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_encode_helper); /* check args */ assert(pp && *pp); diff --git a/src/H5P.c b/src/H5P.c index 1f50d7b..c43b368 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -123,7 +123,7 @@ H5P_do_prop_cb1(H5TB_TREE *tree, H5P_genprop_t *prop, H5P_prp_cb1_t cb) H5P_genprop_t *pcopy=NULL; /* Copy of property to insert into TBBT */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5P_do_prop_cb1); + FUNC_ENTER_NOAPI_NOINIT(H5P_do_prop_cb1); /* Allocate space for a temporary copy of the property value */ if (NULL==(tmp_value=H5MM_malloc(prop->size))) @@ -211,7 +211,7 @@ H5P_init_interface(void) H5P_genclass_t *pclass; /* Pointer to property list class to create */ herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5P_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5P_init_interface); /* Make certain IDs are initialized */ if (ret_value < 0) @@ -314,7 +314,7 @@ H5P_term_interface(void) int nclass=0; int n=0; - FUNC_ENTER_NOINIT(H5P_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_term_interface); if (interface_initialize_g) { /* Destroy HDF5 library property classes & lists */ @@ -395,7 +395,7 @@ H5P_copy_pclass(H5P_genclass_t *pclass) H5P_genprop_t *pcopy; /* Copy of property to insert into class */ H5P_genclass_t *ret_value=NULL; /* return value */ - FUNC_ENTER_NOINIT(H5P_copy_pclass); + FUNC_ENTER_NOAPI_NOINIT(H5P_copy_pclass); assert(pclass); @@ -733,7 +733,7 @@ H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type) H5P_genprop_t *prop=NULL; /* Pointer to new property copied */ H5P_genprop_t *ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5P_dup_prop); + FUNC_ENTER_NOAPI_NOINIT(H5P_dup_prop); assert(oprop); assert(type!=H5P_PROP_WITHIN_UNKNOWN); @@ -845,7 +845,7 @@ H5P_create_prop(const char *name, size_t size, H5P_prop_within_t type, H5P_genprop_t *prop=NULL; /* Pointer to new property copied */ H5P_genprop_t *ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5P_create_prop); + FUNC_ENTER_NOAPI_NOINIT(H5P_create_prop); assert(name); assert((size>0 && value!=NULL) || (size==0)); @@ -959,7 +959,7 @@ H5P_find_prop_plist(H5P_genplist_t *plist, const char *name) H5TB_NODE *prop_node; /* TBBT node holding property */ H5P_genprop_t *ret_value; /* Property pointer return value */ - FUNC_ENTER_NOINIT(H5P_find_prop_plist); + FUNC_ENTER_NOAPI_NOINIT(H5P_find_prop_plist); assert(plist); assert(name); @@ -1022,7 +1022,7 @@ H5P_find_prop_pclass(H5P_genclass_t *pclass, const char *name) H5TB_NODE *prop_node; /* TBBT node holding property */ H5P_genprop_t *ret_value; /* Property pointer return value */ - FUNC_ENTER_NOINIT(H5P_find_prop_pclass); + FUNC_ENTER_NOAPI_NOINIT(H5P_find_prop_pclass); assert(pclass); assert(name); @@ -1060,7 +1060,7 @@ done: static herr_t H5P_free_prop(H5P_genprop_t *prop) { - FUNC_ENTER_NOINIT(H5P_free_prop); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_prop); assert(prop); @@ -1102,7 +1102,7 @@ H5P_free_prop_void(void *_prop) { H5P_genprop_t *prop=(H5P_genprop_t *)_prop; - FUNC_ENTER_NOINIT(H5P_free_prop_void); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_prop_void); assert(prop); @@ -1138,7 +1138,7 @@ H5P_free_all_prop(H5TB_TREE *tree,unsigned make_cb) H5TB_NODE *curr_node, *next_node; /* Current & next nodes in TBBT */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5P_free_all_prop); + FUNC_ENTER_NOAPI_NOINIT(H5P_free_all_prop); assert(tree); @@ -1193,7 +1193,7 @@ done: herr_t H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod) { - FUNC_ENTER_NOINIT(H5P_access_class); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_access_class); assert(pclass); assert(mod>H5P_MOD_ERR && modH5R_BADTYPE || ref_typesplitchar) @@ -412,7 +412,7 @@ H5ST_findfirst_internal(H5ST_ptr_t p) { H5ST_ptr_t ret_value=NULL; /* Return value */ - FUNC_ENTER_NOINIT(H5ST_findfirst_internal); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_findfirst_internal); while(p) { /* Find least node in current tree */ @@ -491,7 +491,7 @@ H5ST_getnext(H5ST_ptr_t p) { H5ST_ptr_t ret_value=NULL; /* Return value */ - FUNC_ENTER_NOINIT(H5ST_getnext); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_getnext); /* If the node to continue from has higher-valued nodes attached */ if(p->hikid) { @@ -593,7 +593,7 @@ H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p) H5ST_ptr_t q, /* Temporary pointer to TST node */ newp; /* Pointer to node which will replace deleted node in tree */ - FUNC_ENTER_NOINIT(H5ST_delete_internal); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_delete_internal); /* Find node to replace one being deleted */ if(p->lokid) { @@ -743,7 +743,7 @@ done: herr_t H5ST_dump_internal(H5ST_ptr_t p) { - FUNC_ENTER_NOINIT(H5ST_dump_internal); + FUNC_ENTER_NOAPI_NOINIT(H5ST_dump_internal); if (p) { printf("p=%p\n",p); diff --git a/src/H5Sall.c b/src/H5Sall.c index 01e0077..4dfcc70 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -110,7 +110,7 @@ H5S_all_iter_coords (const H5S_sel_iter_t *iter, hssize_t *coords) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_all_iter_coords); + FUNC_ENTER_NOAPI_NOINIT(H5S_all_iter_coords); /* Check args */ assert (iter); @@ -145,7 +145,7 @@ H5S_all_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end) { unsigned u; /* Local index variable */ - FUNC_ENTER_NOINIT(H5S_all_iter_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_block); /* Check args */ assert (iter); @@ -182,7 +182,7 @@ H5S_all_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end) static hsize_t H5S_all_iter_nelmts (const H5S_sel_iter_t *iter) { - FUNC_ENTER_NOINIT(H5S_all_iter_nelmts); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_nelmts); /* Check args */ assert (iter); @@ -211,7 +211,7 @@ H5S_all_iter_nelmts (const H5S_sel_iter_t *iter) static htri_t H5S_all_iter_has_next_block (const H5S_sel_iter_t UNUSED *iter) { - FUNC_ENTER_NOINIT(H5S_all_iter_has_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_has_next_block); /* Check args */ assert (iter); @@ -241,7 +241,7 @@ H5S_all_iter_has_next_block (const H5S_sel_iter_t UNUSED *iter) static herr_t H5S_all_iter_next(H5S_sel_iter_t *iter, size_t nelem) { - FUNC_ENTER_NOINIT(H5S_all_iter_next); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_next); /* Check args */ assert (iter); @@ -274,7 +274,7 @@ H5S_all_iter_next(H5S_sel_iter_t *iter, size_t nelem) static herr_t H5S_all_iter_next_block(H5S_sel_iter_t UNUSED *iter) { - FUNC_ENTER_NOINIT(H5S_all_iter_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_next_block); /* Check args */ assert (iter); @@ -303,7 +303,7 @@ H5S_all_iter_next_block(H5S_sel_iter_t UNUSED *iter) static herr_t H5S_all_iter_release (H5S_sel_iter_t UNUSED * iter) { - FUNC_ENTER_NOINIT(H5S_all_iter_release); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_release); /* Check args */ assert (iter); diff --git a/src/H5Shyper.c b/src/H5Shyper.c index d8c1500..0cc6aab 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -81,7 +81,7 @@ H5S_hyper_print_spans_helper(struct H5S_hyper_span_t *span,unsigned depth) { struct H5S_hyper_span_t *tmp_span; - FUNC_ENTER_NOINIT(H5S_hyper_print_spans_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_print_spans_helper); tmp_span=span; while(tmp_span) { @@ -99,7 +99,7 @@ H5S_hyper_print_spans_helper(struct H5S_hyper_span_t *span,unsigned depth) static herr_t H5S_hyper_print_spans(const struct H5S_hyper_span_info_t *span_lst) { - FUNC_ENTER_NOINIT(H5S_hyper_print_spans); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_print_spans); if(span_lst!=NULL) { HDfprintf(stderr,"%s: spans=%p, count=%u, scratch=%p, head=%p\n",FUNC,span_lst,span_lst->count,span_lst->scratch,span_lst->head); @@ -353,7 +353,7 @@ done: static herr_t H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hssize_t *coords) { - FUNC_ENTER_NOINIT(H5S_hyper_iter_coords); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_coords); /* Check args */ assert (iter); @@ -410,7 +410,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end { unsigned u; /* Local index variable */ - FUNC_ENTER_NOINIT(H5S_hyper_iter_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_block); /* Check args */ assert (iter); @@ -459,7 +459,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end static hsize_t H5S_hyper_iter_nelmts (const H5S_sel_iter_t *iter) { - FUNC_ENTER_NOINIT(H5S_hyper_iter_nelmts); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_nelmts); /* Check args */ assert (iter); @@ -491,7 +491,7 @@ H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *iter) unsigned u; /* Local index variable */ herr_t ret_value=FALSE; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_iter_has_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_has_next_block); /* Check args */ assert (iter); @@ -550,7 +550,7 @@ H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem) int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ unsigned i; /* Counters */ - FUNC_ENTER_NOINIT(H5S_hyper_iter_next); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_next); /* Check for the special case of just one H5Sselect_hyperslab call made */ /* (i.e. a regular hyperslab selection */ @@ -765,7 +765,7 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter) int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ unsigned u; /* Counters */ - FUNC_ENTER_NOINIT(H5S_hyper_iter_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_next_block); /* Check for the special case of just one H5Sselect_hyperslab call made */ /* (i.e. a regular hyperslab selection */ @@ -947,7 +947,7 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter) static herr_t H5S_hyper_iter_release (H5S_sel_iter_t *iter) { - FUNC_ENTER_NOINIT(H5S_hyper_iter_release); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_release); /* Check args */ assert (iter); @@ -1043,7 +1043,7 @@ H5S_hyper_new_span (hssize_t low, hssize_t high, H5S_hyper_span_info_t *down, H5 { H5S_hyper_span_t *ret_value; - FUNC_ENTER_NOINIT(H5S_hyper_new_span); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_new_span); /* Allocate a new span node */ if((ret_value = H5FL_MALLOC(H5S_hyper_span_t))==NULL) @@ -1091,7 +1091,7 @@ H5S_hyper_span_precompute_helper (H5S_hyper_span_info_t *spans, size_t elmt_size H5S_hyper_span_t *span; /* Hyperslab span */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_span_precompute_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_precompute_helper); assert(spans); @@ -1149,7 +1149,7 @@ H5S_hyper_span_precompute (H5S_hyper_span_info_t *spans, size_t elmt_size) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_span_precompute); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_precompute); assert(spans); @@ -1189,7 +1189,7 @@ H5S_hyper_span_scratch (H5S_hyper_span_info_t *spans, void *scr_value) H5S_hyper_span_t *span; /* Hyperslab span */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_span_scratch); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_scratch); assert(spans); @@ -1243,7 +1243,7 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans) H5S_hyper_span_info_t *new_down; /* New down span tree */ H5S_hyper_span_info_t *ret_value; - FUNC_ENTER_NOINIT(H5S_hyper_copy_span_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_copy_span_helper); assert(spans); @@ -1329,7 +1329,7 @@ H5S_hyper_copy_span (H5S_hyper_span_info_t *spans) { H5S_hyper_span_info_t *ret_value; - FUNC_ENTER_NOINIT(H5S_hyper_copy_span); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_copy_span); assert(spans); @@ -1372,7 +1372,7 @@ H5S_hyper_cmp_spans (H5S_hyper_span_info_t *span_info1, H5S_hyper_span_info_t *s htri_t nest=FAIL; htri_t ret_value=FAIL; - FUNC_ENTER_NOINIT(H5S_hyper_cmp_spans); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_cmp_spans); /* Check for redundant comparison */ if(span_info1==span_info2) @@ -1476,7 +1476,7 @@ H5S_hyper_free_span_info (H5S_hyper_span_info_t *span_info) H5S_hyper_span_t *span, *next_span; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_free_span_info); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_free_span_info); assert(span_info); @@ -1528,7 +1528,7 @@ H5S_hyper_free_span (H5S_hyper_span_t *span) { herr_t ret_value=SUCCEED; - FUNC_ENTER_NOINIT(H5S_hyper_free_span); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_free_span); assert(span); @@ -1651,7 +1651,7 @@ H5S_hyper_is_valid_helper (const H5S_hyper_span_info_t *spans, const hssize_t *o htri_t tmp; /* temporary return value */ htri_t ret_value=TRUE; /* return value */ - FUNC_ENTER_NOINIT(H5S_hyper_is_valid_helper); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_is_valid_helper); assert(spans); assert(offset); @@ -1778,7 +1778,7 @@ H5S_hyper_span_nblocks (H5S_hyper_span_info_t *spans) H5S_hyper_span_t *span; /* Hyperslab span */ hssize_t ret_value; - FUNC_ENTER_NOINIT(H5S_hyper_span_nblocks); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_span_nblocks); /* Count the number of elements in the span tree */ if(spans==NULL) @@ -1826,7 +1826,7 @@ H5S_get_select_hyper_nblocks(H5S_t *space) hssize_t ret_value; /* return value */ unsigned u; /* Counter */ - FUNC_ENTER_NOINIT(H5S_get_select_hyper_nblocks); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_hyper_nblocks); assert(space); @@ -1965,7 +1965,7 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hssize_t *start, hsize_t u; /* Index variable */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER_NOINIT(H5S_hyper_serialize_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_serialize_helper); /* Sanity checks */ assert(spans); @@ -2423,7 +2423,7 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hsize_t startblock, hsize_t numbloc int done; /* Whether we are done with the iteration */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_get_select_hyper_blocklist); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_hyper_blocklist); assert(space); assert(buf); @@ -2611,7 +2611,7 @@ H5S_hyper_bounds_helper (const H5S_hyper_span_info_t *spans, const hssize_t *off H5S_hyper_span_t *curr; /* Hyperslab information nodes */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_bounds_helper); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_bounds_helper); assert(spans); assert(offset); @@ -3094,7 +3094,7 @@ done: static herr_t H5S_hyper_recover_span (unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hyper_span_t *next_span) { - FUNC_ENTER_NOINIT(H5S_hyper_recover_span); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_recover_span); assert(recover); assert(curr_span); @@ -3137,7 +3137,7 @@ H5S_hyper_coord_to_span(unsigned rank, hssize_t *coords) H5S_hyper_span_info_t *down=NULL; /* Pointer to new span tree for next level down */ H5S_hyper_span_t *ret_value=NULL; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_coord_to_span); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_coord_to_span); assert(rank>0); assert(coords); @@ -3206,7 +3206,7 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran H5S_hyper_span_t *new_span; /* New span created for element */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_add_span_element_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_add_span_element_helper); assert(span_tree); assert(rank>0); @@ -3400,7 +3400,7 @@ H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hssize_t *coords) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_add_span_element); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_add_span_element); assert(space); assert(rank>0); @@ -3486,7 +3486,7 @@ H5S_hyper_reset_scratch(H5S_t *space) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_reset_scratch); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_reset_scratch); assert(space); @@ -3526,7 +3526,7 @@ H5S_hyper_convert(H5S_t *space) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_convert); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_convert); assert(space); @@ -3595,7 +3595,7 @@ H5S_hyper_intersect_helper (H5S_hyper_span_info_t *spans1, H5S_hyper_span_info_t htri_t status; /* Status from recursive call */ htri_t ret_value=FALSE; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_intersect_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect_helper); /* Sanity check */ assert((spans1 && spans2) || (spans1==NULL && spans2==NULL)); @@ -3662,7 +3662,7 @@ H5S_hyper_intersect (H5S_t *space1, H5S_t *space2) { htri_t ret_value=FAIL; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_intersect); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect); /* Sanity check */ assert(space1); @@ -3710,7 +3710,7 @@ H5S_hyper_adjust_helper (H5S_hyper_span_info_t *spans, const hssize_t *offset) H5S_hyper_span_t *span; /* Pointer to current span in span tree */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_adjust_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_adjust_helper); /* Sanity check */ assert(spans); @@ -3772,7 +3772,7 @@ H5S_hyper_adjust(H5S_t *space, const hssize_t *offset) unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_adjust); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_adjust); assert(space); assert(offset); @@ -3825,7 +3825,7 @@ H5S_hyper_move_helper (H5S_hyper_span_info_t *spans, const hssize_t *offset) H5S_hyper_span_t *span; /* Pointer to current span in span tree */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_move_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_move_helper); /* Sanity check */ assert(spans); @@ -3887,7 +3887,7 @@ H5S_hyper_move(H5S_t *space, const hssize_t *offset) unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_move); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_move); assert(space); assert(offset); @@ -3943,7 +3943,7 @@ H5S_hyper_append_span (H5S_hyper_span_t **prev_span, H5S_hyper_span_info_t ** sp H5S_hyper_span_t *new_span; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_append_span); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_append_span); assert(prev_span); assert(span_tree); @@ -4061,7 +4061,7 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s unsigned recover_a, recover_b; /* Flags to indicate when to recover temporary spans */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_clip_spans); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_clip_spans); /* Check args */ assert (a_spans); @@ -4551,7 +4551,7 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf unsigned recover_a, recover_b; /* Flags to indicate when to recover temporary spans */ H5S_hyper_span_info_t *ret_value; - FUNC_ENTER_NOINIT(H5S_hyper_merge_spans_helper); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_merge_spans_helper); /* Make certain both 'a' & 'b' spans have down span trees or neither does */ assert((a_spans!=NULL && b_spans!=NULL) || (a_spans==NULL && b_spans==NULL)); @@ -4854,7 +4854,7 @@ done: static herr_t H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans) { - FUNC_ENTER_NOINIT(H5S_hyper_merge_spans); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_merge_spans); /* Check args */ assert (space); @@ -4907,7 +4907,7 @@ H5S_hyper_spans_nelem (H5S_hyper_span_info_t *spans) H5S_hyper_span_t *span; /* Hyperslab span */ hssize_t ret_value; - FUNC_ENTER_NOINIT(H5S_hyper_spans_nelem); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_spans_nelem); /* Count the number of elements in the span tree */ if(spans==NULL) @@ -4969,7 +4969,7 @@ H5S_hyper_make_spans (unsigned rank, const hssize_t *start, const hsize_t *strid unsigned u; /* Counters */ H5S_hyper_span_info_t *ret_value; - FUNC_ENTER_NOINIT(H5S_hyper_make_spans); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_make_spans); /* Check args */ assert (rank>0); @@ -5071,7 +5071,7 @@ H5S_hyper_can_rebuild (const H5S_t *space) H5S_hyper_span_t *span; /* Current hyperslab span */ htri_t ret_value=TRUE; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_can_rebuild); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_can_rebuild); /* Check args */ assert (space); @@ -5124,7 +5124,7 @@ H5S_hyper_rebuild (H5S_t *space) unsigned curr_dim; /* Current dimension being worked on */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_hyper_rebuild); + FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_rebuild); /* Check args */ assert (space); @@ -5209,7 +5209,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op, htri_t status; /* Status from internal calls */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_generate_hyperslab); + FUNC_ENTER_NOAPI_NOINIT(H5S_generate_hyperslab); /* Check args */ assert(space); @@ -5763,7 +5763,7 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper htri_t status; /* Status from internal calls */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_operate_hyperslab); + FUNC_ENTER_NOAPI_NOINIT(H5S_operate_hyperslab); /* Check args */ assert(result); @@ -5977,7 +5977,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op, unsigned u; /* Counters */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_generate_hyperslab); + FUNC_ENTER_NOAPI_NOINIT(H5S_generate_hyperslab); /* Check args */ assert(space); @@ -6420,7 +6420,7 @@ H5S_combine_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2) H5S_t *new_space=NULL; /* New dataspace generated */ H5S_t *ret_value; /* return value */ - FUNC_ENTER_NOINIT(H5S_combine_select); + FUNC_ENTER_NOAPI_NOINIT(H5S_combine_select); /* Check args */ assert(space1); @@ -6531,7 +6531,7 @@ H5S_select_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2) H5S_hyper_span_info_t *tmp_spans=NULL; /* Temporary copy of selection */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_select_select); + FUNC_ENTER_NOAPI_NOINIT(H5S_select_select); /* Check args */ assert(space1); @@ -6666,7 +6666,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter, int curr_dim; /* Current dimension being operated on */ int i; /* Index variable */ - FUNC_ENTER_NOINIT (H5S_hyper_get_seq_list_gen); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_gen); /* Check args */ assert(space); @@ -7117,7 +7117,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space,H5S_sel_iter_t *iter, size_t duffs_index; /* Counting index for Duff's device */ #endif /* NO_DUFFS_DEVICE */ - FUNC_ENTER_NOINIT (H5S_hyper_get_seq_list_opt); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_opt); /* Check args */ assert(space); diff --git a/src/H5Smpio.c b/src/H5Smpio.c index 259c025..a027171 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -117,7 +117,7 @@ H5S_mpio_all_type( const H5S_t *space, size_t elmt_size, hsize_t total_bytes; unsigned u; - FUNC_ENTER_NOINIT(H5S_mpio_all_type); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_mpio_all_type); /* Check args */ assert (space); @@ -164,7 +164,7 @@ H5S_mpio_none_type( const H5S_t UNUSED *space, size_t UNUSED elmt_size, hsize_t *extra_offset, hbool_t *is_derived_type ) { - FUNC_ENTER_NOINIT(H5S_mpio_none_type); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_mpio_none_type); /* fill in the return values */ *new_type = MPI_BYTE; @@ -234,7 +234,7 @@ H5S_mpio_hyper_type( const H5S_t *space, size_t elmt_size, int mpi_code; /* MPI return code */ herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5S_mpio_hyper_type); + FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_hyper_type); /* Check args */ assert (space); @@ -535,7 +535,7 @@ H5S_mpio_space_type( const H5S_t *space, size_t elmt_size, { herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5S_mpio_space_type); + FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_space_type); /* Check args */ assert (space); @@ -649,7 +649,7 @@ H5S_mpio_spaces_xfer(H5F_t *f, const H5O_layout_t *layout, size_t elmt_size, int mpi_code; /* MPI return code */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5S_mpio_spaces_xfer); + FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_spaces_xfer); /* Check args */ assert (f); diff --git a/src/H5Snone.c b/src/H5Snone.c index 24dfb34..e07f5ae 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -103,7 +103,7 @@ done: static herr_t H5S_none_iter_coords (const H5S_sel_iter_t UNUSED *iter, hssize_t UNUSED *coords) { - FUNC_ENTER_NOINIT(H5S_none_iter_coords); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_coords); /* Check args */ assert (iter); @@ -131,7 +131,7 @@ H5S_none_iter_coords (const H5S_sel_iter_t UNUSED *iter, hssize_t UNUSED *coords static herr_t H5S_none_iter_block (const H5S_sel_iter_t UNUSED *iter, hssize_t UNUSED *start, hssize_t UNUSED *end) { - FUNC_ENTER_NOINIT(H5S_none_iter_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_block); /* Check args */ assert (iter); @@ -159,7 +159,7 @@ H5S_none_iter_block (const H5S_sel_iter_t UNUSED *iter, hssize_t UNUSED *start, static hsize_t H5S_none_iter_nelmts (const H5S_sel_iter_t UNUSED *iter) { - FUNC_ENTER_NOINIT(H5S_none_iter_nelmts); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_nelmts); /* Check args */ assert (iter); @@ -188,7 +188,7 @@ H5S_none_iter_nelmts (const H5S_sel_iter_t UNUSED *iter) static htri_t H5S_none_iter_has_next_block(const H5S_sel_iter_t UNUSED *iter) { - FUNC_ENTER_NOINIT(H5S_none_iter_has_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_has_next_block); /* Check args */ assert (iter); @@ -218,7 +218,7 @@ H5S_none_iter_has_next_block(const H5S_sel_iter_t UNUSED *iter) static herr_t H5S_none_iter_next(H5S_sel_iter_t UNUSED *iter, size_t UNUSED nelem) { - FUNC_ENTER_NOINIT(H5S_none_iter_next); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_next); /* Check args */ assert (iter); @@ -248,7 +248,7 @@ H5S_none_iter_next(H5S_sel_iter_t UNUSED *iter, size_t UNUSED nelem) static herr_t H5S_none_iter_next_block(H5S_sel_iter_t UNUSED *iter) { - FUNC_ENTER_NOINIT(H5S_none_iter_next); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_next); /* Check args */ assert (iter); @@ -277,7 +277,7 @@ H5S_none_iter_next_block(H5S_sel_iter_t UNUSED *iter) static herr_t H5S_none_iter_release (H5S_sel_iter_t UNUSED * iter) { - FUNC_ENTER_NOINIT(H5S_none_iter_release); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_release); /* Check args */ assert (iter); diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 2c98b96..9b469c5 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -116,7 +116,7 @@ done: static herr_t H5S_point_iter_coords (const H5S_sel_iter_t *iter, hssize_t *coords) { - FUNC_ENTER_NOINIT(H5S_point_iter_coords); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_coords); /* Check args */ assert (iter); @@ -147,7 +147,7 @@ H5S_point_iter_coords (const H5S_sel_iter_t *iter, hssize_t *coords) static herr_t H5S_point_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end) { - FUNC_ENTER_NOINIT(H5S_point_iter_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_block); /* Check args */ assert (iter); @@ -179,7 +179,7 @@ H5S_point_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end static hsize_t H5S_point_iter_nelmts (const H5S_sel_iter_t *iter) { - FUNC_ENTER_NOINIT(H5S_point_iter_nelmts); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_nelmts); /* Check args */ assert (iter); @@ -210,7 +210,7 @@ H5S_point_iter_has_next_block(const H5S_sel_iter_t *iter) { htri_t ret_value=TRUE; /* Return value */ - FUNC_ENTER_NOINIT(H5S_point_iter_has_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_has_next_block); /* Check args */ assert (iter); @@ -245,7 +245,7 @@ done: static herr_t H5S_point_iter_next(H5S_sel_iter_t *iter, size_t nelem) { - FUNC_ENTER_NOINIT(H5S_point_iter_next); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_next); /* Check args */ assert (iter); @@ -281,7 +281,7 @@ H5S_point_iter_next(H5S_sel_iter_t *iter, size_t nelem) static herr_t H5S_point_iter_next_block(H5S_sel_iter_t *iter) { - FUNC_ENTER_NOINIT(H5S_point_iter_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_next_block); /* Check args */ assert (iter); @@ -313,7 +313,7 @@ H5S_point_iter_next_block(H5S_sel_iter_t *iter) static herr_t H5S_point_iter_release (H5S_sel_iter_t UNUSED * iter) { - FUNC_ENTER_NOINIT(H5S_point_iter_release); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_release); /* Check args */ assert (iter); @@ -526,7 +526,7 @@ H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem, { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER_NOINIT(H5S_select_elements); + FUNC_ENTER_NOAPI_NOINIT(H5S_select_elements); /* Check args */ assert(space); @@ -707,7 +707,7 @@ H5S_get_select_elem_npoints(H5S_t *space) { hssize_t ret_value=FAIL; /* return value */ - FUNC_ENTER_NOINIT(H5S_get_select_elem_npoints); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_elem_npoints); assert(space); @@ -971,7 +971,7 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint H5S_pnt_node_t *node; /* Point node */ int rank; /* Dataspace rank */ - FUNC_ENTER_NOINIT(H5S_get_select_elem_pointlist); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_elem_pointlist); assert(space); assert(buf); diff --git a/src/H5Sselect.c b/src/H5Sselect.c index b451ce7..ac61f47 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -78,7 +78,7 @@ H5S_get_vector_size(hid_t dxpl_id) { ssize_t ret_value; /* return value */ - FUNC_ENTER_NOINIT(H5S_get_vector_size); + FUNC_ENTER_NOAPI_NOINIT(H5S_get_vector_size); if(dxpl_id==H5P_DATASET_XFER_DEFAULT) { ret_value=H5D_XFER_HYPER_VECTOR_SIZE_DEF; @@ -708,7 +708,7 @@ H5S_select_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *en { herr_t ret_value; /* return value */ - FUNC_ENTER_NOINIT(H5S_select_iter_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_block); /* Check args */ assert(iter); @@ -780,7 +780,7 @@ H5S_select_iter_has_next_block (const H5S_sel_iter_t *iter) { herr_t ret_value; /* return value */ - FUNC_ENTER_NOINIT(H5S_select_iter_has_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_has_next_block); /* Check args */ assert(iter); @@ -857,7 +857,7 @@ H5S_select_iter_next_block(H5S_sel_iter_t *iter) { herr_t ret_value; /* return value */ - FUNC_ENTER_NOINIT(H5S_select_iter_next_block); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_next_block); /* Check args */ assert(iter); diff --git a/src/H5T.c b/src/H5T.c index 72d800d..6ea659c 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -503,7 +503,7 @@ H5T_init_inf(void) size_t u; /* Local index value */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_init_inf); + FUNC_ENTER_NOAPI_NOINIT(H5T_init_inf); /* Get the float datatype */ if (NULL==(dst_p=H5I_object(H5T_NATIVE_FLOAT_g))) @@ -616,7 +616,7 @@ H5T_init_hw(void) #endif /* H5_HAVE_GET_FPC_CSR */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_init_hw); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_hw); #ifdef H5_HAVE_GET_FPC_CSR /* [This code is specific to SGI machines] */ @@ -686,7 +686,7 @@ H5T_init_interface(void) unsigned copied_dtype=1; /* Flag to indicate whether datatype was copied or allocated (for error cleanup) */ herr_t ret_value=SUCCEED; - FUNC_ENTER_NOINIT(H5T_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5T_init_interface); /* Initialize the atom group for the file IDs */ if (H5I_init_group(H5I_DATATYPE, H5I_DATATYPEID_HASHSIZE, H5T_RESERVED_ATOMS, (H5I_free_t)H5T_close)<0) @@ -1135,7 +1135,7 @@ H5T_unlock_cb (void *_dt, hid_t UNUSED id, void UNUSED *key) { H5T_t *dt = (H5T_t *)_dt; - FUNC_ENTER_NOINIT(H5T_unlock_cb); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_unlock_cb); assert (dt); if (H5T_STATE_IMMUTABLE==dt->state) @@ -1171,7 +1171,7 @@ H5T_term_interface(void) int i, nprint=0, n=0; H5T_path_t *path = NULL; - FUNC_ENTER_NOINIT(H5T_term_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_term_interface); if (interface_initialize_g) { /* Unregister all conversion functions */ @@ -2063,7 +2063,7 @@ H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, int i; /*counter */ herr_t ret_value=SUCCEED; /*return value */ - FUNC_ENTER_NOINIT(H5T_register); + FUNC_ENTER_NOAPI_NOINIT(H5T_register); /* Check args */ assert(src); @@ -3401,8 +3401,8 @@ done: size_t H5T_get_size(const H5T_t *dt) { - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5T_get_size); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_get_size); /* check args */ assert(dt); @@ -4071,7 +4071,7 @@ done: hbool_t H5T_path_noop(const H5T_path_t *p) { - FUNC_ENTER_NOINIT(H5T_path_noop); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_path_noop); assert(p); @@ -4096,7 +4096,7 @@ H5T_path_noop(const H5T_path_t *p) H5T_bkg_t H5T_path_bkg(const H5T_path_t *p) { - FUNC_ENTER_NOINIT(H5T_path_bkg); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_path_bkg); assert(p); @@ -4409,7 +4409,7 @@ H5T_print_stats(H5T_path_t UNUSED * path, int UNUSED * nprint/*in,out*/) char bandwidth[32]; #endif - FUNC_ENTER_NOINIT(H5T_print_stats); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_print_stats); #ifdef H5T_DEBUG if (H5DEBUG(T) && path->stats.ncalls>0) { diff --git a/src/H5TB.c b/src/H5TB.c index be5952f..5055a15 100644 --- a/src/H5TB.c +++ b/src/H5TB.c @@ -130,7 +130,7 @@ static int interface_initialize_g = 0; static int H5TB_strcmp(const void *k1, const void *k2, int UNUSED cmparg) { - FUNC_ENTER_NOINIT(H5TB_strcmp); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_strcmp); assert(k1); assert(k2); @@ -156,7 +156,7 @@ H5TB_strcmp(const void *k1, const void *k2, int UNUSED cmparg) static int H5TB_addr_cmp(const void *k1, const void *k2, int UNUSED cmparg) { - FUNC_ENTER_NOINIT(H5TB_addr_cmp); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_addr_cmp); assert(k1); assert(k2); @@ -182,7 +182,7 @@ H5TB_addr_cmp(const void *k1, const void *k2, int UNUSED cmparg) static int H5TB_int_cmp(const void *k1, const void *k2, int UNUSED cmparg) { - FUNC_ENTER_NOINIT(H5TB_int_cmp); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_int_cmp); assert(k1); assert(k2); @@ -208,7 +208,7 @@ H5TB_int_cmp(const void *k1, const void *k2, int UNUSED cmparg) static int H5TB_hsize_cmp(const void *k1, const void *k2, int UNUSED cmparg) { - FUNC_ENTER_NOINIT(H5TB_hsize_cmp); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_hsize_cmp); assert(k1); assert(k2); @@ -1287,7 +1287,7 @@ H5TB_printNode(H5TB_NODE * node, void(*key_dump)(void *,void *)) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5TB_printNode); + FUNC_ENTER_NOAPI_NOINIT(H5TB_printNode); if (node == NULL) { printf("ERROR: null node pointer\n"); @@ -1331,7 +1331,7 @@ H5TB_dumpNode(H5TB_NODE *node, void (*key_dump)(void *,void *), { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5TB_dumpNode); + FUNC_ENTER_NOAPI_NOINIT(H5TB_dumpNode); if (node == NULL) HGOTO_DONE(FAIL); @@ -1390,7 +1390,7 @@ done: static H5TB_NODE * H5TB_end(H5TB_NODE * root, int side) { - FUNC_ENTER_NOINIT(H5TB_end); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_end); assert(root); assert(side==LEFT || side==RIGHT); @@ -1407,7 +1407,7 @@ H5TB_nbr(H5TB_NODE * ptr, int side) { H5TB_NODE *ret_value; /* Return value */ - FUNC_ENTER_NOINIT(H5TB_nbr); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_nbr); if (!HasChild(ptr, side)) HGOTO_DONE (ptr->link[side]); @@ -1436,7 +1436,7 @@ H5TB_ffind(H5TB_NODE * root, const void * key, unsigned fast_compare, H5TB_NODE int cmp = 1; H5TB_NODE *ret_value = NULL; - FUNC_ENTER_NOINIT(H5TB_ffind); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_ffind); switch(fast_compare) { case H5TB_FAST_HADDR_COMPARE: @@ -1544,7 +1544,7 @@ H5TB_swapkid(H5TB_NODE ** root, H5TB_NODE * ptr, int side) H5TB_leaf plcnt, prcnt, /* current values of the ptr's and kid's leaf count */ klcnt, krcnt; - FUNC_ENTER_NOINIT(H5TB_swapkid); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_swapkid); deep[2] = (deep[1] = 0) + Delta(kid, side); deep[0] = Max(0, deep[2]) + 1 - Delta(ptr, side); @@ -1646,7 +1646,7 @@ H5TB_balance(H5TB_NODE ** root, H5TB_NODE * ptr, int side, int added) int odelta; int obal; - FUNC_ENTER_NOINIT(H5TB_balance); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_balance); while (NULL != ptr) { odelta = Delta(ptr, side); /* delta before the node was added */ diff --git a/src/H5Tarray.c b/src/H5Tarray.c index 2abafa6..29c3faa 100644 --- a/src/H5Tarray.c +++ b/src/H5Tarray.c @@ -54,7 +54,7 @@ DESCRIPTION static herr_t H5T_init_array_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_array_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_array_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_array_interface() */ diff --git a/src/H5Tbit.c b/src/H5Tbit.c index f2ad5f1..f6e36c7 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -336,8 +336,8 @@ H5T_bit_find (uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction, size_t iu; ssize_t ret_value=(-1); /* Return value */ - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5T_bit_find); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_bit_find); /* Some functions call this with value=TRUE */ assert (TRUE==1); @@ -438,8 +438,8 @@ H5T_bit_inc(uint8_t *buf, size_t start, size_t size) unsigned carry = 1; unsigned acc, mask; - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5T_bit_find); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_bit_find); assert(buf); start %= 8; diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index fb250e8..f43d8d8 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -54,7 +54,7 @@ DESCRIPTION static herr_t H5T_init_commit_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_commit_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_commit_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_commit_interface() */ @@ -123,7 +123,7 @@ H5T_commit (H5G_entry_t *loc, const char *name, H5T_t *type, hid_t dxpl_id) H5F_t *file = NULL; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_commit); + FUNC_ENTER_NOAPI_NOINIT(H5T_commit); assert (loc); assert (name && *name); @@ -228,7 +228,7 @@ htri_t H5T_committed(H5T_t *type) { /* Use no-init for efficiency */ - FUNC_ENTER_NOINIT(H5T_committed); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_committed); assert (type); diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c index a1c93a1..dcedcc9 100644 --- a/src/H5Tcompound.c +++ b/src/H5Tcompound.c @@ -58,7 +58,7 @@ DESCRIPTION static herr_t H5T_init_compound_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_compound_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_compound_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_compound_interface() */ @@ -500,7 +500,7 @@ H5T_pack(H5T_t *dt) size_t offset; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_pack); + FUNC_ENTER_NOAPI_NOINIT(H5T_pack); assert(dt); diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 524e8ec..5a91ed2 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -1308,7 +1308,7 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id) hid_t tid; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_conv_struct_init); + FUNC_ENTER_NOAPI_NOINIT(H5T_conv_struct_init); if (!priv) { /* @@ -1910,7 +1910,7 @@ H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata) int i, j; /*counters */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_conv_enum_init); + FUNC_ENTER_NOAPI_NOINIT(H5T_conv_enum_init); cdata->need_bkg = H5T_BKG_NO; if (NULL==(priv=cdata->priv=H5MM_calloc(sizeof(*priv)))) diff --git a/src/H5Tcset.c b/src/H5Tcset.c index 6814b9b..32f5fa9 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -48,7 +48,7 @@ DESCRIPTION static herr_t H5T_init_cset_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_cset_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_cset_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_cset_interface() */ diff --git a/src/H5Tenum.c b/src/H5Tenum.c index 95c514f..fa8cf4f 100644 --- a/src/H5Tenum.c +++ b/src/H5Tenum.c @@ -59,7 +59,7 @@ DESCRIPTION static herr_t H5T_init_enum_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_enum_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_enum_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_enum_interface() */ diff --git a/src/H5Tfields.c b/src/H5Tfields.c index b14a53d..0df9647 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -49,7 +49,7 @@ DESCRIPTION static herr_t H5T_init_fields_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_fields_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_fields_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_fields_interface() */ diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c index 71c0321..03f20d6 100644 --- a/src/H5Tfixed.c +++ b/src/H5Tfixed.c @@ -48,7 +48,7 @@ DESCRIPTION static herr_t H5T_init_fixed_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_fixed_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_fixed_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_fixed_interface() */ diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c index ae520f7..e1f9456 100644 --- a/src/H5Tfloat.c +++ b/src/H5Tfloat.c @@ -48,7 +48,7 @@ DESCRIPTION static herr_t H5T_init_float_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_float_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_float_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_float_interface() */ diff --git a/src/H5Tnative.c b/src/H5Tnative.c index f672bc3..957a7a1 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -62,7 +62,7 @@ DESCRIPTION static herr_t H5T_init_native_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_native_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_native_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_native_interface() */ diff --git a/src/H5Toffset.c b/src/H5Toffset.c index bd54e5c..8ab9ac6 100644 --- a/src/H5Toffset.c +++ b/src/H5Toffset.c @@ -51,7 +51,7 @@ DESCRIPTION static herr_t H5T_init_offset_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_offset_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_offset_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_offset_interface() */ diff --git a/src/H5Topaque.c b/src/H5Topaque.c index 2697178..a7bacfd 100644 --- a/src/H5Topaque.c +++ b/src/H5Topaque.c @@ -49,7 +49,7 @@ DESCRIPTION static herr_t H5T_init_opaque_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_opaque_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_opaque_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_opaque_interface() */ diff --git a/src/H5Torder.c b/src/H5Torder.c index 214466c..0b6146b 100644 --- a/src/H5Torder.c +++ b/src/H5Torder.c @@ -48,7 +48,7 @@ DESCRIPTION static herr_t H5T_init_order_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_order_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_order_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_order_interface() */ diff --git a/src/H5Tpad.c b/src/H5Tpad.c index 532a920..22cec83 100644 --- a/src/H5Tpad.c +++ b/src/H5Tpad.c @@ -48,7 +48,7 @@ DESCRIPTION static herr_t H5T_init_pad_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_pad_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_pad_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_pad_interface() */ diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c index 941062d..7de9442 100644 --- a/src/H5Tprecis.c +++ b/src/H5Tprecis.c @@ -51,7 +51,7 @@ DESCRIPTION static herr_t H5T_init_precis_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_precis_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_precis_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_precis_interface() */ diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c index c9e23f4..10a3e15 100644 --- a/src/H5Tstrpad.c +++ b/src/H5Tstrpad.c @@ -48,7 +48,7 @@ DESCRIPTION static herr_t H5T_init_strpad_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_strpad_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_strpad_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_strpad_interface() */ diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index f6e1086..2027257 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -74,7 +74,7 @@ DESCRIPTION static herr_t H5T_init_vlen_interface(void) { - FUNC_ENTER_NOINIT(H5T_init_vlen_interface); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_vlen_interface); FUNC_LEAVE_NOAPI(H5T_init()); } /* H5T_init_vlen_interface() */ @@ -147,7 +147,7 @@ H5T_vlen_create(H5T_t *base) H5T_t *dt = NULL; /*new VL data type */ H5T_t *ret_value; /*return value */ - FUNC_ENTER_NOINIT(H5T_vlen_create); + FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_create); /* Check args */ assert(base); @@ -203,7 +203,7 @@ H5T_vlen_set_loc(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc) { htri_t ret_value = 0; /* Indicate that success, but no location change */ - FUNC_ENTER_NOINIT(H5T_vlen_set_loc); + FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_set_loc); /* check parameters */ assert(dt); @@ -303,7 +303,7 @@ H5T_vlen_seq_mem_getlen(void *_vl) { hvl_t *vl=(hvl_t *)_vl; /* Pointer to the user's hvl_t information */ - FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_getlen) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_getlen) /* check parameters */ assert(vl); @@ -331,7 +331,7 @@ H5T_vlen_seq_mem_isnull(H5F_t UNUSED *f, void *_vl) { hvl_t *vl=(hvl_t *)_vl; /* Pointer to the user's hvl_t information */ - FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_isnull) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_isnull) /* check parameters */ assert(vl); @@ -359,7 +359,7 @@ H5T_vlen_seq_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void *bu { hvl_t *vl=(hvl_t *)_vl; /* Pointer to the user's hvl_t information */ - FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_read) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_read) /* check parameters */ assert(vl && vl->p); @@ -395,7 +395,7 @@ H5T_vlen_seq_mem_write(H5F_t UNUSED *f, hid_t dxpl_id, void *_vl, void *buf, voi H5P_genplist_t *plist; /* Property list */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_write) + FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_seq_mem_write) /* check parameters */ assert(_vl); @@ -461,7 +461,7 @@ H5T_vlen_seq_mem_setnull(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void { hvl_t vl; /* Temporary hvl_t to use during operation */ - FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_setnull) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_setnull) /* check parameters */ assert(_vl); @@ -496,7 +496,7 @@ H5T_vlen_str_mem_getlen(void *_vl) { char *s=*(char **)_vl; /* Pointer to the user's string information */ - FUNC_ENTER_NOINIT(H5T_vlen_str_mem_getlen) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_getlen) /* check parameters */ assert(s); @@ -524,7 +524,7 @@ H5T_vlen_str_mem_isnull(H5F_t UNUSED *f, void *_vl) { char *s=*(char **)_vl; /* Pointer to the user's string information */ - FUNC_ENTER_NOINIT(H5T_vlen_str_mem_isnull) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_isnull) FUNC_LEAVE_NOAPI(s==NULL ? TRUE : FALSE); } /* end H5T_vlen_str_mem_isnull() */ @@ -549,7 +549,7 @@ H5T_vlen_str_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void *bu { char *s=*(char **)_vl; /* Pointer to the user's hvl_t information */ - FUNC_ENTER_NOINIT(H5T_vlen_str_mem_read) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_read) /* check parameters */ assert(s); @@ -586,7 +586,7 @@ H5T_vlen_str_mem_write(H5F_t UNUSED *f, hid_t dxpl_id, void *_vl, void *buf, voi H5P_genplist_t *plist; /* Property list */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_vlen_str_mem_write) + FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_str_mem_write) /* check parameters */ assert(buf); @@ -642,7 +642,7 @@ H5T_vlen_str_mem_setnull(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void { char *t=NULL; /* Pointer to temporary buffer allocated */ - FUNC_ENTER_NOINIT(H5T_vlen_str_mem_write) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_write) /* Set pointer in user's buffer with memcpy, to avoid alignment issues */ HDmemcpy(_vl,&t,sizeof(char *)); @@ -671,7 +671,7 @@ H5T_vlen_disk_getlen(void *_vl) uint8_t *vl=(uint8_t *)_vl; /* Pointer to the disk VL information */ hssize_t seq_len; /* Sequence length */ - FUNC_ENTER_NOINIT(H5T_vlen_disk_getlen) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_disk_getlen) /* check parameters */ assert(vl); @@ -702,7 +702,7 @@ H5T_vlen_disk_isnull(H5F_t *f, void *_vl) uint8_t *vl=(uint8_t *)_vl; /* Pointer to the disk VL information */ haddr_t addr; /* Sequence's heap address */ - FUNC_ENTER_NOINIT(H5T_vlen_disk_isnull) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_disk_isnull) /* check parameters */ assert(vl); @@ -739,7 +739,7 @@ H5T_vlen_disk_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *buf, size_t UNUSED uint32_t seq_len; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_vlen_disk_read) + FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_read) /* check parameters */ assert(vl); @@ -792,7 +792,7 @@ H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, void *_vl, void *buf, void *_bg, hs size_t len; /* Size of new sequence on disk (in bytes) */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_vlen_disk_write) + FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_write) /* check parameters */ assert(vl); @@ -861,7 +861,7 @@ H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg) H5HG_t hobjid; /* New VL sequence's heap ID */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5T_vlen_disk_setnull) + FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_setnull) /* check parameters */ assert(f); @@ -931,7 +931,7 @@ H5T_vlen_reclaim_recurse(void *elem, H5T_t *dt, H5MM_free_t free_func, void *fre size_t j; /* local index variable */ herr_t ret_value = SUCCEED; - FUNC_ENTER_NOINIT(H5T_vlen_reclaim_recurse); + FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_reclaim_recurse); assert(elem); assert(dt); diff --git a/src/H5V.c b/src/H5V.c index 598ef93..88793e2 100644 --- a/src/H5V.c +++ b/src/H5V.c @@ -372,8 +372,8 @@ H5V_hyper_eq(int n, int i; htri_t ret_value=TRUE; /* Return value */ - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5V_hyper_eq); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_hyper_eq); if (n <= 0) HGOTO_DONE(TRUE); @@ -419,8 +419,8 @@ H5V_hyper_disjointp(unsigned n, unsigned u; htri_t ret_value=FALSE; /* Return value */ - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5V_hyper_disjointp); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_hyper_disjointp); if (!n || !size1 || !size2) HGOTO_DONE(TRUE); diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h index 3840075..07692b0 100644 --- a/src/H5Vprivate.h +++ b/src/H5Vprivate.h @@ -124,8 +124,8 @@ H5V_vector_reduce_product(unsigned n, const hsize_t *v) { hsize_t ret_value = 1; - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5V_vector_reduce_product); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_reduce_product); if (n && !v) HGOTO_DONE(0); while (n--) ret_value *= *v++; @@ -156,8 +156,8 @@ H5V_vector_zerop_u(int n, const hsize_t *v) { htri_t ret_value=TRUE; /* Return value */ - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5V_vector_zerop_u); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_zerop_u); if (!v) HGOTO_DONE(TRUE); @@ -191,8 +191,8 @@ H5V_vector_zerop_s(int n, const hssize_t *v) { htri_t ret_value=TRUE; /* Return value */ - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5V_vector_zerop_s); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_zerop_s); if (!v) HGOTO_DONE(TRUE); @@ -228,8 +228,8 @@ H5V_vector_cmp_u (int n, const hsize_t *v1, const hsize_t *v2) { int ret_value=0; /* Return value */ - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5V_vector_cmp_u); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_cmp_u); if (v1 == v2) HGOTO_DONE(0); while (n--) { @@ -268,8 +268,8 @@ H5V_vector_cmp_s (unsigned n, const hssize_t *v1, const hssize_t *v2) { int ret_value=0; /* Return value */ - /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ - FUNC_ENTER_NOINIT(H5V_vector_cmp_s); + /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_cmp_s); if (v1 == v2) HGOTO_DONE(0); while (n--) { diff --git a/src/H5Z.c b/src/H5Z.c index b5e0e52..c687da8 100644 --- a/src/H5Z.c +++ b/src/H5Z.c @@ -80,7 +80,7 @@ H5Z_init_interface (void) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5Z_init_interface); + FUNC_ENTER_NOAPI_NOINIT(H5Z_init_interface); #ifdef H5_HAVE_FILTER_DEFLATE if (H5Z_register (H5Z_DEFLATE)<0) @@ -501,7 +501,7 @@ H5Z_prelude_callback(hid_t dcpl_id, hid_t type_id, H5Z_prelude_type_t prelude_ty { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOINIT(H5Z_prelude_callback); + FUNC_ENTER_NOAPI_NOINIT(H5Z_prelude_callback); assert (H5I_GENPROP_LST==H5I_get_type(dcpl_id)); assert (H5I_DATATYPE==H5I_get_type(type_id)); @@ -855,7 +855,7 @@ H5Z_find_idx(H5Z_filter_t id) size_t i; /* Local index variable */ int ret_value=FAIL; /* Return value */ - FUNC_ENTER_NOINIT(H5Z_find_idx); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_find_idx); for (i=0; i 1) { diff --git a/src/H5detect.c b/src/H5detect.c index 90f30ba..670aed1 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -508,7 +508,7 @@ int\n\ H5TN_term_interface(void)\n\ {\n\ interface_initialize_g = 0;\n\ - FUNC_ENTER_NOINIT(H5TN_term_interface);\n\ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TN_term_interface);\n\ \n\ FUNC_LEAVE_NOAPI(0);\n\ }\n"); diff --git a/src/H5private.h b/src/H5private.h index d187581..b074765 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1041,7 +1041,7 @@ H5_DLL double H5_trace(double *calltime, const char *func, const char *type, ... * * Quincey Koziol, 28 May 2002 * Split FUNC_ENTER macro into FUNC_ENTER_API, FUNC_ENTER_NOAPI and - * FUNC_ENTER_NOINIT. + * FUNC_ENTER_NOAPI_NOINIT. *------------------------------------------------------------------------- */ @@ -1069,28 +1069,20 @@ typedef struct H5_api_struct { /* Macro for first thread initialization */ #define H5_FIRST_THREAD_INIT \ - pthread_once(&H5TS_first_init_g, H5TS_first_thread_init) + pthread_once(&H5TS_first_init_g, H5TS_first_thread_init); /* Macros for threadsafe HDF-5 Phase I locks */ -#define H5_LOCK_API_MUTEX \ - H5TS_mutex_lock(&H5_g.init_lock) #define H5_API_LOCK \ - if (H5_IS_API(FUNC)) { H5_LOCK_API_MUTEX; } -#define H5_UNLOCK_API_MUTEX \ - H5TS_mutex_unlock(&H5_g.init_lock) + H5TS_mutex_lock(&H5_g.init_lock); #define H5_API_UNLOCK \ - if (H5_IS_API(FUNC)) { H5_UNLOCK_API_MUTEX; } + H5TS_mutex_unlock(&H5_g.init_lock); /* Macros for thread cancellation-safe mechanism */ #define H5_API_UNSET_CANCEL \ - if (H5_IS_API(FUNC)) { \ - H5TS_cancel_count_inc(); \ - } + H5TS_cancel_count_inc(); #define H5_API_SET_CANCEL \ - if (H5_IS_API(FUNC)) { \ - H5TS_cancel_count_dec(); \ - } + H5TS_cancel_count_dec(); extern H5_api_t H5_g; @@ -1100,9 +1092,7 @@ extern H5_api_t H5_g; #define H5_FIRST_THREAD_INIT /* disable locks (sequential version) */ -#define H5_LOCK_API_MUTEX #define H5_API_LOCK -#define H5_UNLOCK_API_MUTEX #define H5_API_UNLOCK /* disable cancelability (sequential version) */ @@ -1123,10 +1113,10 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */ /* Include required function stack header */ #include "H5FSprivate.h" -#define H5_PUSH_FUNC H5FS_push(FUNC) +#define H5_PUSH_FUNC(func_name) H5FS_push(#func_name) #define H5_POP_FUNC H5FS_pop() #else /* H5_HAVE_FUNCSTACK */ -#define H5_PUSH_FUNC /* void */ +#define H5_PUSH_FUNC(func_name) /* void */ #define H5_POP_FUNC /* void */ #endif /* H5_HAVE_FUNCSTACK */ @@ -1134,8 +1124,7 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ #endif -#define FUNC_ENTER_COMMON(func_name,asrt) \ - CONSTR (FUNC, #func_name); \ +#define FUNC_ENTER_COMMON_NOFUNC(func_name,asrt) \ PABLO_SAVE (ID_ ## func_name) \ \ /* Check API status */ \ @@ -1144,15 +1133,24 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ /* Start tracing */ \ PABLO_TRACE_ON (PABLO_MASK, pablo_func_id) +#define FUNC_ENTER_COMMON(func_name,asrt) \ + CONSTR (FUNC, #func_name); \ + FUNC_ENTER_COMMON_NOFUNC(func_name,asrt); \ + /* Threadsafety initialization code for API routines */ #define FUNC_ENTER_API_THREADSAFE \ /* Initialize the thread-safe code */ \ - H5_FIRST_THREAD_INIT; \ + H5_FIRST_THREAD_INIT \ \ /* Grab the mutex for the library */ \ H5_API_UNSET_CANCEL \ H5_API_LOCK +/* Threadsafety termination code for API routines */ +#define FUNC_LEAVE_API_THREADSAFE \ + H5_API_UNLOCK \ + H5_API_SET_CANCEL + /* Local variables for API routines */ #define FUNC_ENTER_API_VARS(func_name) \ MPE_LOG_VARS(func_name) \ @@ -1161,7 +1159,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ /* Use this macro for all "normal" API functions */ #define FUNC_ENTER_API(func_name,err) {{ \ FUNC_ENTER_API_VARS(func_name) \ - FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \ + FUNC_ENTER_COMMON(func_name,H5_IS_API(#func_name)); \ FUNC_ENTER_API_THREADSAFE; \ FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \ /* Clear thread error stack entering public functions */ \ @@ -1174,7 +1172,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ */ #define FUNC_ENTER_API_NOCLEAR(func_name,err) {{ \ FUNC_ENTER_API_VARS(func_name) \ - FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \ + FUNC_ENTER_COMMON(func_name,H5_IS_API(#func_name)); \ FUNC_ENTER_API_THREADSAFE; \ FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \ { @@ -1183,18 +1181,19 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ * Use this macro for API functions that shouldn't perform _any_ initialization * of the library or an interface, just perform tracing, etc. Examples * are: H5close, H5check_version, H5Eget_major, H5Eget_minor. + * */ #define FUNC_ENTER_API_NOINIT(func_name) {{ \ FUNC_ENTER_API_VARS(func_name) \ - FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \ + FUNC_ENTER_COMMON(func_name,H5_IS_API(#func_name)); \ FUNC_ENTER_API_THREADSAFE; \ - H5_PUSH_FUNC; \ + H5_PUSH_FUNC(func_name); \ BEGIN_MPE_LOG(func_name); \ { /* Use this macro for all "normal" non-API functions */ #define FUNC_ENTER_NOAPI(func_name,err) { \ - FUNC_ENTER_COMMON(func_name,!H5_IS_API(FUNC)); \ + FUNC_ENTER_COMMON(func_name,!H5_IS_API(#func_name)); \ FUNC_ENTER_NOAPI_INIT(func_name,INTERFACE_INIT,err) \ { @@ -1206,9 +1205,26 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ * - functions which are called during library shutdown, since we don't * want to re-initialize the library. */ -#define FUNC_ENTER_NOINIT(func_name) { \ - FUNC_ENTER_COMMON(func_name,!H5_IS_API(FUNC)); \ - H5_PUSH_FUNC; \ +#define FUNC_ENTER_NOAPI_NOINIT(func_name) { \ + FUNC_ENTER_COMMON(func_name,!H5_IS_API(#func_name)); \ + H5_PUSH_FUNC(func_name); \ + { + +/* + * Use this macro for non-API functions which fall into these categories: + * - static functions, since they must be called from a function in the + * interface, the library and interface must already be + * initialized. + * - functions which are called during library shutdown, since we don't + * want to re-initialize the library. + * + * This macro is used for functions which fit the above categories _and_ + * also don't use the 'FUNC' variable (i.e. don't push errors on the error stack) + * + */ +#define FUNC_ENTER_NOAPI_NOINIT_NOFUNC(func_name) { \ + FUNC_ENTER_COMMON_NOFUNC(func_name,!H5_IS_API(#func_name)); \ + H5_PUSH_FUNC(func_name); \ { /* @@ -1217,7 +1233,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ * (so far, just the H5FS routines themselves) */ #define FUNC_ENTER_NOAPI_NOFS(func_name) { \ - FUNC_ENTER_COMMON(func_name,!H5_IS_API(FUNC)); \ + FUNC_ENTER_COMMON(func_name,!H5_IS_API(#func_name)); \ { #define FUNC_ENTER_API_COMMON(func_name,interface_init_func,err) \ @@ -1241,7 +1257,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ } \ \ /* Push the name of this function on the function stack */ \ - H5_PUSH_FUNC; \ + H5_PUSH_FUNC(func_name); \ \ BEGIN_MPE_LOG(func_name) @@ -1258,7 +1274,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ } \ \ /* Push the name of this function on the function stack */ \ - H5_PUSH_FUNC; + H5_PUSH_FUNC(func_name); /*------------------------------------------------------------------------- * Purpose: Register function exit for code profiling. This should be @@ -1280,8 +1296,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \ H5TRACE_RETURN(ret_value); \ H5_POP_FUNC; \ - H5_API_UNLOCK \ - H5_API_SET_CANCEL \ + FUNC_LEAVE_API_THREADSAFE \ return (ret_value); \ } /*end scope from end of FUNC_ENTER*/ \ }} /*end scope from beginning of FUNC_ENTER*/ -- cgit v0.12