diff options
Diffstat (limited to 'src/H5FAdblock.c')
| -rw-r--r-- | src/H5FAdblock.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/H5FAdblock.c b/src/H5FAdblock.c index a5489f1..e8cff4f 100644 --- a/src/H5FAdblock.c +++ b/src/H5FAdblock.c @@ -98,11 +98,11 @@ H5FA__dblock_alloc(H5FA_hdr_t *hdr) /* Allocate memory for the data block */ if (NULL == (dblock = H5FL_CALLOC(H5FA_dblock_t))) - HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, NULL, "memory allocation failed for fixed array data block") + HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, NULL, "memory allocation failed for fixed array data block"); /* Share common array information */ if (H5FA__hdr_incr(hdr) < 0) - HGOTO_ERROR(H5E_FARRAY, H5E_CANTINC, NULL, "can't increment reference count on shared array header") + HGOTO_ERROR(H5E_FARRAY, H5E_CANTINC, NULL, "can't increment reference count on shared array header"); dblock->hdr = hdr; /* Set non-zero internal fields */ @@ -125,7 +125,7 @@ H5FA__dblock_alloc(H5FA_hdr_t *hdr) /* Allocate space for 'page init' flags */ if (NULL == (dblock->dblk_page_init = H5FL_BLK_CALLOC(fa_page_init, dblock->dblk_page_init_size))) - HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, NULL, "memory allocation failed for page init bitmask") + HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, NULL, "memory allocation failed for page init bitmask"); /* Compute data block page size */ dblock->dblk_page_size = (dblock->dblk_page_nelmts * hdr->cparam.raw_elmt_size) + H5FA_SIZEOF_CHKSUM; @@ -143,7 +143,7 @@ H5FA__dblock_alloc(H5FA_hdr_t *hdr) H5_CHECK_OVERFLOW(dblk_size, /* From: */ hsize_t, /* To: */ size_t); if (NULL == (dblock->elmts = H5FL_BLK_MALLOC(chunk_elmts, (size_t)dblk_size))) HGOTO_ERROR(H5E_FARRAY, 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 */ @@ -183,7 +183,7 @@ H5FA__dblock_create(H5FA_hdr_t *hdr, hbool_t *hdr_dirty) /* Allocate the data block */ if (NULL == (dblock = H5FA__dblock_alloc(hdr))) HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, HADDR_UNDEF, - "memory allocation failed for fixed array data block") + "memory allocation failed for fixed array data block"); /* Set size of data block on disk */ hdr->stats.dblk_size = dblock->size = H5FA_DBLOCK_SIZE(dblock); @@ -191,7 +191,7 @@ H5FA__dblock_create(H5FA_hdr_t *hdr, hbool_t *hdr_dirty) /* Allocate space for the data block on disk */ if (HADDR_UNDEF == (dblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_FARRAY_DBLOCK, (hsize_t)dblock->size))) HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, HADDR_UNDEF, - "file allocation failed for fixed array data block") + "file allocation failed for fixed array data block"); dblock->addr = dblock_addr; /* Don't initialize elements if paged */ @@ -199,18 +199,18 @@ H5FA__dblock_create(H5FA_hdr_t *hdr, hbool_t *hdr_dirty) /* Clear any elements in data block to fill value */ if ((hdr->cparam.cls->fill)(dblock->elmts, (size_t)hdr->cparam.nelmts) < 0) HGOTO_ERROR(H5E_FARRAY, H5E_CANTSET, HADDR_UNDEF, - "can't set fixed array data block elements to class's fill value") + "can't set fixed array data block elements to class's fill value"); /* Cache the new fixed array data block */ if (H5AC_insert_entry(hdr->f, H5AC_FARRAY_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0) - HGOTO_ERROR(H5E_FARRAY, H5E_CANTINSERT, HADDR_UNDEF, "can't add fixed array data block to cache") + HGOTO_ERROR(H5E_FARRAY, H5E_CANTINSERT, HADDR_UNDEF, "can't add fixed 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_FARRAY, H5E_CANTSET, HADDR_UNDEF, - "unable to add fixed array entry as child of array proxy") + "unable to add fixed array entry as child of array proxy"); dblock->top_proxy = hdr->top_proxy; } /* end if */ @@ -278,14 +278,15 @@ H5FA__dblock_protect(H5FA_hdr_t *hdr, haddr_t dblk_addr, unsigned flags) if (NULL == (dblock = (H5FA_dblock_t *)H5AC_protect(hdr->f, H5AC_FARRAY_DBLOCK, dblk_addr, &udata, flags))) HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, NULL, - "unable to protect fixed array data block, address = %llu", (unsigned long long)dblk_addr) + "unable to protect fixed array data block, address = %llu", + (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_FARRAY, H5E_CANTSET, NULL, - "unable to add fixed array entry as child of array proxy") + "unable to add fixed array entry as child of array proxy"); dblock->top_proxy = hdr->top_proxy; } /* end if */ @@ -328,7 +329,7 @@ H5FA__dblock_unprotect(H5FA_dblock_t *dblock, unsigned cache_flags) if (H5AC_unprotect(dblock->hdr->f, H5AC_FARRAY_DBLOCK, dblock->addr, dblock, cache_flags) < 0) HGOTO_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, FAIL, "unable to unprotect fixed array data block, address = %llu", - (unsigned long long)dblock->addr) + (unsigned long long)dblock->addr); done: FUNC_LEAVE_NOAPI(ret_value) @@ -358,7 +359,8 @@ H5FA__dblock_delete(H5FA_hdr_t *hdr, haddr_t dblk_addr) /* Protect data block */ if (NULL == (dblock = H5FA__dblock_protect(hdr, dblk_addr, H5AC__NO_FLAGS_SET))) HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, FAIL, - "unable to protect fixed array data block, address = %llu", (unsigned long long)dblk_addr) + "unable to protect fixed array data block, address = %llu", + (unsigned long long)dblk_addr); /* Check if data block is paged */ if (dblock->npages) { @@ -374,7 +376,7 @@ H5FA__dblock_delete(H5FA_hdr_t *hdr, haddr_t dblk_addr) /* (OK to call if it doesn't exist in the cache) */ if (H5AC_expunge_entry(hdr->f, H5AC_FARRAY_DBLK_PAGE, dblk_page_addr, H5AC__NO_FLAGS_SET) < 0) HGOTO_ERROR(H5E_FARRAY, 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 += dblock->dblk_page_size; @@ -429,7 +431,7 @@ H5FA__dblock_dest(H5FA_dblock_t *dblock) /* Decrement reference count on shared info */ if (H5FA__hdr_decr(dblock->hdr) < 0) HGOTO_ERROR(H5E_FARRAY, 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 */ |