diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-09 14:54:02 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-09 14:54:02 (GMT) |
| commit | b62ec1e874064604a169ab0915d7631e4f3336d7 (patch) | |
| tree | 1b070c9a90b3a1f28c3df2258ad729604b48dda6 /src | |
| parent | 070a4899bf9ae9acafefc68183991ef9978d5a3d (diff) | |
| download | hdf5-b62ec1e874064604a169ab0915d7631e4f3336d7.zip hdf5-b62ec1e874064604a169ab0915d7631e4f3336d7.tar.gz hdf5-b62ec1e874064604a169ab0915d7631e4f3336d7.tar.bz2 | |
[svn-r15829] Description:
Bring bck revision 15828 from trunk:
Skip some free space manager tests when using a VFD that doesn't
support the feature being tested.
Use a particular memory type with the file free space sections.
Uncomment the metadata aggregator feature for the fmily VFD, as it
appears to be working after the file free space changes.
Tested on:
FreeBSD/32 6.3 (duty)
h5committest not needed, change already tested on trunk...
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDfamily.c | 4 | ||||
| -rw-r--r-- | src/H5MFsection.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index 5451cc0..3e09f76 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -984,9 +984,7 @@ H5FD_family_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */) if(flags) { *flags=0; *flags|=H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */ - /**flags|=H5FD_FEAT_ACCUMULATE_METADATA;*/ /* OK to accumulate metadata for faster writes. - * - Turn it off temporarily because there's a bug - * when trying to flush metadata during closing. */ + *flags|=H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes. */ *flags|=H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */ *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */ } diff --git a/src/H5MFsection.c b/src/H5MFsection.c index b01590e..4678dde 100644 --- a/src/H5MFsection.c +++ b/src/H5MFsection.c @@ -310,7 +310,7 @@ H5MF_sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata) HDassert(udata->f); /* Retrieve the end of the file's address space */ - if(HADDR_UNDEF == (eoa = H5FD_get_eoa(udata->f->shared->lf, H5FD_MEM_DEFAULT))) + if(HADDR_UNDEF == (eoa = H5FD_get_eoa(udata->f->shared->lf, udata->alloc_type))) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed") /* Compute address of end of section to check */ @@ -405,7 +405,7 @@ H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *_udata) /* Check for shrinking file */ if(H5MF_SHRINK_EOA == udata->shrink) { /* Release section's space at EOA with file driver */ - if(H5FD_free(udata->f->shared->lf, udata->dxpl_id, H5FD_MEM_DEFAULT, (*sect)->sect_info.addr, (*sect)->sect_info.size) < 0) + if(H5FD_free(udata->f->shared->lf, udata->dxpl_id, udata->alloc_type, (*sect)->sect_info.addr, (*sect)->sect_info.size) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "driver free request failed") } /* end if */ else { @@ -456,7 +456,7 @@ H5MF_sect_simple_free(H5FS_section_info_t *_sect) HDassert(sect); /* Release the section */ - H5FL_FREE(H5MF_free_section_t, sect); + (void)H5FL_FREE(H5MF_free_section_t, sect); FUNC_LEAVE_NOAPI(SUCCEED) } /* H5MF_sect_simple_free() */ |