diff options
Diffstat (limited to 'src/H5EAdblock.c')
| -rw-r--r-- | src/H5EAdblock.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/H5EAdblock.c b/src/H5EAdblock.c index ea11aa9..64b01ed 100644 --- a/src/H5EAdblock.c +++ b/src/H5EAdblock.c @@ -95,11 +95,11 @@ H5EA__dblock_alloc(H5EA_hdr_t *hdr, void *parent, size_t nelmts) /* Allocate memory for the data block */ if (NULL == (dblock = H5FL_CALLOC(H5EA_dblock_t))) HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, NULL, - "memory allocation failed for extensible array data block") + "memory allocation failed for extensible array data block"); /* Share common array information */ if (H5EA__hdr_incr(hdr) < 0) - HGOTO_ERROR(H5E_EARRAY, H5E_CANTINC, NULL, "can't increment reference count on shared array header") + HGOTO_ERROR(H5E_EARRAY, H5E_CANTINC, NULL, "can't increment reference count on shared array header"); dblock->hdr = hdr; /* Set non-zero internal fields */ @@ -116,7 +116,7 @@ H5EA__dblock_alloc(H5EA_hdr_t *hdr, void *parent, size_t nelmts) /* Allocate buffer for elements in data block */ if (NULL == (dblock->elmts = H5EA__hdr_alloc_elmts(hdr, nelmts))) HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, NULL, - "memory allocation failed for data block element buffer") + "memory allocation failed for data block element buffer"); } /* end else */ /* Set the return value */ @@ -157,7 +157,7 @@ H5EA__dblock_create(H5EA_hdr_t *hdr, void *parent, hbool_t *stats_changed, hsize /* Allocate the data block */ if (NULL == (dblock = H5EA__dblock_alloc(hdr, parent, nelmts))) HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, HADDR_UNDEF, - "memory allocation failed for extensible array data block") + "memory allocation failed for extensible array data block"); /* Set size of data block on disk */ dblock->size = H5EA_DBLOCK_SIZE(dblock); @@ -168,7 +168,7 @@ H5EA__dblock_create(H5EA_hdr_t *hdr, void *parent, hbool_t *stats_changed, hsize /* Allocate space for the data block on disk */ if (HADDR_UNDEF == (dblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_EARRAY_DBLOCK, (hsize_t)dblock->size))) HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, HADDR_UNDEF, - "file allocation failed for extensible array data block") + "file allocation failed for extensible array data block"); dblock->addr = dblock_addr; /* Don't initialize elements if paged */ @@ -176,18 +176,19 @@ H5EA__dblock_create(H5EA_hdr_t *hdr, void *parent, hbool_t *stats_changed, hsize /* Clear any elements in data block to fill value */ if ((hdr->cparam.cls->fill)(dblock->elmts, (size_t)dblock->nelmts) < 0) HGOTO_ERROR(H5E_EARRAY, H5E_CANTSET, HADDR_UNDEF, - "can't set extensible array data block elements to class's fill value") + "can't set extensible array data block elements to class's fill value"); /* Cache the new extensible array data block */ if (H5AC_insert_entry(hdr->f, H5AC_EARRAY_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0) - HGOTO_ERROR(H5E_EARRAY, H5E_CANTINSERT, HADDR_UNDEF, "can't add extensible array data block to cache") + HGOTO_ERROR(H5E_EARRAY, H5E_CANTINSERT, HADDR_UNDEF, + "can't add extensible array data block to cache"); inserted = TRUE; /* Add data block as child of 'top' proxy */ if (hdr->top_proxy) { if (H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, dblock) < 0) HGOTO_ERROR(H5E_EARRAY, H5E_CANTSET, HADDR_UNDEF, - "unable to add extensible array entry as child of array proxy") + "unable to add extensible array entry as child of array proxy"); dblock->top_proxy = hdr->top_proxy; } /* end if */ @@ -296,14 +297,14 @@ H5EA__dblock_protect(H5EA_hdr_t *hdr, void *parent, haddr_t dblk_addr, size_t db (dblock = (H5EA_dblock_t *)H5AC_protect(hdr->f, H5AC_EARRAY_DBLOCK, dblk_addr, &udata, flags))) HGOTO_ERROR(H5E_EARRAY, H5E_CANTPROTECT, NULL, "unable to protect extensible array data block, address = %llu", - (unsigned long long)dblk_addr) + (unsigned long long)dblk_addr); /* Create top proxy, if it doesn't exist */ if (hdr->top_proxy && NULL == dblock->top_proxy) { /* Add data block as child of 'top' proxy */ if (H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, dblock) < 0) HGOTO_ERROR(H5E_EARRAY, H5E_CANTSET, NULL, - "unable to add extensible array entry as child of array proxy") + "unable to add extensible array entry as child of array proxy"); dblock->top_proxy = hdr->top_proxy; } @@ -348,7 +349,7 @@ H5EA__dblock_unprotect(H5EA_dblock_t *dblock, unsigned cache_flags) if (H5AC_unprotect(dblock->hdr->f, H5AC_EARRAY_DBLOCK, dblock->addr, dblock, cache_flags) < 0) HGOTO_ERROR(H5E_EARRAY, H5E_CANTUNPROTECT, FAIL, "unable to unprotect extensible array data block, address = %llu", - (unsigned long long)dblock->addr) + (unsigned long long)dblock->addr); done: @@ -382,7 +383,7 @@ H5EA__dblock_delete(H5EA_hdr_t *hdr, void *parent, haddr_t dblk_addr, size_t dbl if (NULL == (dblock = H5EA__dblock_protect(hdr, parent, dblk_addr, dblk_nelmts, H5AC__NO_FLAGS_SET))) HGOTO_ERROR(H5E_EARRAY, H5E_CANTPROTECT, FAIL, "unable to protect extensible array data block, address = %llu", - (unsigned long long)dblk_addr) + (unsigned long long)dblk_addr); /* Check if this is a paged data block */ if (dblk_nelmts > hdr->dblk_page_nelmts) { @@ -401,7 +402,7 @@ H5EA__dblock_delete(H5EA_hdr_t *hdr, void *parent, haddr_t dblk_addr, size_t dbl /* (OK to call if it doesn't exist in the cache) */ if (H5AC_expunge_entry(hdr->f, H5AC_EARRAY_DBLK_PAGE, dblk_page_addr, H5AC__NO_FLAGS_SET) < 0) HGOTO_ERROR(H5E_EARRAY, H5E_CANTEXPUNGE, FAIL, - "unable to remove array data block page from metadata cache") + "unable to remove array data block page from metadata cache"); /* Advance to next page address */ dblk_page_addr += dblk_page_size; @@ -445,7 +446,7 @@ H5EA__dblock_dest(H5EA_dblock_t *dblock) assert(dblock->nelmts > 0); if (H5EA__hdr_free_elmts(dblock->hdr, dblock->nelmts, dblock->elmts) < 0) HGOTO_ERROR(H5E_EARRAY, H5E_CANTFREE, FAIL, - "unable to free extensible array data block element buffer") + "unable to free extensible array data block element buffer"); dblock->elmts = NULL; dblock->nelmts = 0; } /* end if */ @@ -453,7 +454,7 @@ H5EA__dblock_dest(H5EA_dblock_t *dblock) /* Decrement reference count on shared info */ if (H5EA__hdr_decr(dblock->hdr) < 0) HGOTO_ERROR(H5E_EARRAY, H5E_CANTDEC, FAIL, - "can't decrement reference count on shared array header") + "can't decrement reference count on shared array header"); dblock->hdr = NULL; } /* end if */ |