summaryrefslogtreecommitdiffstats
path: root/src/H5EAiblock.c
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-09-30 14:27:10 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-09-30 14:27:10 (GMT)
commitb2d661b508a7fc7a2592c13bc6bdc175551f075d (patch)
tree13baeb0d83a7c2a4c6299993c182b1227c2f6114 /src/H5EAiblock.c
parent29ab58b58dce556639ea3154e262895773a8a8df (diff)
downloadhdf5-b2d661b508a7fc7a2592c13bc6bdc175551f075d.zip
hdf5-b2d661b508a7fc7a2592c13bc6bdc175551f075d.tar.gz
hdf5-b2d661b508a7fc7a2592c13bc6bdc175551f075d.tar.bz2
Clang-format of source files
Diffstat (limited to 'src/H5EAiblock.c')
-rw-r--r--src/H5EAiblock.c562
1 files changed, 272 insertions, 290 deletions
diff --git a/src/H5EAiblock.c b/src/H5EAiblock.c
index c45d15a..1e42716 100644
--- a/src/H5EAiblock.c
+++ b/src/H5EAiblock.c
@@ -26,55 +26,46 @@
/* Module Declaration */
/**********************/
-#include "H5EAmodule.h" /* This source code file is part of the H5EA module */
-
+#include "H5EAmodule.h" /* This source code file is part of the H5EA module */
/***********************/
/* Other Packages Used */
/***********************/
-
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5EApkg.h" /* Extensible Arrays */
-#include "H5FLprivate.h" /* Free Lists */
-#include "H5MFprivate.h" /* File memory management */
-#include "H5VMprivate.h" /* Vectors and arrays */
-
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5EApkg.h" /* Extensible Arrays */
+#include "H5FLprivate.h" /* Free Lists */
+#include "H5MFprivate.h" /* File memory management */
+#include "H5VMprivate.h" /* Vectors and arrays */
/****************/
/* Local Macros */
/****************/
-
/******************/
/* Local Typedefs */
/******************/
-
/********************/
/* Package Typedefs */
/********************/
-
/********************/
/* Local Prototypes */
/********************/
-
/*********************/
/* Package Variables */
/*********************/
-
/*****************************/
/* Library Private Variables */
/*****************************/
-
/*******************/
/* Local Variables */
/*******************/
@@ -88,8 +79,6 @@ H5FL_BLK_DEFINE_STATIC(idx_blk_elmt_buf);
/* Declare a free list to manage the haddr_t sequence information */
H5FL_SEQ_DEFINE_STATIC(haddr_t);
-
-
/*-------------------------------------------------------------------------
* Function: H5EA__iblock_alloc
*
@@ -102,59 +91,57 @@ H5FL_SEQ_DEFINE_STATIC(haddr_t);
*
*-------------------------------------------------------------------------
*/
-BEGIN_FUNC(PKG, ERR,
-H5EA_iblock_t *, NULL, NULL,
-H5EA__iblock_alloc(H5EA_hdr_t *hdr))
+BEGIN_FUNC(PKG, ERR, H5EA_iblock_t *, NULL, NULL, H5EA__iblock_alloc(H5EA_hdr_t *hdr))
- /* Local variables */
- H5EA_iblock_t *iblock = NULL; /* Extensible array index block */
+/* Local variables */
+H5EA_iblock_t *iblock = NULL; /* Extensible array index block */
- /* Check arguments */
- HDassert(hdr);
+/* Check arguments */
+HDassert(hdr);
- /* Allocate memory for the index block */
- if(NULL == (iblock = H5FL_CALLOC(H5EA_iblock_t)))
- H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array index block")
+/* Allocate memory for the index block */
+if (NULL == (iblock = H5FL_CALLOC(H5EA_iblock_t)))
+ H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array index block")
- /* Share common array information */
- if(H5EA__hdr_incr(hdr) < 0)
- H5E_THROW(H5E_CANTINC, "can't increment reference count on shared array header")
- iblock->hdr = hdr;
+/* Share common array information */
+if (H5EA__hdr_incr(hdr) < 0)
+ H5E_THROW(H5E_CANTINC, "can't increment reference count on shared array header")
+iblock->hdr = hdr;
- /* Set non-zero internal fields */
- iblock->addr = HADDR_UNDEF;
+/* Set non-zero internal fields */
+iblock->addr = HADDR_UNDEF;
- /* Compute information */
- iblock->nsblks = H5EA_SBLK_FIRST_IDX(hdr->cparam.sup_blk_min_data_ptrs);
- iblock->ndblk_addrs = 2 * ((size_t)hdr->cparam.sup_blk_min_data_ptrs - 1);
- iblock->nsblk_addrs = hdr->nsblks - iblock->nsblks;
+/* Compute information */
+iblock->nsblks = H5EA_SBLK_FIRST_IDX(hdr->cparam.sup_blk_min_data_ptrs);
+iblock->ndblk_addrs = 2 * ((size_t)hdr->cparam.sup_blk_min_data_ptrs - 1);
+iblock->nsblk_addrs = hdr->nsblks - iblock->nsblks;
- /* Allocate buffer for elements in index block */
- if(hdr->cparam.idx_blk_elmts > 0)
- if(NULL == (iblock->elmts = H5FL_BLK_MALLOC(idx_blk_elmt_buf, (size_t)(hdr->cparam.idx_blk_elmts * hdr->cparam.cls->nat_elmt_size))))
- H5E_THROW(H5E_CANTALLOC, "memory allocation failed for index block data element buffer")
+/* Allocate buffer for elements in index block */
+if (hdr->cparam.idx_blk_elmts > 0)
+ if (NULL == (iblock->elmts = H5FL_BLK_MALLOC(
+ idx_blk_elmt_buf, (size_t)(hdr->cparam.idx_blk_elmts * hdr->cparam.cls->nat_elmt_size))))
+ H5E_THROW(H5E_CANTALLOC, "memory allocation failed for index block data element buffer")
- /* Allocate buffer for data block addresses in index block */
- if(iblock->ndblk_addrs > 0)
- if(NULL == (iblock->dblk_addrs = H5FL_SEQ_MALLOC(haddr_t, iblock->ndblk_addrs)))
- H5E_THROW(H5E_CANTALLOC, "memory allocation failed for index block data block addresses")
+/* Allocate buffer for data block addresses in index block */
+if (iblock->ndblk_addrs > 0)
+ if (NULL == (iblock->dblk_addrs = H5FL_SEQ_MALLOC(haddr_t, iblock->ndblk_addrs)))
+ H5E_THROW(H5E_CANTALLOC, "memory allocation failed for index block data block addresses")
- /* Allocate buffer for super block addresses in index block */
- if(iblock->nsblk_addrs > 0)
- if(NULL == (iblock->sblk_addrs = H5FL_SEQ_MALLOC(haddr_t, iblock->nsblk_addrs)))
- H5E_THROW(H5E_CANTALLOC, "memory allocation failed for index block super block addresses")
+/* Allocate buffer for super block addresses in index block */
+if (iblock->nsblk_addrs > 0)
+ if (NULL == (iblock->sblk_addrs = H5FL_SEQ_MALLOC(haddr_t, iblock->nsblk_addrs)))
+ H5E_THROW(H5E_CANTALLOC, "memory allocation failed for index block super block addresses")
- /* Set the return value */
- ret_value = iblock;
+/* Set the return value */
+ret_value = iblock;
CATCH
- if(!ret_value)
- if(iblock && H5EA__iblock_dest(iblock) < 0)
- H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array index block")
+if (!ret_value)
+ if (iblock && H5EA__iblock_dest(iblock) < 0)
+ H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array index block")
-END_FUNC(PKG) /* end H5EA__iblock_alloc() */
+END_FUNC(PKG) /* end H5EA__iblock_alloc() */
-
/*-------------------------------------------------------------------------
* Function: H5EA__iblock_create
*
@@ -167,101 +154,100 @@ END_FUNC(PKG) /* end H5EA__iblock_alloc() */
*
*-------------------------------------------------------------------------
*/
-BEGIN_FUNC(PKG, ERR,
-haddr_t, HADDR_UNDEF, HADDR_UNDEF,
-H5EA__iblock_create(H5EA_hdr_t *hdr, hbool_t *stats_changed))
-
- /* Local variables */
- H5EA_iblock_t *iblock = NULL; /* Extensible array index block */
- haddr_t iblock_addr; /* Extensible array index block address */
- hbool_t inserted = FALSE; /* Whether the header was inserted into cache */
-
- /* Sanity check */
- HDassert(hdr);
- HDassert(stats_changed);
-
- /* Allocate the index block */
- if(NULL == (iblock = H5EA__iblock_alloc(hdr)))
- H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array index block")
-
- /* Set size of index block on disk */
- iblock->size = H5EA_IBLOCK_SIZE(iblock);
-
- /* Allocate space for the index block on disk */
- if(HADDR_UNDEF == (iblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_EARRAY_IBLOCK, (hsize_t)iblock->size)))
- H5E_THROW(H5E_CANTALLOC, "file allocation failed for extensible array index block")
- iblock->addr = iblock_addr;
-
- /* Clear any elements in index block to fill value */
- if(hdr->cparam.idx_blk_elmts > 0) {
- /* Call the class's 'fill' callback */
- if((hdr->cparam.cls->fill)(iblock->elmts, (size_t)hdr->cparam.idx_blk_elmts) < 0)
- H5E_THROW(H5E_CANTSET, "can't set extensible array index block elements to class's fill value")
- } /* end if */
-
- /* Reset any data block addresses in the index block */
- if(iblock->ndblk_addrs > 0) {
- haddr_t tmp_addr = HADDR_UNDEF; /* Address value to fill data block addresses with */
-
- /* Set all the data block addresses to "undefined" address value */
- H5VM_array_fill(iblock->dblk_addrs, &tmp_addr, sizeof(haddr_t), iblock->ndblk_addrs);
- } /* end if */
-
- /* Reset any super block addresses in the index block */
- if(iblock->nsblk_addrs > 0) {
- haddr_t tmp_addr = HADDR_UNDEF; /* Address value to fill super block addresses with */
-
- /* Set all the super block addresses to "undefined" address value */
- H5VM_array_fill(iblock->sblk_addrs, &tmp_addr, sizeof(haddr_t), iblock->nsblk_addrs);
- } /* end if */
-
- /* Cache the new extensible array index block */
- if(H5AC_insert_entry(hdr->f, H5AC_EARRAY_IBLOCK, iblock_addr, iblock, H5AC__NO_FLAGS_SET) < 0)
- H5E_THROW(H5E_CANTINSERT, "can't add extensible array index block to cache")
- inserted = TRUE;
-
- /* Add index block as child of 'top' proxy */
- if(hdr->top_proxy) {
- if(H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, iblock) < 0)
- H5E_THROW(H5E_CANTSET, "unable to add extensible array entry as child of array proxy")
- iblock->top_proxy = hdr->top_proxy;
- } /* end if */
-
- /* Update extensible array index block statistics */
- HDassert(0 == hdr->stats.computed.nindex_blks);
- HDassert(0 == hdr->stats.computed.index_blk_size);
- hdr->stats.computed.nindex_blks = 1;
- hdr->stats.computed.index_blk_size = iblock->size;
-
- /* Increment count of elements "realized" */
- hdr->stats.stored.nelmts += hdr->cparam.idx_blk_elmts;
-
- /* Mark the statistics as changed */
- *stats_changed = TRUE;
-
- /* Set address of index block to return */
- ret_value = iblock_addr;
+BEGIN_FUNC(PKG, ERR, haddr_t, HADDR_UNDEF, HADDR_UNDEF,
+ H5EA__iblock_create(H5EA_hdr_t *hdr, hbool_t *stats_changed))
+
+/* Local variables */
+H5EA_iblock_t *iblock = NULL; /* Extensible array index block */
+haddr_t iblock_addr; /* Extensible array index block address */
+hbool_t inserted = FALSE; /* Whether the header was inserted into cache */
+
+/* Sanity check */
+HDassert(hdr);
+HDassert(stats_changed);
+
+/* Allocate the index block */
+if (NULL == (iblock = H5EA__iblock_alloc(hdr)))
+ H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array index block")
+
+/* Set size of index block on disk */
+iblock->size = H5EA_IBLOCK_SIZE(iblock);
+
+/* Allocate space for the index block on disk */
+if (HADDR_UNDEF == (iblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_EARRAY_IBLOCK, (hsize_t)iblock->size)))
+ H5E_THROW(H5E_CANTALLOC, "file allocation failed for extensible array index block")
+iblock->addr = iblock_addr;
+
+/* Clear any elements in index block to fill value */
+if (hdr->cparam.idx_blk_elmts > 0) {
+ /* Call the class's 'fill' callback */
+ if ((hdr->cparam.cls->fill)(iblock->elmts, (size_t)hdr->cparam.idx_blk_elmts) < 0)
+ H5E_THROW(H5E_CANTSET, "can't set extensible array index block elements to class's fill value")
+} /* end if */
+
+/* Reset any data block addresses in the index block */
+if (iblock->ndblk_addrs > 0) {
+ haddr_t tmp_addr = HADDR_UNDEF; /* Address value to fill data block addresses with */
+
+ /* Set all the data block addresses to "undefined" address value */
+ H5VM_array_fill(iblock->dblk_addrs, &tmp_addr, sizeof(haddr_t), iblock->ndblk_addrs);
+} /* end if */
+
+/* Reset any super block addresses in the index block */
+if (iblock->nsblk_addrs > 0) {
+ haddr_t tmp_addr = HADDR_UNDEF; /* Address value to fill super block addresses with */
+
+ /* Set all the super block addresses to "undefined" address value */
+ H5VM_array_fill(iblock->sblk_addrs, &tmp_addr, sizeof(haddr_t), iblock->nsblk_addrs);
+} /* end if */
+
+/* Cache the new extensible array index block */
+if (H5AC_insert_entry(hdr->f, H5AC_EARRAY_IBLOCK, iblock_addr, iblock, H5AC__NO_FLAGS_SET) < 0)
+ H5E_THROW(H5E_CANTINSERT, "can't add extensible array index block to cache")
+inserted = TRUE;
+
+/* Add index block as child of 'top' proxy */
+if (hdr->top_proxy) {
+ if (H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, iblock) < 0)
+ H5E_THROW(H5E_CANTSET, "unable to add extensible array entry as child of array proxy")
+ iblock->top_proxy = hdr->top_proxy;
+} /* end if */
+
+/* Update extensible array index block statistics */
+HDassert(0 == hdr->stats.computed.nindex_blks);
+HDassert(0 == hdr->stats.computed.index_blk_size);
+hdr->stats.computed.nindex_blks = 1;
+hdr->stats.computed.index_blk_size = iblock->size;
+
+/* Increment count of elements "realized" */
+hdr->stats.stored.nelmts += hdr->cparam.idx_blk_elmts;
+
+/* Mark the statistics as changed */
+*stats_changed = TRUE;
+
+/* Set address of index block to return */
+ret_value = iblock_addr;
CATCH
- if(!H5F_addr_defined(ret_value))
- if(iblock) {
- /* Remove from cache, if inserted */
- if(inserted)
- if(H5AC_remove_entry(iblock) < 0)
- H5E_THROW(H5E_CANTREMOVE, "unable to remove extensible array index block from cache")
-
- /* Release index block's disk space */
- if(H5F_addr_defined(iblock->addr) && H5MF_xfree(hdr->f, H5FD_MEM_EARRAY_IBLOCK, iblock->addr, (hsize_t)iblock->size) < 0)
- H5E_THROW(H5E_CANTFREE, "unable to release file space for extensible array index block")
-
- /* Destroy index block */
- if(H5EA__iblock_dest(iblock) < 0)
- H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array index block")
- } /* end if */
+if (!H5F_addr_defined(ret_value))
+ if (iblock) {
+ /* Remove from cache, if inserted */
+ if (inserted)
+ if (H5AC_remove_entry(iblock) < 0)
+ H5E_THROW(H5E_CANTREMOVE, "unable to remove extensible array index block from cache")
+
+ /* Release index block's disk space */
+ if (H5F_addr_defined(iblock->addr) &&
+ H5MF_xfree(hdr->f, H5FD_MEM_EARRAY_IBLOCK, iblock->addr, (hsize_t)iblock->size) < 0)
+ H5E_THROW(H5E_CANTFREE, "unable to release file space for extensible array index block")
+
+ /* Destroy index block */
+ if (H5EA__iblock_dest(iblock) < 0)
+ H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array index block")
+ } /* end if */
-END_FUNC(PKG) /* end H5EA__iblock_create() */
+END_FUNC(PKG) /* end H5EA__iblock_create() */
-
/*-------------------------------------------------------------------------
* Function: H5EA__iblock_protect
*
@@ -274,45 +260,45 @@ END_FUNC(PKG) /* end H5EA__iblock_create() */
*
*-------------------------------------------------------------------------
*/
-BEGIN_FUNC(PKG, ERR,
-H5EA_iblock_t *, NULL, NULL,
-H5EA__iblock_protect(H5EA_hdr_t *hdr, unsigned flags))
+BEGIN_FUNC(PKG, ERR, H5EA_iblock_t *, NULL, NULL, H5EA__iblock_protect(H5EA_hdr_t *hdr, unsigned flags))
- /* Local variables */
- H5EA_iblock_t *iblock = NULL; /* Pointer to index block */
+/* Local variables */
+H5EA_iblock_t *iblock = NULL; /* Pointer to index block */
- /* Sanity check */
- HDassert(hdr);
+/* Sanity check */
+HDassert(hdr);
- /* only the H5AC__READ_ONLY_FLAG may be set */
- HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
+/* only the H5AC__READ_ONLY_FLAG may be set */
+HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
- /* Protect the index block */
- if(NULL == (iblock = (H5EA_iblock_t *)H5AC_protect(hdr->f, H5AC_EARRAY_IBLOCK, hdr->idx_blk_addr, hdr, flags)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
+/* Protect the index block */
+if (NULL ==
+ (iblock = (H5EA_iblock_t *)H5AC_protect(hdr->f, H5AC_EARRAY_IBLOCK, hdr->idx_blk_addr, hdr, flags)))
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu",
+ (unsigned long long)hdr->idx_blk_addr)
- /* Create top proxy, if it doesn't exist */
- if(hdr->top_proxy && NULL == iblock->top_proxy) {
- /* Add index block as child of 'top' proxy */
- if(H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, iblock) < 0)
- H5E_THROW(H5E_CANTSET, "unable to add extensible array entry as child of array proxy")
- iblock->top_proxy = hdr->top_proxy;
- } /* end if */
+/* Create top proxy, if it doesn't exist */
+if (hdr->top_proxy && NULL == iblock->top_proxy) {
+ /* Add index block as child of 'top' proxy */
+ if (H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, iblock) < 0)
+ H5E_THROW(H5E_CANTSET, "unable to add extensible array entry as child of array proxy")
+ iblock->top_proxy = hdr->top_proxy;
+} /* end if */
- /* Set return value */
- ret_value = iblock;
+/* Set return value */
+ret_value = iblock;
CATCH
- /* Clean up on error */
- if(!ret_value) {
- /* Release the index block, if it was protected */
- if(iblock && H5AC_unprotect(hdr->f, H5AC_EARRAY_IBLOCK, iblock->addr, iblock, H5AC__NO_FLAGS_SET) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array index block, address = %llu", (unsigned long long)iblock->addr)
- } /* end if */
+/* Clean up on error */
+if (!ret_value) {
+ /* Release the index block, if it was protected */
+ if (iblock && H5AC_unprotect(hdr->f, H5AC_EARRAY_IBLOCK, iblock->addr, iblock, H5AC__NO_FLAGS_SET) < 0)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array index block, address = %llu",
+ (unsigned long long)iblock->addr)
+} /* end if */
-END_FUNC(PKG) /* end H5EA__iblock_protect() */
+END_FUNC(PKG) /* end H5EA__iblock_protect() */
-
/*-------------------------------------------------------------------------
* Function: H5EA__iblock_unprotect
*
@@ -325,24 +311,23 @@ END_FUNC(PKG) /* end H5EA__iblock_protect() */
*
*-------------------------------------------------------------------------
*/
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5EA__iblock_unprotect(H5EA_iblock_t *iblock, unsigned cache_flags))
+BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL,
+ H5EA__iblock_unprotect(H5EA_iblock_t *iblock, unsigned cache_flags))
- /* Local variables */
+/* Local variables */
- /* Sanity check */
- HDassert(iblock);
+/* Sanity check */
+HDassert(iblock);
- /* Unprotect the index block */
- if(H5AC_unprotect(iblock->hdr->f, H5AC_EARRAY_IBLOCK, iblock->addr, iblock, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array index block, address = %llu", (unsigned long long)iblock->addr)
+/* Unprotect the index block */
+if (H5AC_unprotect(iblock->hdr->f, H5AC_EARRAY_IBLOCK, iblock->addr, iblock, cache_flags) < 0)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array index block, address = %llu",
+ (unsigned long long)iblock->addr)
CATCH
-END_FUNC(PKG) /* end H5EA__iblock_unprotect() */
+END_FUNC(PKG) /* end H5EA__iblock_unprotect() */
-
/*-------------------------------------------------------------------------
* Function: H5EA__iblock_delete
*
@@ -355,73 +340,73 @@ END_FUNC(PKG) /* end H5EA__iblock_unprotect() */
*
*-------------------------------------------------------------------------
*/
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5EA__iblock_delete(H5EA_hdr_t *hdr))
-
- /* Local variables */
- H5EA_iblock_t *iblock = NULL; /* Pointer to index block */
-
- /* Sanity check */
- HDassert(hdr);
- HDassert(H5F_addr_defined(hdr->idx_blk_addr));
-
- /* Protect index block */
- if(NULL == (iblock = H5EA__iblock_protect(hdr, H5AC__NO_FLAGS_SET)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
-
- /* Check for index block having data block pointers */
- if(iblock->ndblk_addrs > 0) {
- unsigned sblk_idx; /* Current super block index */
- unsigned dblk_idx; /* Current data block index w/in super block */
- size_t u; /* Local index variable */
-
- /* Iterate over data blocks */
- sblk_idx = dblk_idx = 0;
- for(u = 0; u < iblock->ndblk_addrs; u++) {
- /* Check for data block existing */
- if(H5F_addr_defined(iblock->dblk_addrs[u])) {
- /* Delete data block */
- if(H5EA__dblock_delete(hdr, iblock, iblock->dblk_addrs[u], hdr->sblk_info[sblk_idx].dblk_nelmts) < 0)
- H5E_THROW(H5E_CANTDELETE, "unable to delete extensible array data block")
- iblock->dblk_addrs[u] = HADDR_UNDEF;
- } /* end if */
-
- /* Advance to next data block w/in super block */
- dblk_idx++;
-
- /* Check for moving to next super block */
- if(dblk_idx >= hdr->sblk_info[sblk_idx].ndblks) {
- sblk_idx++;
- dblk_idx = 0;
- } /* end if */
- } /* end for */
- } /* end if */
+BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__iblock_delete(H5EA_hdr_t *hdr))
+
+/* Local variables */
+H5EA_iblock_t *iblock = NULL; /* Pointer to index block */
+
+/* Sanity check */
+HDassert(hdr);
+HDassert(H5F_addr_defined(hdr->idx_blk_addr));
+
+/* Protect index block */
+if (NULL == (iblock = H5EA__iblock_protect(hdr, H5AC__NO_FLAGS_SET)))
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu",
+ (unsigned long long)hdr->idx_blk_addr)
+
+/* Check for index block having data block pointers */
+if (iblock->ndblk_addrs > 0) {
+ unsigned sblk_idx; /* Current super block index */
+ unsigned dblk_idx; /* Current data block index w/in super block */
+ size_t u; /* Local index variable */
+
+ /* Iterate over data blocks */
+ sblk_idx = dblk_idx = 0;
+ for (u = 0; u < iblock->ndblk_addrs; u++) {
+ /* Check for data block existing */
+ if (H5F_addr_defined(iblock->dblk_addrs[u])) {
+ /* Delete data block */
+ if (H5EA__dblock_delete(hdr, iblock, iblock->dblk_addrs[u],
+ hdr->sblk_info[sblk_idx].dblk_nelmts) < 0)
+ H5E_THROW(H5E_CANTDELETE, "unable to delete extensible array data block")
+ iblock->dblk_addrs[u] = HADDR_UNDEF;
+ } /* end if */
- /* Check for index block having data block pointers (not yet) */
- if(iblock->nsblk_addrs > 0) {
- size_t u; /* Local index variable */
-
- /* Iterate over super blocks */
- for(u = 0; u < iblock->nsblk_addrs; u++) {
- /* Check for data block existing */
- if(H5F_addr_defined(iblock->sblk_addrs[u])) {
- /* Delete super block */
- if(H5EA__sblock_delete(hdr, iblock, iblock->sblk_addrs[u], (unsigned)(u + iblock->nsblks)) < 0)
- H5E_THROW(H5E_CANTDELETE, "unable to delete extensible array super block")
- iblock->sblk_addrs[u] = HADDR_UNDEF;
- } /* end if */
- } /* end for */
- } /* end if */
+ /* Advance to next data block w/in super block */
+ dblk_idx++;
+
+ /* Check for moving to next super block */
+ if (dblk_idx >= hdr->sblk_info[sblk_idx].ndblks) {
+ sblk_idx++;
+ dblk_idx = 0;
+ } /* end if */
+ } /* end for */
+} /* end if */
+
+/* Check for index block having data block pointers (not yet) */
+if (iblock->nsblk_addrs > 0) {
+ size_t u; /* Local index variable */
+
+ /* Iterate over super blocks */
+ for (u = 0; u < iblock->nsblk_addrs; u++) {
+ /* Check for data block existing */
+ if (H5F_addr_defined(iblock->sblk_addrs[u])) {
+ /* Delete super block */
+ if (H5EA__sblock_delete(hdr, iblock, iblock->sblk_addrs[u], (unsigned)(u + iblock->nsblks)) < 0)
+ H5E_THROW(H5E_CANTDELETE, "unable to delete extensible array super block")
+ iblock->sblk_addrs[u] = HADDR_UNDEF;
+ } /* end if */
+ } /* end for */
+} /* end if */
CATCH
- /* Finished deleting index block in metadata cache */
- if(iblock && H5EA__iblock_unprotect(iblock, H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array index block")
+/* Finished deleting index block in metadata cache */
+if (iblock &&
+ H5EA__iblock_unprotect(iblock, H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array index block")
-END_FUNC(PKG) /* end H5EA__iblock_delete() */
+END_FUNC(PKG) /* end H5EA__iblock_delete() */
-
/*-------------------------------------------------------------------------
* Function: H5EA__iblock_dest
*
@@ -434,51 +419,48 @@ END_FUNC(PKG) /* end H5EA__iblock_delete() */
*
*-------------------------------------------------------------------------
*/
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5EA__iblock_dest(H5EA_iblock_t *iblock))
-
- /* Sanity check */
- HDassert(iblock);
-
- /* Check if shared header field has been initialized */
- if(iblock->hdr) {
- /* Check if we've got elements in the index block */
- if(iblock->elmts) {
- /* Free buffer for index block elements */
- HDassert(iblock->hdr->cparam.idx_blk_elmts > 0);
- iblock->elmts = H5FL_BLK_FREE(idx_blk_elmt_buf, iblock->elmts);
- } /* end if */
-
- /* Check if we've got data block addresses in the index block */
- if(iblock->dblk_addrs) {
- /* Free buffer for index block data block addresses */
- HDassert(iblock->ndblk_addrs > 0);
- iblock->dblk_addrs = H5FL_SEQ_FREE(haddr_t, iblock->dblk_addrs);
- iblock->ndblk_addrs = 0;
- } /* end if */
+BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__iblock_dest(H5EA_iblock_t *iblock))
+
+/* Sanity check */
+HDassert(iblock);
+
+/* Check if shared header field has been initialized */
+if (iblock->hdr) {
+ /* Check if we've got elements in the index block */
+ if (iblock->elmts) {
+ /* Free buffer for index block elements */
+ HDassert(iblock->hdr->cparam.idx_blk_elmts > 0);
+ iblock->elmts = H5FL_BLK_FREE(idx_blk_elmt_buf, iblock->elmts);
+ } /* end if */
- /* Check if we've got super block addresses in the index block */
- if(iblock->sblk_addrs) {
- /* Free buffer for index block super block addresses */
- HDassert(iblock->nsblk_addrs > 0);
- iblock->sblk_addrs = H5FL_SEQ_FREE(haddr_t, iblock->sblk_addrs);
- iblock->nsblk_addrs = 0;
- } /* end if */
+ /* Check if we've got data block addresses in the index block */
+ if (iblock->dblk_addrs) {
+ /* Free buffer for index block data block addresses */
+ HDassert(iblock->ndblk_addrs > 0);
+ iblock->dblk_addrs = H5FL_SEQ_FREE(haddr_t, iblock->dblk_addrs);
+ iblock->ndblk_addrs = 0;
+ } /* end if */
- /* Decrement reference count on shared info */
- if(H5EA__hdr_decr(iblock->hdr) < 0)
- H5E_THROW(H5E_CANTDEC, "can't decrement reference count on shared array header")
- iblock->hdr = NULL;
+ /* Check if we've got super block addresses in the index block */
+ if (iblock->sblk_addrs) {
+ /* Free buffer for index block super block addresses */
+ HDassert(iblock->nsblk_addrs > 0);
+ iblock->sblk_addrs = H5FL_SEQ_FREE(haddr_t, iblock->sblk_addrs);
+ iblock->nsblk_addrs = 0;
} /* end if */
- /* Sanity check */
- HDassert(NULL == iblock->top_proxy);
+ /* Decrement reference count on shared info */
+ if (H5EA__hdr_decr(iblock->hdr) < 0)
+ H5E_THROW(H5E_CANTDEC, "can't decrement reference count on shared array header")
+ iblock->hdr = NULL;
+} /* end if */
- /* Free the index block itself */
- iblock = H5FL_FREE(H5EA_iblock_t, iblock);
+/* Sanity check */
+HDassert(NULL == iblock->top_proxy);
-CATCH
+/* Free the index block itself */
+iblock = H5FL_FREE(H5EA_iblock_t, iblock);
-END_FUNC(PKG) /* end H5EA__iblock_dest() */
+CATCH
+END_FUNC(PKG) /* end H5EA__iblock_dest() */