[svn-r15514] Purpose:

 - EOA logging update

Description:
 - EOA values will now be written to the journal
   file in their own transaction when the EOA 
   changes.

 - The EOA will be udpated in the HDF5 file's 
   superblock before the recovery process begins.
   This should prevent some loss of raw data as the 
   file won't be getting truncated upon file open as 
   it will read the correct EOA value from the
   superblock.

 - Removed storing of EOA in journal entry messages
   since they're in their own transaction.

 - Updated tests to reflect change of transaction
   formats. Regenerated smoke test files to account
   for new entry types, and tweaked transaction number
   tests to reflect change in size of journal entries.

 - Large testfiles (in test/testfiles) should now
   unzip when ./configure is run.

 - When journal file is supplied but contains no 
   complete transactions, instead of reporting 
   an error, h5recover now informs the user of said
   nonexistant transactions, and opens/closes the
   hdf5 file with the journal recovered flag set.

 - Other various organizational changes to h5recover,
   included a bit more added to verbose output.

Tested:
 - kagiso, smirom

30 files changed, 11 insertions, 24 deletions

diff --git a/test/cache2_journal.c b/test/cache2_journal.c
index 633414e..fb199d5 100644
--- a/test/cache2_journal.c
+++ b/test/cache2_journal.c
@@ -9336,7 +9336,6 @@ check_message_format(void)
 
         if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
                                     /* trans number */  (uint64_t)1, 
-                                    /* eoa */           (haddr_t)1,
                                     /* base address */  (haddr_t)0, 
                                     /* data length  */  1, 
                                     /* data         */  (const uint8_t *)"A") 
@@ -9358,7 +9357,6 @@ check_message_format(void)
 
         if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
                                     /* trans number */  (uint64_t)1, 
-                                    /* eoa */           (haddr_t)1,
                                     /* base address */  (haddr_t)1, 
                                     /* data length  */  2, 
                                     /* data         */  (const uint8_t *)"AB") 
@@ -9380,7 +9378,6 @@ check_message_format(void)
 
         if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
                                     /* trans number */  (uint64_t)1, 
-                                    /* eoa */           (haddr_t)1,
                                     /* base address */  (haddr_t)3, 
                                     /* data length  */  4, 
                                     /* data         */  (const uint8_t *)"CDEF") 
@@ -9437,7 +9434,6 @@ check_message_format(void)
 
         if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
                                     /* trans number */  (uint64_t)2, 
-                                    /* eoa */           (haddr_t)1,
                                     /* base address */  (haddr_t)285, 
                                     /* data length  */  11, 
                                     /* data         */  (const uint8_t *)"Test Data?!") 
@@ -9493,12 +9489,12 @@ check_message_format(void)
     /* Fill out verify array with expected messages */
     sprintf(verify[0], "0 ver_num 1 target_file_name HDF5.file creation_date %10.10s human_readable 1\n", ctime(&current_date));
     sprintf(verify[1], "1 bgn_trans 1\n");
-    sprintf(verify[2], "2 trans_num 1 eoa 0x1 length 1 base_addr 0x0 body  41 \n");
-    sprintf(verify[3], "2 trans_num 1 eoa 0x1 length 2 base_addr 0x1 body  41 42 \n");
-    sprintf(verify[4], "2 trans_num 1 eoa 0x1 length 4 base_addr 0x3 body  43 44 45 46 \n");
+    sprintf(verify[2], "2 trans_num 1 length 1 base_addr 0x0 body  41 \n");
+    sprintf(verify[3], "2 trans_num 1 length 2 base_addr 0x1 body  41 42 \n");
+    sprintf(verify[4], "2 trans_num 1 length 4 base_addr 0x3 body  43 44 45 46 \n");
     sprintf(verify[5], "3 end_trans 1\n");
     sprintf(verify[6], "1 bgn_trans 2\n");
