summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2002-06-07 14:15:22 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2002-06-07 14:15:22 (GMT)
commitff3f6f1a677a780a425ac8b0ab1c45eca92b6ca0 (patch)
treefab8411604ebe16f5b013c4885b79ad0be781f0b
parent35c3c893e84d4a210b4c993ee92b582d07e63109 (diff)
downloadhdf5-ff3f6f1a677a780a425ac8b0ab1c45eca92b6ca0.zip
hdf5-ff3f6f1a677a780a425ac8b0ab1c45eca92b6ca0.tar.gz
hdf5-ff3f6f1a677a780a425ac8b0ab1c45eca92b6ca0.tar.bz2
[svn-r5551] Purpose:
Bug fix. Description: Added extra check to locations where metadata and "small data" blocks were being returned to the file's list of free space to avoid freeing 0-sized blocks. This should fix the problems in last night's daily tests. Platforms tested: FreeBSD 4.5 (sleipnir)
-rw-r--r--src/H5F.c4
-rw-r--r--src/H5FD.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/H5F.c b/src/H5F.c
index fcf0d84..b111971 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -2371,7 +2371,7 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate,
if(invalidate) {
if(f->shared->lf->feature_flags&H5FD_FEAT_AGGREGATE_METADATA) {
/* Return the unused portion of the metadata block to a free list */
- if(f->shared->lf->eoma!=0)
+ if(f->shared->lf->eoma!=0 && f->shared->lf->cur_meta_block_size!=0)
if(H5FD_free(f->shared->lf,H5FD_MEM_DEFAULT,f->shared->lf->eoma,f->shared->lf->cur_meta_block_size)<0)
HRETURN_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't free metadata block");
@@ -2381,7 +2381,7 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate,
} /* end if */
if(f->shared->lf->feature_flags&H5FD_FEAT_AGGREGATE_SMALLDATA) {
/* Return the unused portion of the "small data" block to a free list */
- if(f->shared->lf->eosda!=0)
+ if(f->shared->lf->eosda!=0 && f->shared->lf->cur_sdata_block_size!=0)
if(H5FD_free(f->shared->lf,H5FD_MEM_DRAW,f->shared->lf->eosda,f->shared->lf->cur_sdata_block_size)<0)
HRETURN_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't free 'small data' block");
diff --git a/src/H5FD.c b/src/H5FD.c
index 55661aa..cd16130 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -1467,7 +1467,7 @@ H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size)
} /* end if */
else {
/* Return the unused portion of the metadata block to a free list */
- if(file->eoma!=0)
+ if(file->eoma!=0 && file->cur_meta_block_size!=0)
if(H5FD_free(file,H5FD_MEM_DEFAULT,file->eoma,file->cur_meta_block_size)<0)
HRETURN_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "can't free metadata block");
@@ -1536,7 +1536,7 @@ H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size)
} /* end if */
else {
/* Return the unused portion of the "small data" block to a free list */
- if(file->eosda!=0)
+ if(file->eosda!=0 && file->cur_sdata_block_size!=0)
if(H5FD_free(file,H5FD_MEM_DRAW,file->eosda,file->cur_sdata_block_size)<0)
HRETURN_ERROR(H5E_VFL, H5E_CANTFREE, HADDR_UNDEF, "can't free 'small data' block");