diff options
Diffstat (limited to 'src/H5FAhdr.c')
| -rw-r--r-- | src/H5FAhdr.c | 503 |
1 files changed, 231 insertions, 272 deletions
diff --git a/src/H5FAhdr.c b/src/H5FAhdr.c index b25d50b..9e9faee 100644 --- a/src/H5FAhdr.c +++ b/src/H5FAhdr.c @@ -24,54 +24,45 @@ /* Module Declaration */ /**********************/ -#include "H5FAmodule.h" /* This source code file is part of the H5FA module */ - +#include "H5FAmodule.h" /* This source code file is part of the H5FA module */ /***********************/ /* Other Packages Used */ /***********************/ - /***********/ /* Headers */ /***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5FApkg.h" /* Fixed Arrays */ -#include "H5MFprivate.h" /* File memory management */ -#include "H5MMprivate.h" /* Memory management */ - +#include "H5private.h" /* Generic Functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5FApkg.h" /* Fixed Arrays */ +#include "H5MFprivate.h" /* File memory management */ +#include "H5MMprivate.h" /* Memory management */ /****************/ /* Local Macros */ /****************/ - /******************/ /* Local Typedefs */ /******************/ - /********************/ /* Package Typedefs */ /********************/ - /********************/ /* Local Prototypes */ /********************/ - /*********************/ /* Package Variables */ /*********************/ - /*****************************/ /* Library Private Variables */ /*****************************/ - /*******************/ /* Local Variables */ /*******************/ @@ -79,7 +70,6 @@ /* Declare a free list to manage the H5FA_hdr_t struct */ H5FL_DEFINE_STATIC(H5FA_hdr_t); - /*------------------------------------------------------------------------- * Function: H5FA__hdr_alloc * @@ -92,41 +82,38 @@ H5FL_DEFINE_STATIC(H5FA_hdr_t); * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -H5FA_hdr_t *, NULL, NULL, -H5FA__hdr_alloc(H5F_t *f)) +BEGIN_FUNC(PKG, ERR, H5FA_hdr_t *, NULL, NULL, H5FA__hdr_alloc(H5F_t *f)) - /* Local variables */ - H5FA_hdr_t *hdr = NULL; /* Shared Fixed Array header */ +/* Local variables */ +H5FA_hdr_t *hdr = NULL; /* Shared Fixed Array header */ - /* Check arguments */ - HDassert(f); +/* Check arguments */ +HDassert(f); - /* Allocate space for the shared information */ - if(NULL == (hdr = H5FL_CALLOC(H5FA_hdr_t))) - H5E_THROW(H5E_CANTALLOC, "memory allocation failed for Fixed Array shared header") +/* Allocate space for the shared information */ +if (NULL == (hdr = H5FL_CALLOC(H5FA_hdr_t))) + H5E_THROW(H5E_CANTALLOC, "memory allocation failed for Fixed Array shared header") - /* Set non-zero internal fields */ - hdr->addr = HADDR_UNDEF; +/* Set non-zero internal fields */ +hdr->addr = HADDR_UNDEF; - /* Set the internal parameters for the array */ - hdr->f = f; - hdr->swmr_write = (H5F_INTENT(f) & H5F_ACC_SWMR_WRITE) > 0; - hdr->sizeof_addr = H5F_SIZEOF_ADDR(f); - hdr->sizeof_size = H5F_SIZEOF_SIZE(f); +/* Set the internal parameters for the array */ +hdr->f = f; +hdr->swmr_write = (H5F_INTENT(f) & H5F_ACC_SWMR_WRITE) > 0; +hdr->sizeof_addr = H5F_SIZEOF_ADDR(f); +hdr->sizeof_size = H5F_SIZEOF_SIZE(f); - /* Set the return value */ - ret_value = hdr; +/* Set the return value */ +ret_value = hdr; CATCH - if(!ret_value) - if(hdr && H5FA__hdr_dest(hdr) < 0) - H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header") +if (!ret_value) + if (hdr && H5FA__hdr_dest(hdr) < 0) + H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header") -END_FUNC(PKG) /* end H5FA__hdr_alloc() */ +END_FUNC(PKG) /* end H5FA__hdr_alloc() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_init * @@ -139,32 +126,29 @@ END_FUNC(PKG) /* end H5FA__hdr_alloc() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5FA__hdr_init(H5FA_hdr_t *hdr, void *ctx_udata)) +BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_init(H5FA_hdr_t *hdr, void *ctx_udata)) - /* Local variables */ +/* Local variables */ - /* Check arguments */ - HDassert(hdr); +/* Check arguments */ +HDassert(hdr); - /* Set size of header on disk (locally and in statistics) */ - hdr->stats.hdr_size = hdr->size = H5FA_HEADER_SIZE_HDR(hdr); +/* Set size of header on disk (locally and in statistics) */ +hdr->stats.hdr_size = hdr->size = H5FA_HEADER_SIZE_HDR(hdr); - /* Set number of elements for Fixed Array in statistics */ - hdr->stats.nelmts = hdr->cparam.nelmts; +/* Set number of elements for Fixed Array in statistics */ +hdr->stats.nelmts = hdr->cparam.nelmts; - /* Create the callback context, if there's one */ - if(hdr->cparam.cls->crt_context) { - if(NULL == (hdr->cb_ctx = (*hdr->cparam.cls->crt_context)(ctx_udata))) - H5E_THROW(H5E_CANTCREATE, "unable to create fixed array client callback context") - } /* end if */ +/* Create the callback context, if there's one */ +if (hdr->cparam.cls->crt_context) { + if (NULL == (hdr->cb_ctx = (*hdr->cparam.cls->crt_context)(ctx_udata))) + H5E_THROW(H5E_CANTCREATE, "unable to create fixed array client callback context") +} /* end if */ CATCH -END_FUNC(PKG) /* end H5FA__hdr_init() */ +END_FUNC(PKG) /* end H5FA__hdr_init() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_create * @@ -177,86 +161,85 @@ END_FUNC(PKG) /* end H5FA__hdr_init() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -haddr_t, HADDR_UNDEF, HADDR_UNDEF, -H5FA__hdr_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata)) +BEGIN_FUNC(PKG, ERR, haddr_t, HADDR_UNDEF, HADDR_UNDEF, + H5FA__hdr_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata)) - /* Local variables */ - H5FA_hdr_t *hdr = NULL; /* Fixed array header */ - hbool_t inserted = FALSE; /* Whether the header was inserted into cache */ +/* Local variables */ +H5FA_hdr_t *hdr = NULL; /* Fixed array header */ +hbool_t inserted = FALSE; /* Whether the header was inserted into cache */ - /* Check arguments */ - HDassert(f); - HDassert(cparam); +/* Check arguments */ +HDassert(f); +HDassert(cparam); #ifndef NDEBUG { /* Check for valid parameters */ - if(cparam->raw_elmt_size == 0) + if (cparam->raw_elmt_size == 0) H5E_THROW(H5E_BADVALUE, "element size must be greater than zero") - if(cparam->max_dblk_page_nelmts_bits == 0) + if (cparam->max_dblk_page_nelmts_bits == 0) H5E_THROW(H5E_BADVALUE, "max. # of elements bits must be greater than zero") - if(cparam->nelmts == 0) + if (cparam->nelmts == 0) H5E_THROW(H5E_BADVALUE, "# of elements must be greater than zero") } #endif /* NDEBUG */ - /* Allocate space for the shared information */ - if(NULL == (hdr = H5FA__hdr_alloc(f))) - H5E_THROW(H5E_CANTALLOC, "memory allocation failed for Fixed Array shared header") +/* Allocate space for the shared information */ +if (NULL == (hdr = H5FA__hdr_alloc(f))) + H5E_THROW(H5E_CANTALLOC, "memory allocation failed for Fixed Array shared header") - hdr->dblk_addr = HADDR_UNDEF; +hdr->dblk_addr = HADDR_UNDEF; - /* Set the creation parameters for the array */ - H5MM_memcpy(&hdr->cparam, cparam, sizeof(hdr->cparam)); +/* Set the creation parameters for the array */ +H5MM_memcpy(&hdr->cparam, cparam, sizeof(hdr->cparam)); - /* Finish initializing fixed array header */ - if(H5FA__hdr_init(hdr, ctx_udata) < 0) - H5E_THROW(H5E_CANTINIT, "initialization failed for fixed array header") +/* Finish initializing fixed array header */ +if (H5FA__hdr_init(hdr, ctx_udata) < 0) + H5E_THROW(H5E_CANTINIT, "initialization failed for fixed array header") - /* Allocate space for the header on disk */ - if(HADDR_UNDEF == (hdr->addr = H5MF_alloc(f, H5FD_MEM_FARRAY_HDR, (hsize_t)hdr->size))) - H5E_THROW(H5E_CANTALLOC, "file allocation failed for Fixed Array header") +/* Allocate space for the header on disk */ +if (HADDR_UNDEF == (hdr->addr = H5MF_alloc(f, H5FD_MEM_FARRAY_HDR, (hsize_t)hdr->size))) + H5E_THROW(H5E_CANTALLOC, "file allocation failed for Fixed Array header") - /* Create 'top' proxy for extensible array entries */ - if(hdr->swmr_write) - if(NULL == (hdr->top_proxy = H5AC_proxy_entry_create())) - H5E_THROW(H5E_CANTCREATE, "can't create fixed array entry proxy") +/* Create 'top' proxy for extensible array entries */ +if (hdr->swmr_write) + if (NULL == (hdr->top_proxy = H5AC_proxy_entry_create())) + H5E_THROW(H5E_CANTCREATE, "can't create fixed array entry proxy") - /* Cache the new Fixed Array header */ - if(H5AC_insert_entry(f, H5AC_FARRAY_HDR, hdr->addr, hdr, H5AC__NO_FLAGS_SET) < 0) - H5E_THROW(H5E_CANTINSERT, "can't add fixed array header to cache") - inserted = TRUE; +/* Cache the new Fixed Array header */ +if (H5AC_insert_entry(f, H5AC_FARRAY_HDR, hdr->addr, hdr, H5AC__NO_FLAGS_SET) < 0) + H5E_THROW(H5E_CANTINSERT, "can't add fixed array header to cache") +inserted = TRUE; - /* Add header as child of 'top' proxy */ - if(hdr->top_proxy) - if(H5AC_proxy_entry_add_child(hdr->top_proxy, f, hdr) < 0) - H5E_THROW(H5E_CANTSET, "unable to add fixed array entry as child of array proxy") +/* Add header as child of 'top' proxy */ +if (hdr->top_proxy) + if (H5AC_proxy_entry_add_child(hdr->top_proxy, f, hdr) < 0) + H5E_THROW(H5E_CANTSET, "unable to add fixed array entry as child of array proxy") - /* Set address of array header to return */ - ret_value = hdr->addr; +/* Set address of array header to return */ +ret_value = hdr->addr; CATCH - if(!H5F_addr_defined(ret_value)) - if(hdr) { - /* Remove from cache, if inserted */ - if(inserted) - if(H5AC_remove_entry(hdr) < 0) - H5E_THROW(H5E_CANTREMOVE, "unable to remove fixed array header from cache") - - /* Release header's disk space */ - if(H5F_addr_defined(hdr->addr) && H5MF_xfree(f, H5FD_MEM_FARRAY_HDR, hdr->addr, (hsize_t)hdr->size) < 0) - H5E_THROW(H5E_CANTFREE, "unable to free Fixed Array header") - - /* Destroy header */ - if(H5FA__hdr_dest(hdr) < 0) - H5E_THROW(H5E_CANTFREE, "unable to destroy Fixed Array header") - } /* end if */ +if (!H5F_addr_defined(ret_value)) + if (hdr) { + /* Remove from cache, if inserted */ + if (inserted) + if (H5AC_remove_entry(hdr) < 0) + H5E_THROW(H5E_CANTREMOVE, "unable to remove fixed array header from cache") + + /* Release header's disk space */ + if (H5F_addr_defined(hdr->addr) && + H5MF_xfree(f, H5FD_MEM_FARRAY_HDR, hdr->addr, (hsize_t)hdr->size) < 0) + H5E_THROW(H5E_CANTFREE, "unable to free Fixed Array header") + + /* Destroy header */ + if (H5FA__hdr_dest(hdr) < 0) + H5E_THROW(H5E_CANTFREE, "unable to destroy Fixed Array header") + } /* end if */ -END_FUNC(PKG) /* end H5FA__hdr_create() */ +END_FUNC(PKG) /* end H5FA__hdr_create() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_incr * @@ -269,26 +252,23 @@ END_FUNC(PKG) /* end H5FA__hdr_create() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5FA__hdr_incr(H5FA_hdr_t *hdr)) +BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_incr(H5FA_hdr_t *hdr)) - /* Sanity check */ - HDassert(hdr); +/* Sanity check */ +HDassert(hdr); - /* Mark header as un-evictable when something is depending on it */ - if(hdr->rc == 0) - if(H5AC_pin_protected_entry(hdr) < 0) - H5E_THROW(H5E_CANTPIN, "unable to pin fixed array header") +/* Mark header as un-evictable when something is depending on it */ +if (hdr->rc == 0) + if (H5AC_pin_protected_entry(hdr) < 0) + H5E_THROW(H5E_CANTPIN, "unable to pin fixed array header") - /* Increment reference count on shared header */ - hdr->rc++; +/* Increment reference count on shared header */ +hdr->rc++; CATCH -END_FUNC(PKG) /* end H5FA__hdr_incr() */ +END_FUNC(PKG) /* end H5FA__hdr_incr() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_decr * @@ -301,29 +281,26 @@ END_FUNC(PKG) /* end H5FA__hdr_incr() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5FA__hdr_decr(H5FA_hdr_t *hdr)) - - /* Sanity check */ - HDassert(hdr); - HDassert(hdr->rc); - - /* Decrement reference count on shared header */ - hdr->rc--; - - /* Mark header as evictable again when nothing depend on it */ - if(hdr->rc == 0) { - HDassert(hdr->file_rc == 0); - if(H5AC_unpin_entry(hdr) < 0) - H5E_THROW(H5E_CANTUNPIN, "unable to unpin fixed array header") - } /* end if */ +BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_decr(H5FA_hdr_t *hdr)) + +/* Sanity check */ +HDassert(hdr); +HDassert(hdr->rc); + +/* Decrement reference count on shared header */ +hdr->rc--; + +/* Mark header as evictable again when nothing depend on it */ +if (hdr->rc == 0) { + HDassert(hdr->file_rc == 0); + if (H5AC_unpin_entry(hdr) < 0) + H5E_THROW(H5E_CANTUNPIN, "unable to unpin fixed array header") +} /* end if */ CATCH -END_FUNC(PKG) /* end H5FA__hdr_decr() */ +END_FUNC(PKG) /* end H5FA__hdr_decr() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_fuse_incr * @@ -336,19 +313,16 @@ END_FUNC(PKG) /* end H5FA__hdr_decr() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, NOERR, -herr_t, SUCCEED, -, -H5FA__hdr_fuse_incr(H5FA_hdr_t *hdr)) +BEGIN_FUNC(PKG, NOERR, herr_t, SUCCEED, -, H5FA__hdr_fuse_incr(H5FA_hdr_t *hdr)) - /* Sanity check */ - HDassert(hdr); +/* Sanity check */ +HDassert(hdr); - /* Increment file reference count on shared header */ - hdr->file_rc++; +/* Increment file reference count on shared header */ +hdr->file_rc++; -END_FUNC(PKG) /* end H5FA__hdr_fuse_incr() */ +END_FUNC(PKG) /* end H5FA__hdr_fuse_incr() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_fuse_decr * @@ -361,23 +335,20 @@ END_FUNC(PKG) /* end H5FA__hdr_fuse_incr() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, NOERR, -size_t, 0, -, -H5FA__hdr_fuse_decr(H5FA_hdr_t *hdr)) +BEGIN_FUNC(PKG, NOERR, size_t, 0, -, H5FA__hdr_fuse_decr(H5FA_hdr_t *hdr)) - /* Sanity check */ - HDassert(hdr); - HDassert(hdr->file_rc); +/* Sanity check */ +HDassert(hdr); +HDassert(hdr->file_rc); - /* Decrement file reference count on shared header */ - hdr->file_rc--; +/* Decrement file reference count on shared header */ +hdr->file_rc--; - /* Set return value */ - ret_value = hdr->file_rc; +/* Set return value */ +ret_value = hdr->file_rc; -END_FUNC(PKG) /* end H5FA__hdr_fuse_decr() */ +END_FUNC(PKG) /* end H5FA__hdr_fuse_decr() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_modified * @@ -390,22 +361,19 @@ END_FUNC(PKG) /* end H5FA__hdr_fuse_decr() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5FA__hdr_modified(H5FA_hdr_t *hdr)) +BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_modified(H5FA_hdr_t *hdr)) - /* Sanity check */ - HDassert(hdr); +/* Sanity check */ +HDassert(hdr); - /* Mark header as dirty in cache */ - if(H5AC_mark_entry_dirty(hdr) < 0) - H5E_THROW(H5E_CANTMARKDIRTY, "unable to mark fixed array header as dirty") +/* Mark header as dirty in cache */ +if (H5AC_mark_entry_dirty(hdr) < 0) + H5E_THROW(H5E_CANTMARKDIRTY, "unable to mark fixed array header as dirty") CATCH -END_FUNC(PKG) /* end H5FA__hdr_modified() */ +END_FUNC(PKG) /* end H5FA__hdr_modified() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_protect * @@ -418,50 +386,49 @@ END_FUNC(PKG) /* end H5FA__hdr_modified() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -H5FA_hdr_t *, NULL, NULL, -H5FA__hdr_protect(H5F_t *f, haddr_t fa_addr, void *ctx_udata, unsigned flags)) - - /* Local variables */ - H5FA_hdr_t *hdr; /* Fixed array header */ - H5FA_hdr_cache_ud_t udata; /* User data for cache callbacks */ - - /* Sanity check */ - HDassert(f); - HDassert(H5F_addr_defined(fa_addr)); - - /* only the H5AC__READ_ONLY_FLAG is permitted */ - HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0); - - /* Set up user data for cache callbacks */ - udata.f = f; - udata.addr = fa_addr; - udata.ctx_udata = ctx_udata; - - /* Protect the header */ - if(NULL == (hdr = (H5FA_hdr_t *)H5AC_protect(f, H5AC_FARRAY_HDR, fa_addr, &udata, flags))) - H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array header, address = %llu", (unsigned long long)fa_addr) - hdr->f = f; /* (Must be set again here, in case the header was already in the cache -QAK) */ - - /* Create top proxy, if it doesn't exist */ - if(hdr->swmr_write && NULL == hdr->top_proxy) { - /* Create 'top' proxy for fixed array entries */ - if(NULL == (hdr->top_proxy = H5AC_proxy_entry_create())) - H5E_THROW(H5E_CANTCREATE, "can't create fixed array entry proxy") - - /* Add header as child of 'top' proxy */ - if(H5AC_proxy_entry_add_child(hdr->top_proxy, f, hdr) < 0) - H5E_THROW(H5E_CANTSET, "unable to add fixed array entry as child of array proxy") - } /* end if */ +BEGIN_FUNC(PKG, ERR, H5FA_hdr_t *, NULL, NULL, + H5FA__hdr_protect(H5F_t *f, haddr_t fa_addr, void *ctx_udata, unsigned flags)) + +/* Local variables */ +H5FA_hdr_t * hdr; /* Fixed array header */ +H5FA_hdr_cache_ud_t udata; /* User data for cache callbacks */ + +/* Sanity check */ +HDassert(f); +HDassert(H5F_addr_defined(fa_addr)); + +/* only the H5AC__READ_ONLY_FLAG is permitted */ +HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0); + +/* Set up user data for cache callbacks */ +udata.f = f; +udata.addr = fa_addr; +udata.ctx_udata = ctx_udata; + +/* Protect the header */ +if (NULL == (hdr = (H5FA_hdr_t *)H5AC_protect(f, H5AC_FARRAY_HDR, fa_addr, &udata, flags))) + H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array header, address = %llu", + (unsigned long long)fa_addr) +hdr->f = f; /* (Must be set again here, in case the header was already in the cache -QAK) */ + +/* Create top proxy, if it doesn't exist */ +if (hdr->swmr_write && NULL == hdr->top_proxy) { + /* Create 'top' proxy for fixed array entries */ + if (NULL == (hdr->top_proxy = H5AC_proxy_entry_create())) + H5E_THROW(H5E_CANTCREATE, "can't create fixed array entry proxy") - /* Set return value */ - ret_value = hdr; + /* Add header as child of 'top' proxy */ + if (H5AC_proxy_entry_add_child(hdr->top_proxy, f, hdr) < 0) + H5E_THROW(H5E_CANTSET, "unable to add fixed array entry as child of array proxy") +} /* end if */ + +/* Set return value */ +ret_value = hdr; CATCH -END_FUNC(PKG) /* end H5FA__hdr_protect() */ +END_FUNC(PKG) /* end H5FA__hdr_protect() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_unprotect * @@ -474,24 +441,22 @@ END_FUNC(PKG) /* end H5FA__hdr_protect() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5FA__hdr_unprotect(H5FA_hdr_t *hdr, unsigned cache_flags)) +BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_unprotect(H5FA_hdr_t *hdr, unsigned cache_flags)) - /* Local variables */ +/* Local variables */ - /* Sanity check */ - HDassert(hdr); +/* Sanity check */ +HDassert(hdr); - /* Unprotect the header */ - if(H5AC_unprotect(hdr->f, H5AC_FARRAY_HDR, hdr->addr, hdr, cache_flags) < 0) - H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect fixed array hdr, address = %llu", (unsigned long long)hdr->addr) +/* Unprotect the header */ +if (H5AC_unprotect(hdr->f, H5AC_FARRAY_HDR, hdr->addr, hdr, cache_flags) < 0) + H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect fixed array hdr, address = %llu", + (unsigned long long)hdr->addr) CATCH -END_FUNC(PKG) /* end H5FA__hdr_unprotect() */ +END_FUNC(PKG) /* end H5FA__hdr_unprotect() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_delete * @@ -504,23 +469,21 @@ END_FUNC(PKG) /* end H5FA__hdr_unprotect() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5FA__hdr_delete(H5FA_hdr_t *hdr)) +BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_delete(H5FA_hdr_t *hdr)) - /* Local variables */ - unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting header */ +/* Local variables */ +unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting header */ - /* Sanity check */ - HDassert(hdr); - HDassert(!hdr->file_rc); +/* Sanity check */ +HDassert(hdr); +HDassert(!hdr->file_rc); #ifndef NDEBUG { - unsigned hdr_status = 0; /* Array header's status in the metadata cache */ + unsigned hdr_status = 0; /* Array header's status in the metadata cache */ /* Check the array header's status in the metadata cache */ - if(H5AC_get_entry_status(hdr->f, hdr->addr, &hdr_status) < 0) + if (H5AC_get_entry_status(hdr->f, hdr->addr, &hdr_status) < 0) H5E_THROW(H5E_CANTGET, "unable to check metadata cache status for array header") /* Sanity checks on array header */ @@ -529,25 +492,24 @@ H5FA__hdr_delete(H5FA_hdr_t *hdr)) } /* end block */ #endif /* NDEBUG */ - /* Check for Fixed Array Data block */ - if(H5F_addr_defined(hdr->dblk_addr)) { - /* Delete Fixed Array Data block */ - if(H5FA__dblock_delete(hdr, hdr->dblk_addr) < 0) - H5E_THROW(H5E_CANTDELETE, "unable to delete fixed array data block") - } /* end if */ +/* Check for Fixed Array Data block */ +if (H5F_addr_defined(hdr->dblk_addr)) { + /* Delete Fixed Array Data block */ + if (H5FA__dblock_delete(hdr, hdr->dblk_addr) < 0) + H5E_THROW(H5E_CANTDELETE, "unable to delete fixed array data block") +} /* end if */ - /* Set flags to finish deleting header on unprotect */ - cache_flags |= H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG; +/* Set flags to finish deleting header on unprotect */ +cache_flags |= H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG; CATCH - /* Unprotect the header, deleting it if an error hasn't occurred */ - if(H5AC_unprotect(hdr->f, H5AC_FARRAY_HDR, hdr->addr, hdr, cache_flags) < 0) - H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array header") +/* Unprotect the header, deleting it if an error hasn't occurred */ +if (H5AC_unprotect(hdr->f, H5AC_FARRAY_HDR, hdr->addr, hdr, cache_flags) < 0) + H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array header") -END_FUNC(PKG) /* end H5FA__hdr_delete() */ +END_FUNC(PKG) /* end H5FA__hdr_delete() */ - /*------------------------------------------------------------------------- * Function: H5FA__hdr_dest * @@ -560,32 +522,29 @@ END_FUNC(PKG) /* end H5FA__hdr_delete() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5FA__hdr_dest(H5FA_hdr_t *hdr)) - - /* Check arguments */ - HDassert(hdr); - HDassert(hdr->rc == 0); - - /* Destroy the callback context */ - if(hdr->cb_ctx) { - if((*hdr->cparam.cls->dst_context)(hdr->cb_ctx) < 0) - H5E_THROW(H5E_CANTRELEASE, "unable to destroy fixed array client callback context") - } /* end if */ - hdr->cb_ctx = NULL; +BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_dest(H5FA_hdr_t *hdr)) - /* Destroy the 'top' proxy */ - if(hdr->top_proxy) { - if(H5AC_proxy_entry_dest(hdr->top_proxy) < 0) - H5E_THROW(H5E_CANTRELEASE, "unable to destroy fixed array 'top' proxy") - hdr->top_proxy = NULL; - } /* end if */ +/* Check arguments */ +HDassert(hdr); +HDassert(hdr->rc == 0); - /* Free the shared info itself */ - hdr = H5FL_FREE(H5FA_hdr_t, hdr); +/* Destroy the callback context */ +if (hdr->cb_ctx) { + if ((*hdr->cparam.cls->dst_context)(hdr->cb_ctx) < 0) + H5E_THROW(H5E_CANTRELEASE, "unable to destroy fixed array client callback context") +} /* end if */ +hdr->cb_ctx = NULL; -CATCH +/* Destroy the 'top' proxy */ +if (hdr->top_proxy) { + if (H5AC_proxy_entry_dest(hdr->top_proxy) < 0) + H5E_THROW(H5E_CANTRELEASE, "unable to destroy fixed array 'top' proxy") + hdr->top_proxy = NULL; +} /* end if */ -END_FUNC(PKG) /* end H5FA__hdr_dest() */ +/* Free the shared info itself */ +hdr = H5FL_FREE(H5FA_hdr_t, hdr); + +CATCH +END_FUNC(PKG) /* end H5FA__hdr_dest() */ |