-    sprintf(verify[7], "2 trans_num 2 eoa 0x1 length 11 base_addr 0x11d body  54 65 73 74 20 44 61 74 61 3f 21 \n");
+    sprintf(verify[7], "2 trans_num 2 length 11 base_addr 0x11d body  54 65 73 74 20 44 61 74 61 3f 21 \n");
     sprintf(verify[8], "3 end_trans 2\n");
 
     /* verify that messages in journal are same as expected */
@@ -9560,7 +9556,6 @@ check_message_format(void)
 
         if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
                                     /* trans number */  (uint64_t)3, 
-                                    /* eoa */           (haddr_t)1,
                                     /* base address */  (haddr_t)28591, 
                                     /* data length  */  6, 
                                     /* data         */  (const uint8_t *)"#1nN`}") 
@@ -9650,7 +9645,7 @@ check_message_format(void)
     /* Fill out verify array with expected messages */
     sprintf(verify[0], "0 ver_num 1 target_file_name HDF5.file creation_date %10.10s human_readable 1\n", ctime(&current_date));
     sprintf(verify[1], "1 bgn_trans 3\n");
-    sprintf(verify[2], "2 trans_num 3 eoa 0x1 length 6 base_addr 0x6faf body  23 31 6e 4e 60 7d \n");
+    sprintf(verify[2], "2 trans_num 3 length 6 base_addr 0x6faf body  23 31 6e 4e 60 7d \n");
     sprintf(verify[3], "3 end_trans 3\n");
     sprintf(verify[4], "C comment This is a comment!\n");
     sprintf(verify[5], "C comment This is another comment!\n");
@@ -9840,7 +9835,6 @@ check_legal_calls(void)
 
 	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
                                     /* Transaction # */  (uint64_t)1,
-                                    /* eoa */            (haddr_t)1,
                                     /* Base Address  */  (haddr_t)123456789, 
                                     /* Length        */  16, 
                                     /* Body          */  (const uint8_t *)"This should fail")
@@ -9921,7 +9915,6 @@ check_legal_calls(void)
 
 	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
                                     /* Transaction # */  (uint64_t)2,
-                                    /* eoa */            (haddr_t)1,
                                     /* Base Address  */  (haddr_t)123456789, 
                                     /* Length        */  16, 
                                     /* Body          */  (const uint8_t *)"This should fail")
@@ -9943,7 +9936,6 @@ check_legal_calls(void)
 
 	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
                                     /* Transaction # */  (uint64_t)1,
-                                    /* eoa */            (haddr_t)1,
                                     /* Base Address  */  (haddr_t)123456789, 
                                     /* Length        */  51, 
                                     /* Body          */  (const uint8_t *)"This is the first transaction during transaction 1.")
@@ -10040,7 +10032,6 @@ check_legal_calls(void)
 
 	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
                                     /* Transaction # */  (uint64_t)2,
-                                    /* eoa */            (haddr_t)1,
                                     /* Base Address  */  (haddr_t)7465, 
                                     /* Length        */  51, 
                                     /* Body          */  (const uint8_t *)"This is the first transaction during transaction 2!")
@@ -10062,7 +10053,6 @@ check_legal_calls(void)
 
 	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
                                     /* Transaction # */  (uint64_t)2,
-                                    /* eoa */            (haddr_t)1,
                                     /* Base Address  */  (haddr_t)123456789, 
                                     /* Length        */  60, 
                                     /* Body          */  (const uint8_t *)"... And here's your second transaction during transaction 2.")
@@ -10812,10 +10802,9 @@ write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
 
 	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr, 
                                             /* Transaction # */  trans_num,
-                                            /* eoa */            (haddr_t)16,
                                             /* Base Address  */  (haddr_t)16, 
