From 6661b21e9a948aa7790be13409f5b3e69c2ebbc9 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 2 Mar 2021 04:07:31 -0800 Subject: Stripped hlog code from H5MV.c --- src/H5MV.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/H5MV.c b/src/H5MV.c index 5b73b9a..66d60b4 100644 --- a/src/H5MV.c +++ b/src/H5MV.c @@ -40,7 +40,6 @@ #include "H5MVpkg.h" /* File memory management */ #include "H5VMprivate.h" /* Vectors and arrays */ -#include "hlog.h" /****************/ /* Local Macros */ @@ -96,8 +95,6 @@ hbool_t H5_PKG_INIT_VAR = FALSE; /* Local Variables */ /*******************/ -HLOG_OUTLET_SHORT_DEFN(h5mv, all); - /*------------------------------------------------------------------------- * Function: H5MV__create() @@ -283,7 +280,6 @@ H5MV_alloc(H5F_t *f, hsize_t size) haddr_t ret_value = HADDR_UNDEF; /* Return value */ FUNC_ENTER_NOAPI(HADDR_UNDEF) - hlog_fast(h5mv, "%s: enter size %" PRIuHSIZE, __func__, size); /* check arguments */ HDassert(shared->vfd_swmr_md_fd >= 0); @@ -336,9 +332,6 @@ H5MV_alloc(H5F_t *f, hsize_t size) HDassert(H5F_addr_defined(ret_value)); done: - hlog_fast(h5mv, "%s: leave addr %" PRIuHADDR " size %" PRIuHSIZE, - __func__, ret_value, size); - FUNC_LEAVE_NOAPI(ret_value) } /* end H5MV_alloc() */ @@ -363,9 +356,6 @@ H5MV_free(H5F_t *f, haddr_t addr, hsize_t size) FUNC_ENTER_NOAPI(FAIL) - hlog_fast(h5mv, "%s: enter addr %" PRIuHADDR " size %" PRIuHSIZE, - __func__, addr, size); - /* check arguments */ HDassert(f); if(!H5F_addr_defined(addr) || 0 == size) @@ -381,9 +371,6 @@ H5MV_free(H5F_t *f, haddr_t addr, hsize_t size) */ htri_t status; /* "can absorb" status for section into */ - hlog_fast(h5mv, "%s: trying to avoid starting up free space manager", - __func__); - /* Try to shrink the file */ if((status = H5MV_try_shrink(f, addr, size)) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTMERGE, FAIL, "can't check for absorbing block") @@ -393,11 +380,8 @@ H5MV_free(H5F_t *f, haddr_t addr, hsize_t size) /* If we are deleting the free space manager, leave now, to avoid * [re-]starting it: dropping free space section on the floor. */ - if(shared->fs_state_md == H5F_FS_STATE_DELETING) { - hlog_fast(h5mv, "%s: dropping addr %" PRIuHADDR - " size %" PRIuHSIZE " on the floor!", __func__, addr, size); + if(shared->fs_state_md == H5F_FS_STATE_DELETING) HGOTO_DONE(SUCCEED) - } /* There's either already a free space manager, or the freed * space isn't at the end of the file, so start up (or create) @@ -413,25 +397,18 @@ H5MV_free(H5F_t *f, haddr_t addr, hsize_t size) HDassert(shared->fs_man_md); - hlog_fast(h5mv, "%s: before H5FS_sect_add, addr %" PRIuHADDR - " size %" PRIuHSIZE, __func__, addr, size); - /* Add the section */ if(H5FS_sect_add(f, shared->fs_man_md, &node->sect_info, H5FS_ADD_RETURNED_SPACE, f) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINSERT, FAIL, "can't re-add section to file free space") node = NULL; - hlog_fast(h5mv, "%s: after H5FS_sect_add", __func__); - done: /* Release section node, if allocated and not added to section list or merged */ if(node) if(H5MV__sect_free(&node->sect_info) < 0) HDONE_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't free simple section node") - hlog_fast(h5mv, "%s: leave %d", __func__, ret_value); - FUNC_LEAVE_NOAPI(ret_value) } /* end H5MV_free() */ -- cgit v0.12