[svn-r15388] Description:

	Convert object header cache client to use the new metadata journaling
cache, which included adding a new client for handling continuation chunks.
Added "real" protect calls around modifying chunks in object headers.

	Switched a few more metadata cache library API routines to drop the
file pointer, when it is not needed (pinning/unpinning entries, etc.)

	Fixed bug in journaling cache handling of 'image_len' callbacks and
also changed cache to retry deserializing entries when the entry's size is
larger than the speculative size initially tried.

	Retrying for 'image_len' callbacks has problems with the 'multi' VFD,
so the h5dump and FORTRAN 'multi' tests are commented out, until the changes to
the 'multi' VFD from the file free space branch are brought back into the
trunk.

	Currently, the 'h5recover' tool has a bug which requires it to be run
twice before replaying the journal "sticks".  However, this is from an earlier
checkin, since the code in the branch already has this behavior... :-(

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.5.4 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

4 files changed, 21 insertions, 21 deletions

diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index c5f8aae..dc047ed 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -1409,7 +1409,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
             success = FALSE;
             if ( verbose ) {
                 HDfprintf(stdout,
-                          "%d:%s: data[i].len = %d != mssg->len = %d.\n",
+                          "%d:%s: data[i].len = %Zu != mssg->len = %d.\n",
                            world_mpi_rank, fcn_name,
                            data[target_index].len, mssg_ptr->len);
             }
@@ -1421,7 +1421,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
                 HDfprintf(stdout,
                   "%d:%s: proc %d read invalid entry. idx/base_addr = %d/%a.\n",
                          world_mpi_rank, fcn_name,
-                         mssg_ptr->src, target_index,
+                         mssg_ptr->src, 
 			target_index,
 			data[target_index].base_addr);
             }
@@ -1586,7 +1586,7 @@ serve_write_request(struct mssg_t * mssg_ptr)
             success = FALSE;
             if ( verbose ) {
                 HDfprintf(stdout,
-                          "%d:%s: data[i].len = %d != mssg->len = %d.\n",
+                          "%d:%s: data[i].len = %Zu != mssg->len = %d.\n",
                           world_mpi_rank, fcn_name,
                           data[target_index].len, mssg_ptr->len);
             }
@@ -3520,9 +3520,11 @@ setup_rand(void)
             }
         } else {
             seed = (unsigned)tv.tv_usec;
-	    HDfprintf(stdout, "%d:%s: seed = %d.\n",
-                      world_mpi_rank, fcn_name, seed);
-	    fflush(stdout);
+            if ( verbose ) {
+                HDfprintf(stdout, "%d:%s: seed = %d.\n",
+                          world_mpi_rank, fcn_name, seed);
+                fflush(stdout);
+            }
             HDsrand(seed);
         }
     }
diff --git a/testpar/t_cache2.c b/testpar/t_cache2.c
index a3731fb..d73e0b5 100644
--- a/testpar/t_cache2.c
+++ b/testpar/t_cache2.c
@@ -1444,7 +1444,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
             success = FALSE;
             if ( verbose ) {
                 HDfprintf(stdout,
-                          "%d:%s: data[i].len = %d != mssg->len = %d.\n",
+                          "%d:%s: data[i].len = %Zu != mssg->len = %d.\n",
                            world_mpi_rank, fcn_name,
                            data[target_index].len, mssg_ptr->len);
             }
@@ -1456,7 +1456,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
                 HDfprintf(stdout,
                   "%d:%s: proc %d read invalid entry. idx/base_addr = %d/%a.\n",
                          world_mpi_rank, fcn_name,
-                         mssg_ptr->src, target_index,
+                         mssg_ptr->src, 
 			target_index,
 			data[target_index].base_addr);
             }
@@ -1621,7 +1621,7 @@ serve_write_request(struct mssg_t * mssg_ptr)
             success = FALSE;
             if ( verbose ) {
                 HDfprintf(stdout,
-                          "%d:%s: data[i].len = %d != mssg->len = %d.\n",
+                          "%d:%s: data[i].len = %Zu != mssg->len = %d.\n",
                           world_mpi_rank, fcn_name,
                           data[target_index].len, mssg_ptr->len);
             }
@@ -2842,8 +2842,7 @@ mark_pinned_entry_dirty(H5C2_t * cache_ptr,
         (entry_ptr->ver)++;
         entry_ptr->dirty = TRUE;
 
-	result = H5AC2_mark_pinned_entry_dirty(file_ptr,
-	                                      (void *)entry_ptr,
+	result = H5AC2_mark_pinned_entry_dirty( (void *)entry_ptr,
                                               size_changed,
                                               new_size);
 
@@ -2907,8 +2906,7 @@ mark_pinned_or_protected_entry_dirty(H5C2_t * cache_ptr,
         (entry_ptr->ver)++;
         entry_ptr->dirty = TRUE;
 
-	result = H5AC2_mark_pinned_or_protected_entry_dirty(file_ptr,
-	                                                   (void *)entry_ptr);
+	result = H5AC2_mark_pinned_or_protected_entry_dirty( (void *)entry_ptr);
 
         if ( result < 0 ) {
 
@@ -3042,7 +3040,7 @@ pin_protected_entry(H5C2_t * cache_ptr,
 
     if ( nerrors == 0 ) {
 
-	result = H5AC2_pin_protected_entry(file_ptr, (void *)entry_ptr);
+	result = H5AC2_pin_protected_entry((void *)entry_ptr);
 
         if ( ( result < 0 ) ||
              ( entry_ptr->header.type != &(types[0]) ) ||
@@ -3239,8 +3237,7 @@ resize_entry(H5C2_t * cache_ptr,
 	HDassert( new_size > 0 );
 	HDassert( new_size <= entry_ptr->len );
 
-	result = H5AC2_resize_pinned_entry(file_ptr, (void *)entry_ptr, 
-			                  new_size);
+	result = H5AC2_resize_pinned_entry((void *)entry_ptr, new_size);
 
         if ( result < 0 ) {
 
@@ -3618,9 +3615,11 @@ setup_rand(void)
             }
         } else {
             seed = (unsigned)tv.tv_usec;
-	    HDfprintf(stdout, "%d:%s: seed = %d.\n",
-                      world_mpi_rank, fcn_name, seed);
-	    fflush(stdout);
+            if ( verbose ) {
+                HDfprintf(stdout, "%d:%s: seed = %d.\n",
+                          world_mpi_rank, fcn_name, seed);
+                fflush(stdout);
+            }
             HDsrand(seed);
         }
     }
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c
index 8734bfb..e8f3f6c 100644
--- a/testpar/t_pflush1.c
+++ b/testpar/t_pflush1.c
@@ -121,7 +121,6 @@ int
 main(int argc, char* argv[])
 {
     hid_t file1, file2, fapl;
-    MPI_File	mpifh=-2;
     int		*mpifh_p = NULL;
     char	name[1024];
     const char  *envval = NULL;
diff --git a/testpar/t_posix_compliant.c b/testpar/t_posix_compliant.c
index a4b8a86..3c7a2b3 100644
--- a/testpar/t_posix_compliant.c
+++ b/testpar/t_posix_compliant.c
@@ -725,7 +725,7 @@ static void vrfy_elements(int* a, int* b, int size, int rank)
 
 /* print an explanation message by MAIN (0) process.
  */
-header_msg(void)
+void header_msg(void)
 {
     printf(
 "Purpose:\n"