mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-24 15:25:00 +08:00
[svn-r17038] Description:
Switch fractal heap direct blocks to use temporary file space, until they
are flushed, which makes allocation of space in file more efficient,
particularly for heaps with I/O filters.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.7 (amazon) in debug mode
Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
This commit is contained in:
Quincey Koziol
parent
74af8cfa92
commit
b127ee77c0
107
src/H5HFcache.c
107
src/H5HFcache.c
@ -361,7 +361,7 @@ HDfprintf(stderr, "%s: Load heap header, addr = %a\n", FUNC, addr);
|
||||
H5O_pline_t *pline; /* Pipeline information from the header on disk */
|
||||
|
||||
/* Compute the offset of the filter info in the header */
|
||||
filter_info_off = p - buf;
|
||||
filter_info_off = (size_t)(p - buf);
|
||||
|
||||
/* Compute the size of the extra filter information */
|
||||
filter_info_size = hdr->sizeof_size /* Size of size for filtered root direct block */
|
||||
@ -1130,11 +1130,11 @@ HDfprintf(stderr, "%s: Destroying indirect block\n", FUNC);
|
||||
|
||||
/* Release entry tables */
|
||||
if(iblock->ents)
|
||||
H5FL_SEQ_FREE(H5HF_indirect_ent_t, iblock->ents);
|
||||
(void)H5FL_SEQ_FREE(H5HF_indirect_ent_t, iblock->ents);
|
||||
if(iblock->filt_ents)
|
||||
H5FL_SEQ_FREE(H5HF_indirect_filt_ent_t, iblock->filt_ents);
|
||||
(void)H5FL_SEQ_FREE(H5HF_indirect_filt_ent_t, iblock->filt_ents);
|
||||
if(iblock->child_iblocks)
|
||||
H5FL_SEQ_FREE(H5HF_indirect_ptr_t, iblock->child_iblocks);
|
||||
(void)H5FL_SEQ_FREE(H5HF_indirect_ptr_t, iblock->child_iblocks);
|
||||
|
||||
/* Free fractal heap indirect block info */
|
||||
(void)H5FL_FREE(H5HF_indirect_t, iblock);
|
||||
@ -1436,6 +1436,7 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
|
||||
|
||||
if(dblock->cache_info.is_dirty) {
|
||||
H5HF_hdr_t *hdr; /* Shared fractal heap information */
|
||||
hbool_t at_tmp_addr = H5F_IS_TMP_ADDR(f, addr); /* Flag to indicate direct block is at temporary address */
|
||||
void *write_buf; /* Pointer to buffer to write out */
|
||||
size_t write_size; /* Size of buffer to write out */
|
||||
uint8_t *p; /* Pointer into raw data buffer */
|
||||
@ -1525,13 +1526,17 @@ HDfprintf(stderr, "%s: hdr->man_dtable.table_addr = %a, addr = %a\n", FUNC, hdr-
|
||||
} /* end if */
|
||||
|
||||
/* Check if we need to re-size the block on disk */
|
||||
if(hdr->pline_root_direct_size != write_size) {
|
||||
if(hdr->pline_root_direct_size != write_size || at_tmp_addr) {
|
||||
#ifdef QAK
|
||||
HDfprintf(stderr, "%s: Need to re-allocate root direct block!\n", FUNC);
|
||||
#endif /* QAK */
|
||||
/* Release direct block's current disk space */
|
||||
if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, addr, (hsize_t)hdr->pline_root_direct_size) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
|
||||
/* Check if the direct block is NOT currently allocated in temp. file space */
|
||||
/* (temp. file space does not need to be freed) */
|
||||
if(!at_tmp_addr) {
|
||||
/* Release direct block's current disk space */
|
||||
if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, addr, (hsize_t)hdr->pline_root_direct_size) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
|
||||
} /* end if */
|
||||
|
||||
/* Allocate space for the compressed direct block */
|
||||
if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
|
||||
@ -1579,13 +1584,17 @@ HDfprintf(stderr, "%s: par_iblock->ents[%u].addr = %a, addr = %a\n", FUNC, par_e
|
||||
} /* end if */
|
||||
|
||||
/* Check if we need to re-size the block on disk */
|
||||
if(par_iblock->filt_ents[par_entry].size != write_size) {
|
||||
if(par_iblock->filt_ents[par_entry].size != write_size || at_tmp_addr) {
|
||||
#ifdef QAK
|
||||
HDfprintf(stderr, "%s: Need to re-allocate non-root direct block!\n", FUNC);
|
||||
#endif /* QAK */
|
||||
/* Release direct block's current disk space */
|
||||
if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, addr, (hsize_t)par_iblock->filt_ents[par_entry].size) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
|
||||
/* Check if the direct block is NOT currently allocated in temp. file space */
|
||||
/* (temp. file space does not need to be freed) */
|
||||
if(!at_tmp_addr) {
|
||||
/* Release direct block's current disk space */
|
||||
if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, addr, (hsize_t)par_iblock->filt_ents[par_entry].size) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
|
||||
} /* end if */
|
||||
|
||||
/* Allocate space for the compressed direct block */
|
||||
if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
|
||||
@ -1613,6 +1622,68 @@ HDfprintf(stderr, "%s: Need to re-allocate non-root direct block!\n", FUNC);
|
||||
else {
|
||||
write_buf = dblock->blk;
|
||||
write_size = dblock->size;
|
||||
|
||||
/* Check for needing to re-allocate direct block from 'temp.' to 'normal' file space */
|
||||
if(at_tmp_addr) {
|
||||
#ifdef QAK
|
||||
HDfprintf(stderr, "%s: Re-allocating direct block in temporary space - addr = %a, write_size = %Zu\n", FUNC, addr, write_size);
|
||||
#endif /* QAK */
|
||||
/* Check for root direct block */
|
||||
if(NULL == dblock->parent) {
|
||||
/* Sanity check */
|
||||
HDassert(H5F_addr_eq(hdr->man_dtable.table_addr, addr));
|
||||
|
||||
/* Allocate 'normal' space for the direct block */
|
||||
if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
|
||||
|
||||
/* Sanity check */
|
||||
HDassert(!H5F_addr_eq(hdr->man_dtable.table_addr, addr));
|
||||
|
||||
/* Let the metadata cache know the block moved */
|
||||
if(H5AC_rename(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move direct block")
|
||||
|
||||
/* Update information about direct block's location */
|
||||
hdr->man_dtable.table_addr = addr;
|
||||
|
||||
/* Mark that heap header was modified */
|
||||
if(H5HF_hdr_dirty(hdr) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
|
||||
} /* end if */
|
||||
else {
|
||||
H5HF_indirect_t *par_iblock; /* Parent indirect block */
|
||||
unsigned par_entry; /* Entry in parent indirect block */
|
||||
|
||||
/* Get parent information */
|
||||
par_iblock = dblock->parent;
|
||||
par_entry = dblock->par_entry;
|
||||
|
||||
/* Sanity check */
|
||||
HDassert(H5F_addr_eq(par_iblock->ents[par_entry].addr, addr));
|
||||
|
||||
/* Allocate 'normal' space for the direct block */
|
||||
if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
|
||||
|
||||
/* Sanity check */
|
||||
HDassert(!H5F_addr_eq(par_iblock->ents[par_entry].addr, addr));
|
||||
|
||||
/* Let the metadata cache know the block moved */
|
||||
if(H5AC_rename(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move direct block")
|
||||
|
||||
/* Update information about direct block's location */
|
||||
par_iblock->ents[par_entry].addr = addr;
|
||||
|
||||
/* Mark that parent was modified */
|
||||
if(H5HF_iblock_dirty(par_iblock) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty")
|
||||
} /* end else */
|
||||
|
||||
/* Direct block must be in 'normal' file space now */
|
||||
HDassert(!H5F_IS_TMP_ADDR(f, addr));
|
||||
} /* end if */
|
||||
} /* end else */
|
||||
|
||||
/* Write the direct block */
|
||||
@ -1674,10 +1745,14 @@ HDfprintf(stderr, "%s: Destroying direct block, dblock = %p\n", FUNC, dblock);
|
||||
/* Sanity check */
|
||||
HDassert(dblock->file_size > 0);
|
||||
|
||||
/* Release the space on disk */
|
||||
/* (XXX: Nasty usage of internal DXPL value! -QAK) */
|
||||
if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, H5AC_dxpl_id, dblock->cache_info.addr, dblock->file_size) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
|
||||
/* Check if the direct block is NOT currently allocated in temp. file space */
|
||||
/* (temp. file space does not need to be freed) */
|
||||
if(!H5F_IS_TMP_ADDR(f, dblock->cache_info.addr)) {
|
||||
/* Release the space on disk */
|
||||
/* (XXX: Nasty usage of internal DXPL value! -QAK) */
|
||||
if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, H5AC_dxpl_id, dblock->cache_info.addr, dblock->file_size) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
|
||||
} /* end if */
|
||||
} /* end if */
|
||||
|
||||
/* Set the shared heap header's file context for this operation */
|
||||
|
||||
@ -148,8 +148,8 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo
|
||||
HDmemset(dblock->blk, 0, dblock->size);
|
||||
#endif /* H5_CLEAR_MEMORY */
|
||||
|
||||
/* Allocate space for the direct block on disk */
|
||||
if(HADDR_UNDEF == (dblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)dblock->size)))
|
||||
/* Allocate [temporary] space for the direct block on disk */
|
||||
if(HADDR_UNDEF == (dblock_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)dblock->size)))
|
||||
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
|
||||
#ifdef QAK
|
||||
HDfprintf(stderr, "%s: direct block address = %a\n", FUNC, dblock_addr);
|
||||
@ -695,22 +695,26 @@ HDfprintf(stderr, "%s: Done expunging direct block from cache\n", FUNC);
|
||||
#endif /* QAK */
|
||||
} /* end if */
|
||||
|
||||
/* Release direct block's disk space */
|
||||
/* (XXX: Under the best of circumstances, this block's space in the file
|
||||
* would be freed in the H5AC_expunge_entry() call above (and the
|
||||
* H5AC__FREE_FILE_SPACE_FLAG used there), but since the direct
|
||||
* block structure might have a different size on disk than in
|
||||
* the heap's 'abstract' address space, we would need to set the
|
||||
* "file_size" field for the direct block structure. In order to
|
||||
* do that, we'd have to protect/unprotect the direct block and
|
||||
* that would add a bunch of unnecessary overhead to the process,
|
||||
* so we just release the file space here, directly. When the
|
||||
* revised metadata cache is operating, it will "know" the file
|
||||
* size of each entry in the cache and we can the the
|
||||
* H5AC_expunge_entry() method. -QAK)
|
||||
*/
|
||||
if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, dblock_addr, dblock_size) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
|
||||
/* Check if the direct block is NOT currently allocated in temp. file space */
|
||||
/* (temp. file space does not need to be freed) */
|
||||
if(!H5F_IS_TMP_ADDR(f, dblock_addr)) {
|
||||
/* Release direct block's disk space */
|
||||
/* (XXX: Under the best of circumstances, this block's space in the file
|
||||
* would be freed in the H5AC_expunge_entry() call above (and the
|
||||
* H5AC__FREE_FILE_SPACE_FLAG used there), but since the direct
|
||||
* block structure might have a different size on disk than in
|
||||
* the heap's 'abstract' address space, we would need to set the
|
||||
* "file_size" field for the direct block structure. In order to
|
||||
* do that, we'd have to protect/unprotect the direct block and
|
||||
* that would add a bunch of unnecessary overhead to the process,
|
||||
* so we just release the file space here, directly. When the
|
||||
* revised metadata cache is operating, it will "know" the file
|
||||
* size of each entry in the cache and we can the the
|
||||
* H5AC_expunge_entry() method. -QAK)
|
||||
*/
|
||||
if(H5MF_xfree(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, dblock_addr, dblock_size) < 0)
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
|
||||
} /* end if */
|
||||
|
||||
done:
|
||||
FUNC_LEAVE_NOAPI(ret_value)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user