[svn-r15348] Checking in a collection of bug fixes and added test code -- specifically:

1) Fix for failure to detect journaling in progress on HDF5 files which
   were not closed correctly.  Also associated test code.

   Note that this required addition of code to test for journaling in 
   progress and enable journaling at the end of H5F_flush().  In passing,
   I was able to get rid of the wacky code that queued journaling setup
   at cache creation time.

2) Test code for startup and shutdown of journaling on an open file.

3) Updates to start checking journal output against architype files
   instead of just generating architypes at test time.

   Note that per Quincey's request, I have checked in gziped versions
   of the architype files.  At some point, we will have to add code 
   to automatically unzip these files, but for the time being you will
   have to go to test/testfiles and "gunzip *.gz".  The journal tests
   will still pass if you don't, but you will get a warning about 
   missing test files.

4) Fixed bug in journal entry logging code that allowed a comment to 
   appear in the journal file before the journal file header. (Mike M,:
   Please review my fix to verify that I haven't clobbered anything.)

5) Additional test code.

Note that more test code would be a good idea, but this set of bug 
fixes should be enough to get us through the basic demo -- at least 
as far as the metadata cache is concerned.

Tested serial on Phoenix, and parallel on Kagiso.  Also, tested serial
on Linew just prior to some last minute minor edits.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/H5AC2private.h b/src/H5AC2private.h
index b17b09e..6a46339 100644
--- a/src/H5AC2private.h
+++ b/src/H5AC2private.h
@@ -182,6 +182,15 @@ extern hid_t H5AC2_dxpl_id;
 extern hid_t H5AC2_ind_dxpl_id;
 
 
+/* Cache config field limit #defines */
+
+#define H5AC2__MIN_JBRB_BUF_SIZE        H5C2__MIN_JBRB_BUF_SIZE
+#define H5AC2__MAX_JBRB_BUF_SIZE        H5C2__MAX_JBRB_BUF_SIZE
+
+#define H5AC2__MIN_JBRB_NUM_BUFS        H5C2__MIN_JBRB_NUM_BUFS
+#define H5AC2__MAX_JBRB_NUM_BUFS        H5C2__MAX_JBRB_NUM_BUFS
+
+
 /* Default cache configuration. */
 
 #define H5AC2__DEFAULT_CACHE_CONFIG                                           \
@@ -262,6 +271,10 @@ extern hid_t H5AC2_ind_dxpl_id;
 /* external function declarations: */
 
 H5_DLL herr_t H5AC2_init(void);
+H5_DLL herr_t H5AC2_check_for_journaling(H5F_t * f,
+                                         hid_t dxpl_id,
+                                         H5C2_t * cache_ptr,
+                                         hbool_t journal_recovered);
 H5_DLL herr_t H5AC2_create(H5F_t *f, 
 		           hid_t dxpl_id, 
 			   H5AC2_cache_config_t *config_ptr);
@@ -331,6 +344,11 @@ H5_DLL herr_t H5AC2_set_cache_auto_resize_config(H5F_t * f,
                                                  hid_t dxpl_id,
                                                  H5AC2_cache_config_t *config_ptr);
 
+H5_DLL herr_t H5AC2_set_cache_journaling_config(H5F_t * f,
+                                                hid_t dxpl_id,
+                                                H5AC2_cache_config_t *config_ptr,
+                                                hbool_t show_trace);
+
 H5_DLL herr_t H5AC2_validate_config(H5AC2_cache_config_t * config_ptr);
 
 H5_DLL herr_t H5AC2_close_trace_file(H5AC2_t * cache_ptr);