diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 20:19:02 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 20:19:02 (GMT) |
| commit | eeb841b26bdd371f2e3ae506af6390828205691a (patch) | |
| tree | 2d385486eb48397020489d16c8eec34cd0231f39 /src/H5SMcache.c | |
| parent | c0d7b109c9ee0c2c3e150e17bc265324c79818a9 (diff) | |
| download | hdf5-eeb841b26bdd371f2e3ae506af6390828205691a.zip hdf5-eeb841b26bdd371f2e3ae506af6390828205691a.tar.gz hdf5-eeb841b26bdd371f2e3ae506af6390828205691a.tar.bz2 | |
[svn-r18521] Description:
Bring r18520 from trunk to 1.8 branch:
Bring r18519 from metadata journaling "merging" branch to trunk:
Converge metadata_journaling branch and trunk: separate destroy routines for data structures from cache callbacks.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5SMcache.c')
| -rw-r--r-- | src/H5SMcache.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 0136a5c..f675287 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -231,7 +231,8 @@ done: if(wb && H5WB_unwrap(wb) < 0) HDONE_ERROR(H5E_SOHM, H5E_CLOSEERROR, NULL, "can't close wrapped buffer") if(!ret_value && table) - (void)H5SM_table_dest(f, table); + if(H5SM_table_free(table) < 0) + HDONE_ERROR(H5E_SOHM, H5E_CANTFREE, NULL, "unable to destroy sohm table") FUNC_LEAVE_NOAPI(ret_value) } /* end H5SM_table_load() */ @@ -364,17 +365,20 @@ done: static herr_t H5SM_table_dest(H5F_t UNUSED *f, H5SM_master_table_t* table) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_table_dest) + herr_t ret_value = SUCCEED; /* Return value */ + + FUNC_ENTER_NOAPI_NOINIT(H5SM_table_dest) /* Sanity check */ HDassert(table); HDassert(table->indexes); - H5FL_ARR_FREE(H5SM_index_header_t, table->indexes); + /* Destroy Shared Object Header Message table */ + if(H5SM_table_free(table) < 0) + HGOTO_ERROR(H5E_SOHM, H5E_CANTRELEASE, FAIL, "unable to free shared message table") - (void)H5FL_FREE(H5SM_master_table_t, table); - - FUNC_LEAVE_NOAPI(SUCCEED) +done: + FUNC_LEAVE_NOAPI(ret_value) } /* end H5SM_table_dest() */ @@ -679,9 +683,9 @@ H5SM_list_dest(H5F_t *f, H5SM_list_t* list) HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, FAIL, "unable to free shared message list") } /* end if */ - /* Release resources */ - H5FL_ARR_FREE(H5SM_sohm_t, list->messages); - (void)H5FL_FREE(H5SM_list_t, list); + /* Destroy Shared Object Header Message list */ + if(H5SM_list_free(list) < 0) + HGOTO_ERROR(H5E_SOHM, H5E_CANTRELEASE, FAIL, "unable to free shared message list") done: FUNC_LEAVE_NOAPI(ret_value) |