diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-13 07:52:10 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-13 07:52:10 (GMT) |
| commit | 7cfab788fc243ccc493cc98f8c6e504ca42157d0 (patch) | |
| tree | 19efa867ce18943c04124403ad1a484d3d4d2d8c /src/H5C2journal.c | |
| parent | bc010e55565dd53a40cb0187afe34f8506a990e2 (diff) | |
| download | hdf5-7cfab788fc243ccc493cc98f8c6e504ca42157d0.zip hdf5-7cfab788fc243ccc493cc98f8c6e504ca42157d0.tar.gz hdf5-7cfab788fc243ccc493cc98f8c6e504ca42157d0.tar.bz2 | |
[svn-r15841] Description:
Use metadata journaling callback to allow dataset code to track journal
status changes and flush cached info appropriately.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.5.2 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5C2journal.c')
| -rw-r--r-- | src/H5C2journal.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/H5C2journal.c b/src/H5C2journal.c index 2908428..0f97e82 100644 --- a/src/H5C2journal.c +++ b/src/H5C2journal.c @@ -59,6 +59,19 @@ hbool_t H5C2__check_for_journaling = TRUE; +/**************************************************************************/ +/***************************** local prototypes ***************************/ +/**************************************************************************/ + +static herr_t H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, + hid_t dxpl_id, + H5C2_mdj_config_t * config_ptr); + +static herr_t H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr); + +static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr); + + /**************************************************************************/ /************************* journaling code proper *************************/ @@ -193,7 +206,7 @@ H5C2_begin_journaling(H5F_t * f, "H5C2_get_journal_config() failed.") } - result = H5C2_call_mdjsc_callbacks(cache_ptr, &config); + result = H5C2_call_mdjsc_callbacks(cache_ptr, dxpl_id, &config); if ( result < 0 ) { @@ -384,7 +397,7 @@ H5C2_end_journaling(H5F_t * f, "H5C2_get_journal_config() failed.") } - result = H5C2_call_mdjsc_callbacks(cache_ptr, &config); + result = H5C2_call_mdjsc_callbacks(cache_ptr, dxpl_id, &config); if ( result < 0 ) { @@ -1950,8 +1963,9 @@ done: *------------------------------------------------------------------------- */ -herr_t +static herr_t H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, + hid_t dxpl_id, H5C2_mdj_config_t * config_ptr) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1960,7 +1974,7 @@ H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, H5C2_mdj_status_change_func_t func_ptr; void * data_ptr; - FUNC_ENTER_NOAPI(H5C2_call_mdjsc_callbacks, FAIL) + FUNC_ENTER_NOAPI_NOINIT(H5C2_call_mdjsc_callbacks) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC ); @@ -2009,7 +2023,7 @@ H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, func_ptr = ((cache_ptr->mdjsc_cb_tbl)[i]).fcn_ptr; data_ptr = ((cache_ptr->mdjsc_cb_tbl)[i]).data_ptr; - func_ptr(config_ptr, data_ptr); + func_ptr(config_ptr, dxpl_id, data_ptr); funcs_called++; } @@ -2236,7 +2250,7 @@ done: *------------------------------------------------------------------------- */ -herr_t +static herr_t H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2246,7 +2260,7 @@ H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr) H5C2_mdjsc_record_t * old_mdjsc_cb_tbl = NULL; H5C2_mdjsc_record_t * new_mdjsc_cb_tbl = NULL; - FUNC_ENTER_NOAPI(H5C2_grow_mdjsc_callback_table, FAIL) + FUNC_ENTER_NOAPI_NOINIT(H5C2_grow_mdjsc_callback_table) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC ); @@ -2491,7 +2505,7 @@ done: *------------------------------------------------------------------------- */ -herr_t +static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2504,7 +2518,7 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr) H5C2_mdjsc_record_t * old_mdjsc_cb_tbl = NULL; H5C2_mdjsc_record_t * new_mdjsc_cb_tbl = NULL; - FUNC_ENTER_NOAPI(H5C2_shrink_mdjsc_callback_table, FAIL) + FUNC_ENTER_NOAPI_NOINIT(H5C2_shrink_mdjsc_callback_table) HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC ); |