diff options
| -rw-r--r-- | src/H5EA.c | 110 | ||||
| -rw-r--r-- | src/H5EAdbg.c | 6 | ||||
| -rw-r--r-- | src/H5EAiblock.c | 2 | ||||
| -rw-r--r-- | test/earray.c | 16 |
4 files changed, 117 insertions, 17 deletions
@@ -325,8 +325,10 @@ H5EA_set(const H5EA_t *ea, hid_t dxpl_id, hsize_t idx, const void *elmt)) /* Local variables */ H5EA_hdr_t *hdr = ea->hdr; /* Header for EA */ H5EA_iblock_t *iblock = NULL; /* Pointer to index block for EA */ + H5EA_sblock_t *sblock = NULL; /* Pointer to super block for EA */ H5EA_dblock_t *dblock = NULL; /* Pointer to data block for EA */ unsigned iblock_cache_flags = H5AC__NO_FLAGS_SET; /* Flags to unprotecting index block */ + unsigned sblock_cache_flags = H5AC__NO_FLAGS_SET; /* Flags to unprotecting super block */ unsigned dblock_cache_flags = H5AC__NO_FLAGS_SET; /* Flags to unprotecting data block */ hbool_t hdr_dirty = FALSE; /* Whether header information changed */ @@ -376,6 +378,7 @@ HDfprintf(stderr, "%s: Index block address is: %a\n", FUNC, hdr->idx_blk_addr); } /* end if */ else { unsigned sblk_idx; /* Which superblock does this index fall in? */ + size_t dblk_idx; /* Data block index */ hsize_t elmt_idx; /* Offset of element in super block */ /* Get super block index where element is located */ @@ -392,8 +395,6 @@ HDfprintf(stderr, "%s: after adjusting for super block elements, elmt_idx = %Hu\ /* Check for data block containing element address in the index block */ if(sblk_idx < iblock->nsblks) { - size_t dblk_idx; /* Data block index */ - #ifdef QAK HDfprintf(stderr, "%s: Element in data block pointed to by address in index block\n", FUNC); #endif /* QAK */ @@ -435,17 +436,25 @@ HDfprintf(stderr, "%s: dblk_idx = %u, iblock->ndblk_addrs = %Zu\n", FUNC, dblk_i dblock_cache_flags |= H5AC__DIRTIED_FLAG; } /* end if */ else { + unsigned sblk_off; /* Offset of super block in index block array of super blocks */ + + /* Calculate offset of super block in index block's array */ + sblk_off = sblk_idx - iblock->nsblks; + /* Check if the super block has been allocated on disk yet */ - if(!H5F_addr_defined(iblock->sblk_addrs[sblk_idx - iblock->nsblks])) { + if(!H5F_addr_defined(iblock->sblk_addrs[sblk_off])) { haddr_t sblk_addr; /* Address of data block created */ /* Create super block */ sblk_addr = H5EA__sblock_create(hdr, dxpl_id, sblk_idx); +#ifdef QAK +HDfprintf(stderr, "%s: New super block address is: %a\n", FUNC, sblk_addr); +#endif /* QAK */ if(!H5F_addr_defined(sblk_addr)) H5E_THROW(H5E_CANTCREATE, "unable to create extensible array super block") /* Set super block address in index block */ - iblock->sblk_addrs[sblk_idx - iblock->nsblks] = sblk_addr; + iblock->sblk_addrs[sblk_off] = sblk_addr; iblock_cache_flags |= H5AC__DIRTIED_FLAG; /* Increment count of actual super blocks created */ @@ -453,8 +462,46 @@ HDfprintf(stderr, "%s: dblk_idx = %u, iblock->ndblk_addrs = %Zu\n", FUNC, dblk_i hdr_dirty = TRUE; } /* end if */ -HDfprintf(stderr, "%s: Super block index %u not supported yet!\n", FUNC, sblk_idx); -HDassert(0 && "Super block index location not supported!"); + /* Protect super block */ + if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, iblock->sblk_addrs[sblk_off], sblk_idx, H5AC_WRITE))) + H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)iblock->sblk_addrs[sblk_off]) + + /* Compute the data block index in super block */ + dblk_idx = (size_t)(elmt_idx / sblock->dblk_nelmts); +#ifdef QAK +HDfprintf(stderr, "%s: dblk_idx = %u, sblock->ndblks = %Zu\n", FUNC, dblk_idx, sblock->ndblks); +#endif /* QAK */ + HDassert(dblk_idx < sblock->ndblks); + + /* Check if the data block has been allocated on disk yet */ + if(!H5F_addr_defined(sblock->dblk_addrs[dblk_idx])) { + haddr_t dblk_addr; /* Address of data block created */ + + /* Create data block */ + dblk_addr = H5EA__dblock_create(hdr, dxpl_id, sblock->dblk_nelmts); + if(!H5F_addr_defined(dblk_addr)) + H5E_THROW(H5E_CANTCREATE, "unable to create extensible array data block") + + /* Set data block address in index block */ + sblock->dblk_addrs[dblk_idx] = dblk_addr; + sblock_cache_flags |= H5AC__DIRTIED_FLAG; + + /* Increment count of elements "realized" and actual data blocks created */ + hdr->stats.ndata_blks++; + hdr->stats.nelmts += hdr->sblk_info[sblk_idx].dblk_nelmts; + hdr_dirty = TRUE; + } /* end if */ + + /* Protect data block */ + if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, sblock->dblk_addrs[dblk_idx], sblock->dblk_nelmts, H5AC_WRITE))) + H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)sblock->dblk_addrs[dblk_idx]) + + /* Adjust index to offset in data block */ + elmt_idx %= sblock->dblk_nelmts; + + /* Set element in data block */ + HDmemcpy(((uint8_t *)dblock->elmts) + (hdr->cparam.cls->nat_elmt_size * elmt_idx), elmt, hdr->cparam.cls->nat_elmt_size); + dblock_cache_flags |= H5AC__DIRTIED_FLAG; } /* end else */ } /* end else */ @@ -476,6 +523,8 @@ CATCH /* Release resources */ if(iblock && H5EA__iblock_unprotect(iblock, dxpl_id, iblock_cache_flags) < 0) H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array index block") + if(sblock && H5EA__sblock_unprotect(sblock, dxpl_id, sblock_cache_flags) < 0) + H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array super block") if(dblock && H5EA__dblock_unprotect(dblock, dxpl_id, dblock_cache_flags) < 0) H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array data block") @@ -502,6 +551,7 @@ H5EA_get(const H5EA_t *ea, hid_t dxpl_id, hsize_t idx, void *elmt)) /* Local variables */ H5EA_hdr_t *hdr = ea->hdr; /* Header for EA */ H5EA_iblock_t *iblock = NULL; /* Pointer to index block for EA */ + H5EA_sblock_t *sblock = NULL; /* Pointer to super block for EA */ H5EA_dblock_t *dblock = NULL; /* Pointer to data block for EA */ #ifdef QAK @@ -543,6 +593,7 @@ HDfprintf(stderr, "%s: Index block address is: %a\n", FUNC, hdr->idx_blk_addr); } /* end if */ else { unsigned sblk_idx; /* Which superblock does this index fall in? */ + size_t dblk_idx; /* Data block index */ hsize_t elmt_idx; /* Offset of element in super block */ /* Get super block index where element is located */ @@ -556,8 +607,6 @@ HDfprintf(stderr, "%s: after adjusting for super block elements, elmt_idx = %Hu\ /* Check for data block containing element address in the index block */ if(sblk_idx < iblock->nsblks) { - size_t dblk_idx; /* Data block index */ - #ifdef QAK HDfprintf(stderr, "%s: Element in data block pointed to by address in index block\n", FUNC); #endif /* QAK */ @@ -587,8 +636,47 @@ HDfprintf(stderr, "%s: dblk_idx = %u\n", FUNC, dblk_idx); } /* end else */ } /* end if */ else { -HDfprintf(stderr, "%s: Super block index %Hu not supported yet!\n", FUNC, sblk_idx); -HDassert(0 && "Super block index location not supported!"); + unsigned sblk_off; /* Offset of super block in index block array of super blocks */ + + /* Calculate offset of super block in index block's array */ + sblk_off = sblk_idx - iblock->nsblks; + + /* Check if the super block has been allocated on disk yet */ + if(!H5F_addr_defined(iblock->sblk_addrs[sblk_off])) { + /* Call the class's 'fill' callback */ + if((hdr->cparam.cls->fill)(elmt, (size_t)1) < 0) + H5E_THROW(H5E_CANTSET, "can't set element to class's fill value") + } /* end if */ + else { + /* Protect super block */ + if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, iblock->sblk_addrs[sblk_off], sblk_idx, H5AC_READ))) + H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)iblock->sblk_addrs[sblk_off]) + + /* Compute the data block index in super block */ + dblk_idx = (size_t)(elmt_idx / sblock->dblk_nelmts); +#ifdef QAK +HDfprintf(stderr, "%s: dblk_idx = %u, sblock->ndblks = %Zu\n", FUNC, dblk_idx, sblock->ndblks); +#endif /* QAK */ + HDassert(dblk_idx < sblock->ndblks); + + /* Check if the data block has been allocated on disk yet */ + if(!H5F_addr_defined(sblock->dblk_addrs[dblk_idx])) { + /* Call the class's 'fill' callback */ + if((hdr->cparam.cls->fill)(elmt, (size_t)1) < 0) + H5E_THROW(H5E_CANTSET, "can't set element to class's fill value") + } /* end if */ + else { + /* Protect data block */ + if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, sblock->dblk_addrs[dblk_idx], sblock->dblk_nelmts, H5AC_READ))) + H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)sblock->dblk_addrs[dblk_idx]) + + /* Adjust index to offset in data block */ + elmt_idx %= sblock->dblk_nelmts; + + /* Retrieve element from data block */ + HDmemcpy(elmt, ((uint8_t *)dblock->elmts) + (hdr->cparam.cls->nat_elmt_size * elmt_idx), hdr->cparam.cls->nat_elmt_size); + } /* end else */ + } /* end else */ } /* end else */ } /* end else */ } /* end else */ @@ -596,6 +684,8 @@ HDassert(0 && "Super block index location not supported!"); CATCH if(iblock && H5EA__iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET) < 0) H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array index block") + if(sblock && H5EA__sblock_unprotect(sblock, dxpl_id, H5AC__NO_FLAGS_SET) < 0) + H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array super block") if(dblock && H5EA__dblock_unprotect(dblock, dxpl_id, H5AC__NO_FLAGS_SET) < 0) H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array data block") diff --git a/src/H5EAdbg.c b/src/H5EAdbg.c index 7b2d839..47fcbd0 100644 --- a/src/H5EAdbg.c +++ b/src/H5EAdbg.c @@ -313,9 +313,6 @@ H5EA__sblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde if(NULL == (hdr = (H5EA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_EARRAY_HDR, hdr_addr, cls, NULL, H5AC_READ))) H5E_THROW(H5E_CANTPROTECT, "unable to load extensible array header") - /* Sanity check */ - HDassert(H5F_addr_eq(hdr->idx_blk_addr, addr)); - /* Protect super block */ if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, addr, sblk_idx, H5AC_READ))) H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)addr) @@ -334,6 +331,9 @@ H5EA__sblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "# of data block addresses in super block:", sblock->ndblks); + HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, + "# of elements in data blocks from this super block:", + sblock->dblk_nelmts); /* Check if there are any data block addresses in super block */ if(sblock->ndblks > 0) { diff --git a/src/H5EAiblock.c b/src/H5EAiblock.c index 78db20e..152d438 100644 --- a/src/H5EAiblock.c +++ b/src/H5EAiblock.c @@ -391,8 +391,6 @@ HDfprintf(stderr, "%s: Called\n", FUNC); if(H5EA__sblock_delete(hdr, dxpl_id, 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; -HDfprintf(stderr, "%s: Deleting super blocks not tested yet!\n", FUNC); -HDassert(0 && "Deleting super blocks not tested!"); } /* end if */ } /* end for */ } /* end if */ diff --git a/test/earray.c b/test/earray.c index 5f75596..83759d8 100644 --- a/test/earray.c +++ b/test/earray.c @@ -969,6 +969,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, H5F_t *f = NULL; /* Internal file object pointer */ H5EA_t *ea = NULL; /* Extensible array wrapper */ earray_state_t state; /* State of extensible array */ + unsigned base_sblk_idx = UINT_MAX; /* Starting index for actual superblocks */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ hsize_t nelmts_written; /* Highest element written in array */ @@ -1056,11 +1057,24 @@ HDfprintf(stderr, "idx = %Hu, tparam->sblk_info[%u] = {%Zu, %Zu, %Hu, %Hu}\n", i #ifdef QAK HDfprintf(stderr, "state.nelmts = %Hu\n", state.nelmts); #endif /* QAK */ + state.ndata_blks = 1 + tparam->sblk_info[sblk_idx].start_dblk + ((idx - (cparam->idx_blk_elmts + tparam->sblk_info[sblk_idx].start_idx)) / tparam->sblk_info[sblk_idx].dblk_nelmts); #ifdef QAK HDfprintf(stderr, "state.ndata_blks = %Hu\n", state.ndata_blks); #endif /* QAK */ + + /* Check if we have any super blocks yet */ + if(tparam->sblk_info[sblk_idx].ndblks >= cparam->sup_blk_min_data_ptrs) { + /* Check if this is the first superblock */ + if(sblk_idx < base_sblk_idx) + base_sblk_idx = sblk_idx; + + state.nsuper_blks = (sblk_idx - base_sblk_idx) + 1; +#ifdef QAK +HDfprintf(stderr, "state.nsuper_blks = %Hu\n", state.nsuper_blks); +#endif /* QAK */ + } /* end if */ } /* end else */ if(check_stats(ea, &state)) TEST_ERROR @@ -1200,9 +1214,7 @@ main(void) nerrors += test_set_elmts(fapl, &cparam, &tparam, (hsize_t)(cparam.idx_blk_elmts + (11 * cparam.data_blk_min_elmts)), "setting all elements of array's fifth data block"); nerrors += test_set_elmts(fapl, &cparam, &tparam, (hsize_t)(cparam.idx_blk_elmts + (11 * cparam.data_blk_min_elmts) + 1), "setting first element of array's sixth data block"); nerrors += test_set_elmts(fapl, &cparam, &tparam, (hsize_t)(cparam.idx_blk_elmts + (15 * cparam.data_blk_min_elmts)), "setting all elements of array's sixth data block"); -#ifdef NOT_YET nerrors += test_set_elmts(fapl, &cparam, &tparam, (hsize_t)(cparam.idx_blk_elmts + (15 * cparam.data_blk_min_elmts) + 1), "setting first element of array's seventh data block"); -#endif /* NOT_YET */ /* Close down testing parameters */ finish_tparam(&tparam); |