summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-02 05:28:33 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-02 05:28:33 (GMT)
commitc2550f345494667d4786c677f8da7068eed499f0 (patch)
tree2b7d84e605c6fe018fcdc822fa7e1fd2e7f421f6
parent0611a912634742279a12fe34494cfb239466bc6b (diff)
downloadhdf5-c2550f345494667d4786c677f8da7068eed499f0.zip
hdf5-c2550f345494667d4786c677f8da7068eed499f0.tar.gz
hdf5-c2550f345494667d4786c677f8da7068eed499f0.tar.bz2
[svn-r18505] Description:
Move code to free superblock data structure into separate routine, in preparation for upcoming metadata journaling -> trunk merging. 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 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) 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 debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode Mac OS X/32 10.6.3 (amazon) in debug mode
-rw-r--r--src/H5Fpkg.h1
-rw-r--r--src/H5Fsuper.c34
-rw-r--r--src/H5Fsuper_cache.c15
3 files changed, 42 insertions, 8 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 01ecf17..553f8e9 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -302,6 +302,7 @@ H5_DLL herr_t H5F_flush_mounts(H5F_t *f, hid_t dxpl_id);
H5_DLL herr_t H5F_super_init(H5F_t *f, hid_t dxpl_id);
H5_DLL herr_t H5F_super_read(H5F_t *f, hid_t dxpl_id);
H5_DLL herr_t H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_size);
+H5_DLL herr_t H5F_super_free(H5F_super_t *sblock);
/* Superblock extension related routines */
H5_DLL herr_t H5F_super_ext_open(H5F_t *f, haddr_t ext_addr, H5O_loc_t *ext_ptr);
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index f42c7f6..7ee21f3 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -618,7 +618,8 @@ done:
} /* end if */
else
/* Free superblock */
- sblock = (H5F_super_t *)H5FL_FREE(H5F_super_t, sblock);
+ if(H5F_super_free(sblock) < 0)
+ HDONE_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock")
/* Reset variables in file structure */
f->shared->sblock = NULL;
@@ -664,6 +665,37 @@ done:
/*-------------------------------------------------------------------------
+ * Function: H5F_super_free
+ *
+ * Purpose: Destroyer the file's superblock
+ *
+ * Return: Success: non-negative on success
+ * Failure: Negative
+ *
+ * Programmer: Quincey Koziol
+ * April 1, 2010
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5F_super_free(H5F_super_t *sblock)
+{
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_super_free)
+
+ /* Sanity check */
+ HDassert(sblock);
+
+ /* Free root group symbol table entry, if any */
+ sblock->root_ent = (H5G_entry_t *)H5MM_xfree(sblock->root_ent);
+
+ /* Free superblock */
+ sblock = (H5F_super_t *)H5FL_FREE(H5F_super_t, sblock);
+
+ FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5F_super_free() */
+
+
+/*-------------------------------------------------------------------------
* Function: H5F_super_size
*
* Purpose: Get storage size of the superblock and superblock extension
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index cbd9c31..c341c6c 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -613,7 +613,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, const void UNUSED
done:
/* Release the [possibly partially initialized] superblock on errors */
if(!ret_value && sblock)
- if(H5F_sblock_dest(f, sblock) < 0)
+ if(H5F_super_free(sblock) < 0)
HDONE_ERROR(H5E_FILE, H5E_CANTFREE, NULL, "unable to destroy superblock data")
FUNC_LEAVE_NOAPI(ret_value)
@@ -840,18 +840,19 @@ done:
static herr_t
H5F_sblock_dest(H5F_t UNUSED *f, H5F_super_t* sblock)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sblock_dest)
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_dest)
/* Sanity check */
HDassert(sblock);
- /* Free root group symbol table entry, if any */
- sblock->root_ent = (H5G_entry_t *)H5MM_xfree(sblock->root_ent);
-
/* Free superblock */
- sblock = (H5F_super_t *)H5FL_FREE(H5F_super_t, sblock);
+ if(H5F_super_free(sblock) < 0)
+ HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock")
- FUNC_LEAVE_NOAPI(SUCCEED)
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_sblock_dest() */