From c956041d8a7ccdc65502b0b35dff80709772ecec Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 6 Apr 2010 14:06:38 -0500 Subject: [svn-r18519] Description: Bring metadata journaling branch into closer correspondence with trunk: extract data structure freeing routines from metadata cache client 'destroy' callbacks. Tested on: Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel (h5committest not required on this branch) --- src/H5HL.c | 4 ++-- src/H5HLcache.c | 8 ++++---- src/H5SM.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/H5SMcache.c | 26 ++++++++++++++++---------- src/H5SMpkg.h | 4 ++++ 5 files changed, 83 insertions(+), 16 deletions(-) diff --git a/src/H5HL.c b/src/H5HL.c index f876a5f..328fcda 100644 --- a/src/H5HL.c +++ b/src/H5HL.c @@ -130,9 +130,9 @@ H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr_p/*out*/) size_hint = H5HL_SIZEOF_FREE(f); size_hint = H5HL_ALIGN(size_hint); - /* Allocate memory structure */ + /* Allocate new heap structure */ if(NULL == (heap = H5HL_new(H5F_SIZEOF_SIZE(f), H5F_SIZEOF_ADDR(f), H5HL_SIZEOF_HDR(f)))) - HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed") + HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate new heap struct") /* Allocate file space */ total_size = heap->prfx_size + size_hint; diff --git a/src/H5HLcache.c b/src/H5HLcache.c index ca4b431..a5b0728 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -456,7 +456,7 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, /* Should we destroy the memory version? */ if(destroy) - if(H5HL_prfx_dest(prfx) < 0) + if(H5HL_prefix_dest(f, prfx) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix") done: @@ -532,7 +532,7 @@ H5HL_prefix_clear(H5F_t UNUSED *f, void *thing, hbool_t destroy) prfx->cache_info.is_dirty = FALSE; if(destroy) - if(H5HL_prfx_dest(prfx) < 0) + if(H5HL_prefix_dest(f, prfx) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix") done: @@ -689,7 +689,7 @@ H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, /* Should we destroy the memory version? */ if(destroy) - if(H5HL_dblk_dest(dblk) < 0) + if(H5HL_datablock_dest(f, dblk) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap data block") done: @@ -761,7 +761,7 @@ H5HL_datablock_clear(H5F_t UNUSED *f, void *_thing, hbool_t destroy) dblk->cache_info.is_dirty = FALSE; if(destroy) - if(H5HL_dblk_dest(dblk) < 0) + if(H5HL_datablock_dest(f, dblk) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap data block") done: diff --git a/src/H5SM.c b/src/H5SM.c index d9a905c..fadb27b 100755 --- a/src/H5SM.c +++ b/src/H5SM.c @@ -2291,6 +2291,63 @@ done: /*------------------------------------------------------------------------- + * Function: H5SM_table_free + * + * Purpose: Frees memory used by the SOHM table. + * + * Return: Non-negative on success/Negative on failure + * + * Programmer: James Laird + * November 6, 2006 + * + *------------------------------------------------------------------------- + */ +herr_t +H5SM_table_free(H5SM_master_table_t *table) +{ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_table_free) + + /* Sanity check */ + HDassert(table); + HDassert(table->indexes); + + H5FL_ARR_FREE(H5SM_index_header_t, table->indexes); + + H5FL_FREE(H5SM_master_table_t, table); + + FUNC_LEAVE_NOAPI(SUCCEED) +} /* end H5SM_table_free() */ + + +/*------------------------------------------------------------------------- + * Function: H5SM_list_free + * + * Purpose: Frees all memory used by the list. + * + * Return: Non-negative on success/Negative on failure + * + * Programmer: James Laird + * November 6, 2006 + * + *------------------------------------------------------------------------- + */ +herr_t +H5SM_list_free(H5SM_list_t *list) +{ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_list_free) + + HDassert(list); + HDassert(list->messages); + + H5FL_ARR_FREE(H5SM_sohm_t, list->messages); + + H5FL_FREE(H5SM_list_t, list); + + FUNC_LEAVE_NOAPI(SUCCEED) +} /* end H5SM_list_free() */ + + +/*------------------------------------------------------------------------- * Function: H5SM_table_debug * * Purpose: Print debugging information for the master table. diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 7bcc230..04618a6 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -363,17 +363,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); - - H5FL_FREE(H5SM_master_table_t, table); + /* 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") - FUNC_LEAVE_NOAPI(SUCCEED) +done: + FUNC_LEAVE_NOAPI(ret_value) } /* end H5SM_table_dest() */ @@ -654,16 +657,19 @@ done: static herr_t H5SM_list_dest(H5F_t UNUSED *f, H5SM_list_t* list) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_list_dest) + herr_t ret_value = SUCCEED; /* Return value */ + + FUNC_ENTER_NOAPI_NOINIT(H5SM_list_dest) HDassert(list); HDassert(list->messages); - H5FL_ARR_FREE(H5SM_sohm_t, list->messages); - - 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") - FUNC_LEAVE_NOAPI(SUCCEED) +done: + FUNC_LEAVE_NOAPI(ret_value) } /* end H5SM_list_dest() */ diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h index 8d987a9..d1a6d13 100755 --- a/src/H5SMpkg.h +++ b/src/H5SMpkg.h @@ -261,6 +261,10 @@ H5_DLL herr_t H5SM_btree_convert_to_list_op(const void * record, void *op_data); /* Fractal heap 'op' callback to compute hash value for message "in place" */ H5_DLL herr_t H5SM_get_hash_fh_cb(const void *obj, size_t obj_len, void *_udata); +/* Routines to release data structures */ +herr_t H5SM_table_free(H5SM_master_table_t *table); +herr_t H5SM_list_free(H5SM_list_t *list); + /* Testing functions */ #ifdef H5SM_TESTING H5_DLL herr_t H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id, -- cgit v0.12