diff options
| -rw-r--r-- | src/H5F.c | 2 | ||||
| -rw-r--r-- | src/H5Fio.c | 8 | ||||
| -rw-r--r-- | src/H5Fpkg.h | 2 | ||||
| -rw-r--r-- | src/H5Fprivate.h | 3 | ||||
| -rw-r--r-- | src/H5Fquery.c | 29 | ||||
| -rw-r--r-- | src/H5MF.c | 69 | ||||
| -rw-r--r-- | src/H5MFprivate.h | 3 | ||||
| -rw-r--r-- | test/mf.c | 190 |
8 files changed, 259 insertions, 47 deletions
@@ -894,7 +894,7 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf) f->shared->accum.loc = HADDR_UNDEF; f->shared->lf = lf; f->shared->root_addr = HADDR_UNDEF; - f->shared->next_proxy_addr = HADDR_MAX; + f->shared->tmp_addr = HADDR_MAX; /* * Copy the file creation and file access property lists into the diff --git a/src/H5Fio.c b/src/H5Fio.c index 1081a27..407f950 100644 --- a/src/H5Fio.c +++ b/src/H5Fio.c @@ -104,6 +104,10 @@ H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, HDassert(f->shared); HDassert(buf); + /* Check for attempting I/O on 'temporary' file address */ + if(H5F_addr_le(f->shared->tmp_addr, (addr + size))) + HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space") + /* Check if this I/O can be satisfied by the metadata accumulator */ if((accumulated = H5F_accum_read(f, dxpl_id, type, addr, size, buf)) < 0) HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "read from metadata accumulator failed") @@ -150,6 +154,10 @@ HDfprintf(stderr, "%s: write to addr = %a, size = %Zu\n", FUNC, addr, size); HDassert(f->intent & H5F_ACC_RDWR); HDassert(buf); + /* Check for attempting I/O on 'temporary' file address */ + if(H5F_addr_le(f->shared->tmp_addr, (addr + size))) + HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space") + /* Check for accumulating metadata */ if((accumulated = H5F_accum_write(f, dxpl_id, type, addr, size, buf)) < 0) HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write to metadata accumulator failed") diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 0f14b46..59f5109 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -162,7 +162,7 @@ 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 next_proxy_addr; /* Next address to use for metadata cache proxy entries */ + haddr_t tmp_addr; /* Next address to use for temp. space in the file */ /* File space allocation information */ unsigned fs_aggr_merge[H5FD_MEM_NTYPES]; /* Flags for whether free space can merge with aggregator(s) */ diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 59bdd10..cd6bcd0 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -265,7 +265,6 @@ 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_GET_NEXT_PROXY_ADDR(F) ((F)->shared->next_proxy_addr--) #else /* H5F_PACKAGE */ #define H5F_INTENT(F) (H5F_get_intent(F)) #define H5F_FCPL(F) (H5F_get_fcpl(F)) @@ -288,7 +287,6 @@ 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_GET_NEXT_PROXY_ADDR(F) (H5F_get_next_proxy_addr(F)) #endif /* H5F_PACKAGE */ @@ -474,7 +472,6 @@ H5_DLL char *H5F_get_name(const H5F_t *f); H5_DLL hid_t H5F_get_id(H5F_t *file, hbool_t app_ref); H5_DLL size_t H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref); H5_DLL size_t H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *obj_id_list, hbool_t app_ref); -H5_DLL haddr_t H5F_get_next_proxy_addr(const H5F_t *f); /* Functions than retrieve values set/cached from the superblock/FCPL */ H5_DLL hid_t H5F_get_fcpl(const H5F_t *f); diff --git a/src/H5Fquery.c b/src/H5Fquery.c index d070b94..275061d 100644 --- a/src/H5Fquery.c +++ b/src/H5Fquery.c @@ -687,32 +687,3 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5F_get_fileno() */ - -/*------------------------------------------------------------------------- - * Function: H5F_get_next_proxy_addr - * - * Purpose: Quick and dirty routine to retrieve the next metadata proxy - * address for a file. - * (Mainly added to stop non-file routines from poking about in the - * H5F_t data structure) - * - * Return: Success: Address to use for metadata cache proxy - * Failure: abort (should not happen) - * - * Programmer: Quincey Koziol <koziol@hdfgroup.org> - * May 19, 2009 - * - *------------------------------------------------------------------------- - */ -haddr_t -H5F_get_next_proxy_addr(const H5F_t *f) -{ - /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_next_proxy_addr) - - HDassert(f); - HDassert(f->shared); - - FUNC_LEAVE_NOAPI(f->shared->next_proxy_addr--) -} /* end H5F_get_next_proxy_addr() */ - @@ -374,14 +374,18 @@ HDfprintf(stderr, "%s: Check 2.0\n", FUNC); if(alloc_type != H5FD_MEM_DRAW) { /* Handle metadata differently from "raw" data */ if(HADDR_UNDEF == (ret_value = H5MF_aggr_alloc(f, dxpl_id, &(f->shared->meta_aggr), &(f->shared->sdata_aggr), alloc_type, size))) - HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate metadata") + HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate metadata") } /* end if */ else { /* Allocate "raw" data */ if(HADDR_UNDEF == (ret_value = H5MF_aggr_alloc(f, dxpl_id, &(f->shared->sdata_aggr), &(f->shared->meta_aggr), alloc_type, size))) - HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate raw data") + HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate raw data") } /* end else */ + /* Check for overlapping into file's temporary allocation space */ + if(H5F_addr_gt((ret_value + size), f->shared->tmp_addr)) + HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF, "'normal' file space allocation request overlaps into 'temporary' file space") + done: #ifdef H5MF_ALLOC_DEBUG HDfprintf(stderr, "%s: Leaving: ret_value = %a, size = %Hu\n", FUNC, ret_value, size); @@ -394,6 +398,63 @@ H5MF_sects_dump(f, dxpl_id, stderr); /*------------------------------------------------------------------------- + * Function: H5MF_alloc_tmp + * + * Purpose: Allocate temporary space in the file + * + * Note: The address returned is non-overlapping with any other address + * in the file and suitable for insertion into the metadata + * cache. + * + * The address is _not_ suitable for actual file I/O and will + * cause an error if it is so used. + * + * The space allocated with this routine should _not_ be freed, + * it should just be abandoned. Calling H5MF_xfree() with space + * from this routine will cause an error. + * + * Return: Success: Temporary file address + * Failure: HADDR_UNDEF + * + * Programmer: Quincey Koziol + * Thursday, June 4, 2009 + * + *------------------------------------------------------------------------- + */ +haddr_t +H5MF_alloc_tmp(H5F_t *f, hsize_t size) +{ + haddr_t eoa; /* End of allocated space in the file */ + haddr_t ret_value; /* Return value */ + + FUNC_ENTER_NOAPI(H5MF_alloc_tmp, HADDR_UNDEF) + + /* check args */ + HDassert(f); + HDassert(f->shared); + HDassert(f->shared->lf); + HDassert(size > 0); + + /* Retrieve the 'eoa' for the file */ + if(HADDR_UNDEF == (eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT))) + HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, HADDR_UNDEF, "driver get_eoa request failed") + + /* Compute value to return */ + ret_value = f->shared->tmp_addr - size; + + /* Check for overlap into the actual allocated space in the file */ + if(H5F_addr_le(ret_value, eoa)) + HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, HADDR_UNDEF, "driver get_eoa request failed") + + /* Adjust temporary address allocator in the file */ + f->shared->tmp_addr = ret_value; + +done: + FUNC_LEAVE_NOAPI(ret_value) +} /* end H5MF_alloc_tmp() */ + + +/*------------------------------------------------------------------------- * Function: H5MF_xfree * * Purpose: Frees part of a file, making that part of the file @@ -427,6 +488,10 @@ HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %a, size = %Hu\n", FUN HGOTO_DONE(SUCCEED); HDassert(addr != 0); /* Can't deallocate the superblock :-) */ + /* Check for attempting to free space that's a 'temporary' file address */ + if(H5F_addr_le(f->shared->tmp_addr, addr)) + HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, FAIL, "attempting to free temporary file space") + /* Check if the space to free intersects with the file's metadata accumulator */ if(H5F_accum_free(f, dxpl_id, alloc_type, addr, size) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "can't check free space intersection w/metadata accumulator") diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h index 0d1da8a..4508199 100644 --- a/src/H5MFprivate.h +++ b/src/H5MFprivate.h @@ -72,6 +72,9 @@ H5_DLL herr_t H5MF_try_extend(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, H5_DLL htri_t H5MF_try_shrink(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr, hsize_t size); +/* File 'temporary' space allocation routines */ +H5_DLL haddr_t H5MF_alloc_tmp(H5F_t *f, hsize_t size); + /* 'block aggregator' routines */ H5_DLL herr_t H5MF_aggr_reset(H5F_t *file, hid_t dxpl_id, H5F_blk_aggr_t *aggr); @@ -718,6 +718,175 @@ error: } /* test_mf_eoa_extend() */ /* + * To verify that temporary blocks are allocated correctly + * + * Set up: + * There is nothing in free-space manager + * + * Tests: + * Allocate a reasonable-sized temporary block + * Check that the temporary address is high enough + * Check that file I/O with the temporary address fails + * Check that freeing a temporary address fails + * Check that closing the file doesn't change the file's size + * Check that overlapping normal & temporary address space fails: + * - Reopen the file + * - Allocate enough temporary space to use ~1/3 of the file + * - Allocate enough 'normal' space to use ~1/3 of the file + * - Check that allocating another 1/2 of the file as temporary address + * space fails + * - Check that allocating another 1/2 of the file as normal address + * space fails + */ +static unsigned +test_mf_tmp(const char *env_h5_drvr, hid_t fapl) +{ + hid_t file = -1; /* File ID */ + hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */ + + TESTING("'temporary' file space allocation"); + + /* Skip test when using VFDs that has different address spaces for each + * type of metadata allocation. + */ + contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi")); + if(contig_addr_vfd) { + char filename[FILENAME_LEN]; /* Filename to use */ + H5F_t *f = NULL; /* Internal file object pointer */ + h5_stat_size_t file_size, new_file_size; /* file size */ + haddr_t tmp_addr; /* Temporary space file address */ + haddr_t norm_addr; /* Normal space file address */ + haddr_t check_addr; /* File address for checking for errors */ + unsigned char buf = 0; /* Buffer to read/write with */ + herr_t status; /* Generic status value */ + + /* Set the filename to use for this test */ + h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); + + /* Create the file to work on */ + if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR + + /* Close file */ + if(H5Fclose(file) < 0) + FAIL_STACK_ERROR + + /* Get the size of the file */ + if((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR + + + /* Re-open the file */ + if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR + + /* Get a pointer to the internal file object */ + if(NULL == (f = (H5F_t *)H5I_object(file))) + FAIL_STACK_ERROR + + /* Allocate some temporary address space */ + if(HADDR_UNDEF == (tmp_addr = H5MF_alloc_tmp(f, (hsize_t)TEST_BLOCK_SIZE30))) + FAIL_STACK_ERROR + + /* Check if temporary file address is valid */ + if(tmp_addr < (haddr_t)(HADDR_MAX - TEST_BLOCK_SIZE30)) + TEST_ERROR + + /* Reading & writing with a temporary address value should fail */ + H5E_BEGIN_TRY { + status = H5F_block_read(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), H5P_DATASET_XFER_DEFAULT, &buf); + } H5E_END_TRY; + if(status >= 0) + TEST_ERROR + H5E_BEGIN_TRY { + status = H5F_block_write(f, H5FD_MEM_SUPER, tmp_addr, sizeof(buf), H5P_DATASET_XFER_DEFAULT, &buf); + } H5E_END_TRY; + if(status >= 0) + TEST_ERROR + + /* Freeing a temporary address value should fail */ + H5E_BEGIN_TRY { + status = H5MF_xfree(f, H5FD_MEM_SUPER, H5P_DATASET_XFER_DEFAULT, tmp_addr, (hsize_t)TEST_BLOCK_SIZE30); + } H5E_END_TRY; + if(status >= 0) + TEST_ERROR + + /* Close the file */ + if(H5Fclose(file) < 0) + FAIL_STACK_ERROR + + /* Get the size of the file */ + if((new_file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR + + /* Verify the file is the correct size */ + if(new_file_size != file_size) + TEST_ERROR + + + /* Re-open the file */ + if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR + + /* Get a pointer to the internal file object */ + if(NULL == (f = (H5F_t *)H5I_object(file))) + FAIL_STACK_ERROR + + /* Allocate 1/3 of the file as temporary address space */ + if(HADDR_UNDEF == (tmp_addr = H5MF_alloc_tmp(f, (hsize_t)(HADDR_MAX / 3)))) + FAIL_STACK_ERROR + + /* Allocate 1/3 of the file as normal address space */ + if(HADDR_UNDEF == (norm_addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5P_DATASET_XFER_DEFAULT, (hsize_t)(HADDR_MAX / 3)))) + FAIL_STACK_ERROR + + /* Test that pushing temporary space allocation into normal space fails */ + H5E_BEGIN_TRY { + check_addr = H5MF_alloc_tmp(f, (hsize_t)(HADDR_MAX / 3)); + } H5E_END_TRY; + if(H5F_addr_defined(check_addr)) + TEST_ERROR + + /* Test that pushing normal space allocation into temporary space fails */ + H5E_BEGIN_TRY { + check_addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5P_DATASET_XFER_DEFAULT, (hsize_t)(HADDR_MAX / 3)); + } H5E_END_TRY; + if(H5F_addr_defined(check_addr)) + TEST_ERROR + + /* Free the normal block (so the file doesn't blow up to a huge size) */ + if(H5MF_xfree(f, H5FD_MEM_DRAW, H5P_DATASET_XFER_DEFAULT, norm_addr, (hsize_t)(HADDR_MAX / 3)) < 0) + FAIL_STACK_ERROR + + /* Close the file */ + if(H5Fclose(file) < 0) + FAIL_STACK_ERROR + + /* Get the size of the file */ + if((new_file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR + + /* Verify the file is the correct size */ + if(new_file_size != file_size) + TEST_ERROR + + PASSED() + } /* end if */ + else { + SKIPPED(); + puts(" Current VFD doesn't support continuous address space"); + } /* end else */ + + return(0); + +error: + H5E_BEGIN_TRY { + H5Fclose(file); + } H5E_END_TRY; + return(1); +} /* test_mf_tmp() */ + +/* * To verify that the free-space manager is started up via H5MF_alloc_start() * * Set up: @@ -5625,11 +5794,6 @@ main(void) env_h5_drvr = "nomatch"; fapl = h5_fileaccess(); - if((new_fapl = H5Pcopy(fapl)) < 0) TEST_ERROR - - /* alignment is not set for the following tests */ - if(H5Pset_alignment(fapl, (hsize_t)1, (hsize_t)1) < 0) - TEST_ERROR /* meta/small data is set to 2048 for the following tests */ if(H5Pset_meta_block_size(fapl, (hsize_t)TEST_BLOCK_SIZE2048) < 0) @@ -5637,11 +5801,21 @@ main(void) if(H5Pset_small_data_block_size(fapl, (hsize_t)TEST_BLOCK_SIZE2048) < 0) TEST_ERROR + /* Make a copy of the FAPL before adjusting the alignment */ + if((new_fapl = H5Pcopy(fapl)) < 0) TEST_ERROR + + /* alignment is not set for the following tests */ + if(H5Pset_alignment(fapl, (hsize_t)1, (hsize_t)1) < 0) + TEST_ERROR + /* interaction with file allocation */ nerrors += test_mf_eoa(env_h5_drvr, fapl); nerrors += test_mf_eoa_shrink(env_h5_drvr, fapl); nerrors += test_mf_eoa_extend(env_h5_drvr, fapl); + /* interaction with temporary file space allocation */ + nerrors += test_mf_tmp(env_h5_drvr, fapl); + /* interaction with free-space manager */ nerrors += test_mf_fs_start(fapl); nerrors += test_mf_fs_alloc_free(fapl); @@ -5663,12 +5837,6 @@ main(void) * tests for alignment */ - /* set meta/sdata block size = 2048 */ - if(H5Pset_meta_block_size(new_fapl, (hsize_t)TEST_BLOCK_SIZE2048) < 0) - TEST_ERROR - if(H5Pset_small_data_block_size(new_fapl, (hsize_t)TEST_BLOCK_SIZE2048) < 0) - TEST_ERROR - for(curr_test = TEST_NORMAL; curr_test < TEST_NTESTS; curr_test++) { switch(curr_test) { |