[svn-r15763] Converted the fractal heap direct block cache client to use the

revised cache.

Note that this conversion is not as efficient as it should be.  Specifically,
it does it more memcpy's between the metadata cache's on disk image of the 
direct block and the fractal heap's on disk image of the direct block than 
is absolutely essential.  Eventually, we will want to fix this -- probably
by allowing the metadata cache and the fractal heap direct block to share
a common on disk image of the direct block.  However, this will require 
extensions to the client / metadata cache interface, and some reworking of 
the fractal heap as well.

This checkin also includes Mike M's fix to the Linew specific bug mentioned
in my checkin of 22 Aug 2008.

Tested on Phoenix (serial debug and production), 
          Kagiso (parallel), and 
	  Linew (serial)

1 files changed, 20 insertions, 10 deletions

diff --git a/test/cache2_common.h b/test/cache2_common.h
index ea6f6b7..71b7e8f 100644
--- a/test/cache2_common.h
+++ b/test/cache2_common.h
@@ -566,43 +566,53 @@ herr_t huge_image_len(void *thing, size_t *image_len_ptr);
 herr_t monster_image_len(void *thing, size_t *image_len_ptr);
 herr_t variable_image_len(void *thing, size_t *image_len_ptr);
 
-herr_t pico_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t pico_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		      size_t len, void * image_ptr, 
 		      void * thing, unsigned * flags_ptr, 
 		      haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 		      void ** new_image_ptr_ptr);
-herr_t nano_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t nano_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		      size_t len, void * image_ptr, 
 		      void * thing, unsigned * flags_ptr, 
 		      haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 		      void ** new_image_ptr_ptr);
-herr_t micro_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t micro_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		       size_t len, void * image_ptr, 
 		       void * thing, unsigned * flags_ptr, 
 		       haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 		       void ** new_image_ptr_ptr);
-herr_t tiny_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t tiny_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		      size_t len, void * image_ptr, 
 		      void * thing, unsigned * flags_ptr, 
 		      haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 		      void ** new_image_ptr_ptr);
-herr_t small_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t small_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		       size_t len, void * image_ptr, 
 		       void * thing, unsigned * flags_ptr, 
 		       haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 		       void ** new_image_ptr_ptr);
-herr_t medium_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t medium_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		        size_t len, void * image_ptr, 
 	  	        void * thing, unsigned * flags_ptr, 
 		        haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 		        void ** new_image_ptr_ptr);
-herr_t large_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t large_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		       size_t len, void * image_ptr, 
 		       void * thing, unsigned * flags_ptr, 
 		       haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 		       void ** new_image_ptr_ptr);
-herr_t huge_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t huge_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		      size_t len, void * image_ptr, 
 	              void * thing, unsigned * flags_ptr, 
 	              haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 	              void ** new_image_ptr_ptr);
-herr_t monster_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t monster_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		         size_t len, void * image_ptr, 
 	                 void * thing, unsigned * flags_ptr, 
 	                 haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 	                 void ** new_image_ptr_ptr);
-herr_t variable_serialize(const H5F_t *f, haddr_t addr, size_t len, void * image_ptr, 
+herr_t variable_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+		          size_t len, void * image_ptr, 
 	                  void * thing, unsigned * flags_ptr, 
 	                  haddr_t * new_addr_ptr, size_t * new_len_ptr, 
 	                  void ** new_image_ptr_ptr);