summaryrefslogtreecommitdiffstats
path: root/src/H5FSsection.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-08-13 19:17:29 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-08-13 19:17:29 (GMT)
commit92b37616d2a1ec34a2d7bd34d05c5f6466f7da53 (patch)
tree782bdfeee57df4a5fc673c47c1917e92f6262468 /src/H5FSsection.c
parent5e435bd8ac0b1d59a2c8461b960434b49b50a25f (diff)
downloadhdf5-92b37616d2a1ec34a2d7bd34d05c5f6466f7da53.zip
hdf5-92b37616d2a1ec34a2d7bd34d05c5f6466f7da53.tar.gz
hdf5-92b37616d2a1ec34a2d7bd34d05c5f6466f7da53.tar.bz2
[svn-r17354] Description:
Bring r17351 from trunk to 1.8 branch: Clean up code (to align w/future sblock_mdc branch changes), tweak tests for [slightly] easier debugging, fix memory leak when copying chunked datasets with I/O filters, fix memory leak of free space section when it was exactly the right size to use for extending an existing block in the file. Tested on: FreeBSD/32 6.3 (duty) in debug mode (h5committest performed on trunk)
Diffstat (limited to 'src/H5FSsection.c')
-rw-r--r--src/H5FSsection.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index 51229cb..26ff7b9 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -1124,7 +1124,6 @@ done:
} /* H5FS_sect_link() */
-
/*-------------------------------------------------------------------------
* Function: H5FS_sect_merge
*
@@ -1508,10 +1507,15 @@ if(_section_)
* (or it would have been eliminated), etc)
*/
if(sect->size >= extra_requested && (addr + size) == sect->addr) {
+ H5FS_section_class_t *cls; /* Section's class */
+
/* Remove section from data structures */
if(H5FS_sect_remove_real(fspace, sect) < 0)
HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
+ /* Get class for section */
+ cls = &fspace->sect_cls[sect->type];
+
/* Check for the section needing to be adjusted and re-added */
/* (Note: we should probably add a can_adjust/adjust callback
* to the section class structure, but we don't need it
@@ -1519,11 +1523,6 @@ if(_section_)
* it. - QAK - 2008/01/08)
*/
if(sect->size > extra_requested) {
- H5FS_section_class_t *cls; /* Section's class */
-
- /* Get class for section */
- cls = &fspace->sect_cls[sect->type];
-
/* Sanity check (for now) */
HDassert(cls->flags & H5FS_CLS_ADJUST_OK);
@@ -1535,6 +1534,14 @@ if(_section_)
if(H5FS_sect_link(fspace, sect, 0) < 0)
HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space section into skip list")
} /* end if */
+ else {
+ /* Sanity check */
+ HDassert(sect->size == extra_requested);
+
+ /* Exact match, so just free section */
+ if((*cls->free)(sect) < 0)
+ HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't free section")
+ } /* end else */
/* Note that we modified the section info */
sinfo_modified = TRUE;