mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
[svn-r17138] Description:
Disable use of temporary file space allocation when using a parallel VFD,
until we've made changes to broadcast the new address of the metadata when it
is relocated down into 'normal' file space.
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.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
This commit is contained in:
Quincey Koziol
parent
e70b32f7b5
commit
8e14272cdb
12
src/H5F.c
12
src/H5F.c
@ -949,13 +949,23 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
|
||||
f->shared->maxaddr = H5FD_get_maxaddr(lf);
|
||||
if(!H5F_addr_defined(f->shared->maxaddr))
|
||||
HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad maximum address from VFD")
|
||||
f->shared->tmp_addr = f->shared->maxaddr;
|
||||
if(H5FD_get_feature_flags(lf, &f->shared->feature_flags) < 0)
|
||||
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get feature flags from VFD")
|
||||
if(H5FD_get_fs_type_map(lf, f->shared->fs_type_map) < 0)
|
||||
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get free space type mapping from VFD")
|
||||
if(H5MF_init_merge_flags(f) < 0)
|
||||
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "problem initializing free space merge flags")
|
||||
f->shared->tmp_addr = f->shared->maxaddr;
|
||||
/* Disable temp. space allocation for parallel I/O (for now) */
|
||||
/* (When we've arranged to have the relocated metadata addresses (and
|
||||
* sizes) broadcast during the "end of epoch" metadata operations,
|
||||
* this can be enabled - QAK)
|
||||
*/
|
||||
/* (This should be disabled when the metadata journaling branch is
|
||||
* merged into the trunk and journaling is enabled, at least until
|
||||
* we make it work. - QAK)
|
||||
*/
|
||||
f->shared->use_tmp_space = !(IS_H5FD_MPI(f));
|
||||
|
||||
/* Bump superblock version if we are to use the latest version of the format */
|
||||
if(f->shared->latest_format)
|
||||
|
||||
@ -162,9 +162,10 @@ typedef struct H5F_file_t {
|
||||
haddr_t root_addr; /* Root group address */
|
||||
H5FO_t *open_objs; /* Open objects in file */
|
||||
H5RC_t *grp_btree_shared; /* Ref-counted group B-tree node info */
|
||||
haddr_t tmp_addr; /* Next address to use for temp. space in the file */
|
||||
|
||||
/* File space allocation information */
|
||||
hbool_t use_tmp_space; /* Whether temp. file space allocation is allowed */
|
||||
haddr_t tmp_addr; /* Next address to use for temp. space in the file */
|
||||
unsigned fs_aggr_merge[H5FD_MEM_NTYPES]; /* Flags for whether free space can merge with aggregator(s) */
|
||||
H5F_fs_state_t fs_state[H5FD_MEM_NTYPES]; /* State of free space manager for each type */
|
||||
haddr_t fs_addr[H5FD_MEM_NTYPES]; /* Address of free space manager info for each type */
|
||||
|
||||
@ -265,6 +265,7 @@ typedef struct H5F_blk_aggr_t H5F_blk_aggr_t;
|
||||
#define H5F_HAS_FEATURE(F,FL) ((F)->shared->lf->feature_flags & (FL))
|
||||
#define H5F_DRIVER_ID(F) ((F)->shared->lf->driver_id)
|
||||
#define H5F_GET_FILENO(F,FILENUM) ((FILENUM) = (F)->shared->lf->fileno)
|
||||
#define H5F_USE_TMP_SPACE(F) ((F)->shared->use_tmp_space)
|
||||
#define H5F_IS_TMP_ADDR(F, ADDR) (H5F_addr_le((F)->shared->tmp_addr, (ADDR)))
|
||||
#else /* H5F_PACKAGE */
|
||||
#define H5F_INTENT(F) (H5F_get_intent(F))
|
||||
@ -288,6 +289,7 @@ typedef struct H5F_blk_aggr_t H5F_blk_aggr_t;
|
||||
#define H5F_HAS_FEATURE(F,FL) (H5F_has_feature(F,FL))
|
||||
#define H5F_DRIVER_ID(F) (H5F_get_driver_id(F))
|
||||
#define H5F_GET_FILENO(F,FILENUM) (H5F_get_fileno((F), &(FILENUM)))
|
||||
#define H5F_USE_TMP_SPACE(F) (H5F_use_tmp_space(F))
|
||||
#define H5F_IS_TMP_ADDR(F, ADDR) (H5F_is_tmp_addr((F), (ADDR)))
|
||||
#endif /* H5F_PACKAGE */
|
||||
|
||||
|
||||
@ -711,8 +711,35 @@ H5F_is_tmp_addr(const H5F_t *f, haddr_t addr)
|
||||
|
||||
HDassert(f);
|
||||
HDassert(f->shared);
|
||||
HDassert(f->shared->lf);
|
||||
|
||||
FUNC_LEAVE_NOAPI(H5F_addr_le(f->shared->tmp_addr, addr))
|
||||
} /* end H5F_is_tmp_addr() */
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* Function: H5F_use_tmp_space
|
||||
*
|
||||
* Purpose: Quick and dirty routine to determine if using temporary
|
||||
* file space is allowed for this file.
|
||||
* (Mainly added to stop non-file routines from poking about in the
|
||||
* H5F_t data structure)
|
||||
*
|
||||
* Return: TRUE/FALSE on success/abort on failure (shouldn't fail)
|
||||
*
|
||||
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
|
||||
* July 1, 2009
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
hbool_t
|
||||
H5F_use_tmp_space(const H5F_t *f)
|
||||
{
|
||||
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
|
||||
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_use_tmp_space)
|
||||
|
||||
HDassert(f);
|
||||
HDassert(f->shared);
|
||||
|
||||
FUNC_LEAVE_NOAPI(f->shared->use_tmp_space)
|
||||
} /* end H5F_use_tmp_space() */
|
||||
|
||||
|
||||
@ -149,8 +149,14 @@ HDmemset(dblock->blk, 0, dblock->size);
|
||||
#endif /* H5_CLEAR_MEMORY */
|
||||
|
||||
/* Allocate [temporary] space for the direct block on disk */
|
||||
if(H5F_USE_TMP_SPACE(hdr->f)) {
|
||||
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")
|
||||
} /* end if */
|
||||
else {
|
||||
if(HADDR_UNDEF == (dblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)dblock->size)))
|
||||
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
|
||||
} /* end else */
|
||||
#ifdef QAK
|
||||
HDfprintf(stderr, "%s: direct block address = %a\n", FUNC, dblock_addr);
|
||||
#endif /* QAK */
|
||||
|
||||
@ -600,8 +600,14 @@ HDfprintf(stderr, "%s: new_next_entry = %u\n", FUNC, new_next_entry);
|
||||
iblock->size = H5HF_MAN_INDIRECT_SIZE(hdr, iblock);
|
||||
|
||||
/* Allocate [temporary] space for the new indirect block on disk */
|
||||
if(H5F_USE_TMP_SPACE(hdr->f)) {
|
||||
if(HADDR_UNDEF == (new_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
|
||||
} /* end if */
|
||||
else {
|
||||
if(HADDR_UNDEF == (new_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
|
||||
} /* end else */
|
||||
#ifdef QAK
|
||||
HDfprintf(stderr, "%s: Check 1.0 - iblock->addr = %a, new_addr = %a\n", FUNC, iblock->addr, new_addr);
|
||||
#endif /* QAK */
|
||||
@ -771,8 +777,14 @@ HDfprintf(stderr, "%s: iblock->nrows = %u\n", FUNC, iblock->nrows);
|
||||
iblock->size = H5HF_MAN_INDIRECT_SIZE(hdr, iblock);
|
||||
|
||||
/* Allocate [temporary] space for the new indirect block on disk */
|
||||
if(H5F_USE_TMP_SPACE(hdr->f)) {
|
||||
if(HADDR_UNDEF == (new_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
|
||||
} /* end if */
|
||||
else {
|
||||
if(HADDR_UNDEF == (new_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
|
||||
HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
|
||||
} /* end else */
|
||||
#ifdef QAK
|
||||
HDfprintf(stderr, "%s: new_addr = %a\n", FUNC, new_addr);
|
||||
#endif /* QAK */
|
||||
@ -1087,8 +1099,14 @@ HDfprintf(stderr, "%s: dir_rows = %u\n", FUNC, dir_rows);
|
||||
iblock->child_iblocks = NULL;
|
||||
|
||||
/* Allocate [temporary] space for the indirect block on disk */
|
||||
if(H5F_USE_TMP_SPACE(hdr->f)) {
|
||||
if(HADDR_UNDEF == (*addr_p = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
|
||||
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
|
||||
} /* end if */
|
||||
else {
|
||||
if(HADDR_UNDEF == (*addr_p = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, dxpl_id, (hsize_t)iblock->size)))
|
||||
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
|
||||
} /* end else */
|
||||
iblock->addr = *addr_p;
|
||||
|
||||
/* Attach to parent indirect block, if there is one */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user