[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, 8 insertions, 14 deletions

diff --git a/src/H5C2private.h b/src/H5C2private.h
index d397548..a1cc12f 100644
--- a/src/H5C2private.h
+++ b/src/H5C2private.h
@@ -1179,6 +1179,12 @@ typedef struct H5C2_cache_entry_t
 #define H5C2__DEF_AR_EPOCH_LENGTH		50000
 #define H5C2__MAX_AR_EPOCH_LENGTH		1000000
 
+#define H5C2__MIN_JBRB_BUF_SIZE			((size_t)(1))
+#define H5C2__MAX_JBRB_BUF_SIZE			((size_t)(2 * 1024 * 1024))
+
+#define H5C2__MIN_JBRB_NUM_BUFS			1
+#define H5C2__MAX_JBRB_NUM_BUFS			100
+
 enum H5C2_resize_status
 {
     in_spec2,
@@ -1314,17 +1320,14 @@ typedef struct H5C2_auto_size_ctl_t
 #define H5C2__READ_ONLY_FLAG			0x0400
 #define H5C2__CHECK_SIZE_FLAG			0x0800
 
-H5_DLL H5C2_t * H5C2_create(H5F_t *                     f,
-                            hid_t                       dxpl_id,
-		            size_t                      max_cache_size,
+H5_DLL H5C2_t * H5C2_create(size_t                      max_cache_size,
                             size_t                      min_clean_size,
                             int                         max_type_id,
 			    const char *                (* type_name_table_ptr),
                             H5C2_write_permitted_func_t check_write_permitted,
                             hbool_t                     write_permitted,
                             H5C2_log_flush_func_t       log_flush,
-                            void *                      aux_ptr,
-			    hbool_t                     journal_recovered);
+                            void *                      aux_ptr);
 
 H5_DLL void H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr,
                                          int32_t version,
@@ -1502,15 +1505,6 @@ H5_DLL herr_t H5C2_journal_pre_flush(H5C2_t * cache_ptr);
 H5_DLL herr_t H5C2_journal_transaction(H5F_t * f,
                                        H5C2_t * cache_ptr);
 
-H5_DLL herr_t H5C2_queue_begin_journaling(H5F_t * f,
-                                          hid_t dxpl_id,
-                                          H5C2_t * cache_ptr,
-                                          char * journal_file_name_ptr,
-                                          size_t buf_size,
-                                          int num_bufs,
-                                          hbool_t use_aio,
-                                          hbool_t human_readable);
-
 H5_DLL herr_t H5C2_update_for_new_last_trans_on_disk(H5C2_t * cache_ptr,
                                              uint64_t new_last_trans_on_disk);