diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-20 18:45:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-20 18:45:55 (GMT) |
| commit | 75faf535a3d4700af1747649ee3d7123055cfad4 (patch) | |
| tree | ed71b714edb16099ce108092b1b90d1947d92b9e /src/H5MF.c | |
| parent | 0b3b4351e7841f00cdcda837fc2960a37a923d69 (diff) | |
| download | hdf5-75faf535a3d4700af1747649ee3d7123055cfad4.zip hdf5-75faf535a3d4700af1747649ee3d7123055cfad4.tar.gz hdf5-75faf535a3d4700af1747649ee3d7123055cfad4.tar.bz2 | |
[svn-r17393] Description:
Bring back more changes from the file free space branch to the trunk.
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 (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
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
Diffstat (limited to 'src/H5MF.c')
| -rw-r--r-- | src/H5MF.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1033,6 +1033,11 @@ HDfprintf(stderr, "%s: Entering\n", FUNC); HDassert(f->shared); HDassert(f->shared->lf); + /* Free the space in aggregators */ + /* (for space not at EOF, it may be put into free space managers) */ + if(H5MF_free_aggrs(f, dxpl_id) < 0) + HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "can't free aggregators") + /* Iterate over all the free space types that have managers and get each free list's space */ for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type)) { #ifdef H5MF_ALLOC_DEBUG_MORE @@ -1083,6 +1088,8 @@ HDfprintf(stderr, "%s: Before deleting free space manager\n", FUNC); } /* end if */ } /* end for */ + /* Free the space in aggregators (again) */ + /* (in case any free space information re-started them) */ if(H5MF_free_aggrs(f, dxpl_id) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "can't free aggregators") |