diff options
author | John Mainzer <mainzer@hdfgroup.org> | 2008-08-08 10:55:21 (GMT) |
---|---|---|
committer | John Mainzer <mainzer@hdfgroup.org> | 2008-08-08 10:55:21 (GMT) |
commit | e36116f962b815ff485f2c964f99483a1af069b6 (patch) | |
tree | 8689421d05f99568d2743f580dce835cb9c53ec1 /tools/h5recover/h5recover.c | |
parent | 2228cc83933f742122a399811017ecb581eeb84f (diff) | |
download | hdf5-e36116f962b815ff485f2c964f99483a1af069b6.zip hdf5-e36116f962b815ff485f2c964f99483a1af069b6.tar.gz hdf5-e36116f962b815ff485f2c964f99483a1af069b6.tar.bz2 |
[svn-r15452] Reworked journaling control code to remove journaling configuration
from the H5AC2_cache_config_t structure and the associated
H5P/H5Fget/set_mdc_config() API calls, and into the newly created
H5AC2_jnl_config_t structure and H5P/H5Fget/set_jnl_config() calls.
Updated test code accordingly.
Updated the trace file test code for journaling.
Also folded in a fix to an assertion bug in H5C2pkh.h
Tested serial on Phoenix and Linew, and parallel (with and without the
trace file enabled) on kagiso.
Diffstat (limited to 'tools/h5recover/h5recover.c')
-rw-r--r-- | tools/h5recover/h5recover.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/h5recover/h5recover.c b/tools/h5recover/h5recover.c index 1ee65ff..692ba8b 100644 --- a/tools/h5recover/h5recover.c +++ b/tools/h5recover/h5recover.c @@ -201,7 +201,7 @@ main (int argc, const char *argv[]) char * p; /* pointer */ hbool_t custom_name = 0; /* bool indicating custom backup name */ hbool_t no_copy = 0; /* bool indicating not to make backup */ - H5AC_cache_config_t config; /* cache configuration */ + H5AC2_jnl_config_t config; /* journaling configuration */ hbool_t check_file = 1; /* boolean indicating whether to check */ uint8_t * compare_buf; /* buffer to read into from hdf5 file */ hid_t status = -1; /* status indicator for retval checking */ @@ -314,7 +314,7 @@ main (int argc, const char *argv[]) config.version = 1; /* should be H5C2__CURR_AUTO_SIZE_CTL_VER */ /* get H5AC_cache_config_t configuration from fapl */ - if ( H5Pget_mdc_config(fapl, &config) == -1) { + if ( H5Pget_jnl_config(fapl, &config) == -1) { error_msg(progname, "Could not get mdc config from FAPL.\n"); leave( EXIT_FAILURE ); @@ -325,9 +325,9 @@ main (int argc, const char *argv[]) config.journal_recovered = TRUE; /* set H5AC_cache_config_t configuration with file recovered */ - if ( H5Pset_mdc_config(fapl, &config) == -1) { + if ( H5Pset_jnl_config(fapl, &config) == -1) { - error_msg(progname, "Could not set mdc config on FAPL.\n"); + error_msg(progname, "Could not set jnl config on FAPL.\n"); leave( EXIT_FAILURE ); } /* end if */ |