summaryrefslogtreecommitdiffstats
path: root/src/H5F.c
diff options
context:
space:
mode:
authorJohn Mainzer <mainzer@hdfgroup.org>2008-08-22 13:57:58 (GMT)
committerJohn Mainzer <mainzer@hdfgroup.org>2008-08-22 13:57:58 (GMT)
commit1db502ee8e4dd32ace4d61c0095fe841fb3f4e20 (patch)
tree672aa689594c4ac04711ce88c7997cefff7e9d9f /src/H5F.c
parent98364cc7cf456e5279ef63c8d5450cbd9a25d65e (diff)
downloadhdf5-1db502ee8e4dd32ace4d61c0095fe841fb3f4e20.zip
hdf5-1db502ee8e4dd32ace4d61c0095fe841fb3f4e20.tar.gz
hdf5-1db502ee8e4dd32ace4d61c0095fe841fb3f4e20.tar.bz2
[svn-r15518] A variety of changes:
1) Removed references to H5AC2__CURR_JNL_CONFIG_VER from H5Fget_jnl_config() and H5Pget_jnl_config(), and also references to H5AC__CURR_CACHE_CONFIG_VERSION from H5Fget_mdc_config() and H5Pget_mdc_config(). 2) Removed H5Pset_journal() from H5C2journal.c, and modified test code to use H5F/Pget/set_mdj_config() instead. 3) Implemented support for callbacks on metadata journaling status change along with the associated registration / deregistration calls and associated test code. 4) Fixed bug in journaling shutdown exposed by 3 above. Tested and passed on Phoenix (serial), Linew (serial), and Kagiso (parallel). However, while I was testing there were a couple of checkins, forcing an update and second round of testing. On the second round, tested and passed on Phoenix (serial) and Kagiso (parallel), but failed on Linew (serial). As best I can tell, this was caused by Mike M's checkin -- which broke the smoke checks in cache2_journal on Linew but not Phoenix or Kagiso. A typical delta in the architype files follows: linew.hdfgroup.uiuc.edu% diff -ctw cache2_journal_sc00_000.jnl tmp/cache2_journal_sc00_000.jnl *** cache2_journal_sc00_000.jnl Fri Aug 22 08:28:49 2008 --- tmp/cache2_journal_sc00_000.jnl Fri Aug 22 05:08:41 2008 *************** *** 1,5 **** ! 0 ver_num 1 target_file_name cache_journal_test.h5 creation_date Fri Aug 22 human_readable 1 ! E eoa_value 0x0 C comment Begin transaction on transaction 1.0. 1 bgn_trans 1 2 trans_num 1 length 1 base_addr 0x401 body 01 --- 1,5 ---- ! 0 ver_num 1 target_file_name cache_journal_test.h5 creation_date Wed Aug 20 human_readable 1 ! E eoa_value 0x772a9c01 C comment Begin transaction on transaction 1.0. 1 bgn_trans 1 2 trans_num 1 length 1 base_addr 0x401 body 01 As you can see, it looks like garbage is getting into the first eoa write on Linew. I'm checking in anyway, as Quincey needs my changes, and I will not have time to work on this for several days. Mike: Let me know if you are tackling this one -- if not, I'll deal with it.
Diffstat (limited to 'src/H5F.c')
-rw-r--r--src/H5F.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/H5F.c b/src/H5F.c
index 7919d0a..763e911 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1412,7 +1412,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
"H5AC2_check_for_journaling() reports failure.")
}
- if ( H5AC2_set_jnl_config(file, dxpl_id, config_ptr) < 0 ) {
+ if ( H5AC2_set_jnl_config(file, dxpl_id, config_ptr, TRUE) < 0 ) {
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, \
"H5AC2_set_jnl_config() failed.")
@@ -3396,7 +3396,7 @@ H5Fget_jnl_config(hid_t file_id,
}
if ( ( NULL == config_ptr ) ||
- ( config_ptr->version != H5AC2__CURR_JNL_CONFIG_VER ) ) {
+ ( ! H5AC2_validate_jnl_config_ver(config_ptr->version) ) ) {
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config_ptr")
}
@@ -3455,7 +3455,10 @@ H5Fset_jnl_config(hid_t file_id,
}
/* set the resize configuration */
- result = H5AC2_set_jnl_config(file, H5P_DATASET_XFER_DEFAULT, config_ptr);
+ result = H5AC2_set_jnl_config(file,
+ H5P_DATASET_XFER_DEFAULT,
+ config_ptr,
+ FALSE);
if ( result != SUCCEED ) {
@@ -3512,7 +3515,7 @@ H5Fget_mdc_config(hid_t file_id,
}
if ( ( NULL == config_ptr ) ||
- ( config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION ) ) {
+ ( ! H5AC2_validate_cache_config_ver(config_ptr->version) ) ) {
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config_ptr")
}