diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-09 14:51:53 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-09 14:51:53 (GMT) |
| commit | 488508c81514eef3c1d0fd5c79daf61beb473ce3 (patch) | |
| tree | 973702eb573794a124c42b10ad41cc16d25404bd /src/H5MFsection.c | |
| parent | 05cc7c234ff463721c4f8e8999d4ca8e0ce3bdbf (diff) | |
| download | hdf5-488508c81514eef3c1d0fd5c79daf61beb473ce3.zip hdf5-488508c81514eef3c1d0fd5c79daf61beb473ce3.tar.gz hdf5-488508c81514eef3c1d0fd5c79daf61beb473ce3.tar.bz2 | |
[svn-r15828] Description:
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:
Mac OS X/32 10.5.5 (amazon) in debug mode
Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) 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 production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5MFsection.c')
| -rw-r--r-- | src/H5MFsection.c | 6 |
1 files changed, 3 insertions, 3 deletions
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() */ |