-                                            /* Length        */  6, 
-                                            /* Body          */  (const uint8_t *)"XXXXXX")
+                                            /* Length        */  9, 
+                                            /* Body          */  (const uint8_t *)"XXXXXXXXX")
                    != SUCCEED ) {
 
 	            pass2 = FALSE;
@@ -10829,10 +10818,9 @@ write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
 
 	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr, 
                                             /* Transaction # */  trans_num,
-                                            /* eoa */            (haddr_t)16,
                                             /* Base Address  */  (haddr_t)16, 
-                                            /* Length        */  5, 
-                                            /* Body          */  (const uint8_t *)"XXXXX")
+                                            /* Length        */  8, 
+                                            /* Body          */  (const uint8_t *)"XXXXXXXX")
                    != SUCCEED ) {
 
 	            pass2 = FALSE;
@@ -10846,10 +10834,9 @@ write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
 
 	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr, 
                                             /* Transaction # */  trans_num,
-                                            /* eoa */            (haddr_t)16,
                                             /* Base Address  */  (haddr_t)16, 
-                                            /* Length        */  4, 
-                                            /* Body          */  (const uint8_t *)"XXXX")
+                                            /* Length        */  7, 
+                                            /* Body          */  (const uint8_t *)"XXXXXXX")
                    != SUCCEED ) {
 
 	            pass2 = FALSE;
diff --git a/test/testfiles/cache2_journal_sc00_000.jnl.gz b/test/testfiles/cache2_journal_sc00_000.jnl.gz
index 5f4311e..2b1646d 100755
--- a/test/testfiles/cache2_journal_sc00_000.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_001.jnl.gz b/test/testfiles/cache2_journal_sc00_001.jnl.gz
index 7f711dc..4989b62 100755
--- a/test/testfiles/cache2_journal_sc00_001.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_002.jnl.gz b/test/testfiles/cache2_journal_sc00_002.jnl.gz
index 62d6929..ad81f72 100755
--- a/test/testfiles/cache2_journal_sc00_002.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_003.jnl.gz b/test/testfiles/cache2_journal_sc00_003.jnl.gz
index cd60e35..44512bb 100755
--- a/test/testfiles/cache2_journal_sc00_003.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_004.jnl.gz b/test/testfiles/cache2_journal_sc00_004.jnl.gz
index ffacdc0..87ae0f0 100755
--- a/test/testfiles/cache2_journal_sc00_004.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_004.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_005.jnl.gz b/test/testfiles/cache2_journal_sc00_005.jnl.gz
index e777a18..c1550f0 100755
--- a/test/testfiles/cache2_journal_sc00_005.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_005.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_006.jnl.gz b/test/testfiles/cache2_journal_sc00_006.jnl.gz
index bfab587..a845a4f 100755
--- a/test/testfiles/cache2_journal_sc00_006.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_006.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_007.jnl.gz b/test/testfiles/cache2_journal_sc00_007.jnl.gz
index d2d8e5f..02fbaff 100755
--- a/test/testfiles/cache2_journal_sc00_007.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_007.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_008.jnl.gz b/test/testfiles/cache2_journal_sc00_008.jnl.gz
index 8ea7164..97e2444 100755
--- a/test/testfiles/cache2_journal_sc00_008.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_008.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_009.jnl.gz b/test/testfiles/cache2_journal_sc00_009.jnl.gz
index f345dcb..b3c9be1 100755
--- a/test/testfiles/cache2_journal_sc00_009.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_009.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_010.jnl.gz b/test/testfiles/cache2_journal_sc00_010.jnl.gz
index d761163..f3134fc 100755
--- a/test/testfiles/cache2_journal_sc00_010.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_010.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_011.jnl.gz b/test/testfiles/cache2_journal_sc00_011.jnl.gz
index 176fc0c..bd2de80 100755
--- a/test/testfiles/cache2_journal_sc00_011.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_011.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_012.jnl.gz b/test/testfiles/cache2_journal_sc00_012.jnl.gz
index b8cf81a..a8ac645 100755
--- a/test/testfiles/cache2_journal_sc00_012.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_012.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_013.jnl.gz b/test/testfiles/cache2_journal_sc00_013.jnl.gz
index 7fb6958..9898d8c 100755
--- a/test/testfiles/cache2_journal_sc00_013.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_013.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_014.jnl.gz b/test/testfiles/cache2_journal_sc00_014.jnl.gz
index 6a6eb10..fcd6826 100755
--- a/test/testfiles/cache2_journal_sc00_014.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_014.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_015.jnl.gz b/test/testfiles/cache2_journal_sc00_015.jnl.gz
index 2af775b..fd8b45f 100755
--- a/test/testfiles/cache2_journal_sc00_015.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_015.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_016.jnl.gz b/test/testfiles/cache2_journal_sc00_016.jnl.gz
index 2de5c38..6f89ad1 100755
--- a/test/testfiles/cache2_journal_sc00_016.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_016.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_017.jnl.gz b/test/testfiles/cache2_journal_sc00_017.jnl.gz
index f60aed8..79a96ae 100755
--- a/test/testfiles/cache2_journal_sc00_017.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_017.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_018.jnl.gz b/test/testfiles/cache2_journal_sc00_018.jnl.gz
index c6f10ee..50c8dc3 100755
--- a/test/testfiles/cache2_journal_sc00_018.jnl.gz
+++ b/test/testfiles/cache2_journal_sc00_018.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_000.jnl.gz b/test/testfiles/cache2_journal_sc01_000.jnl.gz
index 5d37f04..3244641 100755
--- a/test/testfiles/cache2_journal_sc01_000.jnl.gz
+++ b/test/testfiles/cache2_journal_sc01_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_001.jnl.gz b/test/testfiles/cache2_journal_sc01_001.jnl.gz
index 669a307..9563e51 100755
--- a/test/testfiles/cache2_journal_sc01_001.jnl.gz
+++ b/test/testfiles/cache2_journal_sc01_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_002.jnl.gz b/test/testfiles/cache2_journal_sc01_002.jnl.gz
index a684d6d..cac45ff 100755
--- a/test/testfiles/cache2_journal_sc01_002.jnl.gz
+++ b/test/testfiles/cache2_journal_sc01_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_003.jnl.gz b/test/testfiles/cache2_journal_sc01_003.jnl.gz
index c9265ff..a3cfa45 100755
--- a/test/testfiles/cache2_journal_sc01_003.jnl.gz
+++ b/test/testfiles/cache2_journal_sc01_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_004.jnl.gz b/test/testfiles/cache2_journal_sc01_004.jnl.gz
index aacc153..9ce7738 100755
--- a/test/testfiles/cache2_journal_sc01_004.jnl.gz
+++ b/test/testfiles/cache2_journal_sc01_004.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_000.jnl.gz b/test/testfiles/cache2_journal_sc02_000.jnl.gz
index d5675ed..e3906ad 100755
--- a/test/testfiles/cache2_journal_sc02_000.jnl.gz
+++ b/test/testfiles/cache2_journal_sc02_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_001.jnl.gz b/test/testfiles/cache2_journal_sc02_001.jnl.gz
index 6a8fbf7..3990c93 100755
--- a/test/testfiles/cache2_journal_sc02_001.jnl.gz
+++ b/test/testfiles/cache2_journal_sc02_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_002.jnl.gz b/test/testfiles/cache2_journal_sc02_002.jnl.gz
index 121017e..5e0cd42 100755
--- a/test/testfiles/cache2_journal_sc02_002.jnl.gz
+++ b/test/testfiles/cache2_journal_sc02_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_003.jnl.gz b/test/testfiles/cache2_journal_sc02_003.jnl.gz
index b5dbf0a..ef6df83 100755
--- a/test/testfiles/cache2_journal_sc02_003.jnl.gz
+++ b/test/testfiles/cache2_journal_sc02_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_004.jnl.gz b/test/testfiles/cache2_journal_sc02_004.jnl.gz
index 6b16e37..833438e 100755
--- a/test/testfiles/cache2_journal_sc02_004.jnl.gz
+++ b/test/testfiles/cache2_journal_sc02_004.jnl.gz