[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.

1 files changed, 1 insertions, 11 deletions

diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 40ab9ab..bbbcf11 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -225,17 +225,7 @@ extern hid_t H5AC_ind_dxpl_id;
   /* int         epochs_before_eviction = */ 3,                               \
   /* hbool_t     apply_empty_reserve    = */ TRUE,                            \
   /* double      empty_reserve          = */ 0.1,                             \
-  /* int	 dirty_bytes_threshold  = */ (256 * 1024),                    \
-  /* The following fields are not used by H5AC or H5C -- they exist here */   \
-  /* because they are used by H5AC2 and H5C2, and including them here    */   \
-  /* us to avoid duplicating the user level cache configuration code.    */   \
-  /* hbool_t     enable_journaling       = */ FALSE,                          \
-  /* char        journal_file_path[]     = */ "",                             \
-  /* hbool_t     journal_recovered       = */ FALSE,                          \
-  /* size_t      jbrb_buf_size           = */ (8 * 1024),                     \
-  /* int         jbrb_num_bufs           = */ 2,                              \
-  /* hbool_t     jbrb_use_aio            = */ FALSE,                          \
-  /* hbool_t     jbrb_human_readable     = */ TRUE                            \
+  /* int	 dirty_bytes_threshold  = */ (256 * 1024)                     \
 }