[svn-r712] Added temporary buffer support to several places in the library which were

calling malloc too often.  Also, added caching of hyperslab blocks, which
improves performance _significantly_ for hyperslab I/O.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index cf6fdee..f3edd63 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -12,6 +12,7 @@
 #include <H5MMprivate.h>
 #include <H5Sprivate.h>
 #include <H5Vprivate.h>
+#include <H5Dprivate.h>
 
 /* Interface initialization */
 #define PABLO_MASK      H5S_point_mask
@@ -27,14 +28,14 @@ static size_t H5S_point_fgath (H5F_t *f, const struct H5O_layout_t *layout,
 			       const struct H5O_efl_t *efl, size_t elmt_size,
 			       const H5S_t *file_space,
 			       H5S_sel_iter_t *file_iter, size_t nelmts,
-			       const H5D_transfer_t xfer_mode,
+			       const void *_xfer_parms,
 			       void *buf/*out*/);
 static herr_t H5S_point_fscat (H5F_t *f, const struct H5O_layout_t *layout,
 			       const struct H5O_pline_t *pline,
 			       const struct H5O_efl_t *efl, size_t elmt_size,
 			       const H5S_t *file_space,
 			       H5S_sel_iter_t *file_iter, size_t nelmts,
-			       const H5D_transfer_t xfer_mode,
+			       const void *_xfer_parms,
 			       const void *buf);
 static size_t H5S_point_mgath (const void *_buf, size_t elmt_size,
 			       const H5S_t *mem_space,
@@ -266,9 +267,10 @@ H5S_point_fgath (H5F_t *f, const struct H5O_layout_t *layout,
 		 const struct H5O_pline_t *pline,
 		 const struct H5O_efl_t *efl, size_t elmt_size,
 		 const H5S_t *file_space, H5S_sel_iter_t *file_iter,
-		 size_t nelmts, const H5D_transfer_t xfer_mode,
+		 size_t nelmts, const void *_xfer_parms,
 		 void *_buf/*out*/)
 {
+    const H5D_xfer_t *xfer_parms=(const H5D_xfer_t *)_xfer_parms;   /* Coerce the type */
     hssize_t	file_offset[H5O_LAYOUT_NDIMS];	/*offset of slab in file*/
     hsize_t	hsize[H5O_LAYOUT_NDIMS];	/*size of hyperslab	*/
     hssize_t	zero[H5O_LAYOUT_NDIMS];		/*zero			*/
@@ -317,7 +319,7 @@ H5S_point_fgath (H5F_t *f, const struct H5O_layout_t *layout,
 
             /* Go read the point */
             if (H5F_arr_read (f, layout, pline, efl, hsize, hsize, zero,
-			      file_offset, xfer_mode, buf/*out*/)<0) {
+			      file_offset, xfer_parms->xfer_mode, buf/*out*/)<0) {
                 HRETURN_ERROR (H5E_DATASPACE, H5E_READERROR, 0, "read error");
             }
 
@@ -375,9 +377,10 @@ H5S_point_fscat (H5F_t *f, const struct H5O_layout_t *layout,
 		 const struct H5O_pline_t *pline,
 		 const struct H5O_efl_t *efl, size_t elmt_size,
 		 const H5S_t *file_space, H5S_sel_iter_t *file_iter,
-		 size_t nelmts, const H5D_transfer_t xfer_mode,
+		 size_t nelmts, const void *_xfer_parms,
 		 const void *_buf)
 {
+    const H5D_xfer_t *xfer_parms=(const H5D_xfer_t *)_xfer_parms;   /* Coerce the type */
     hssize_t	file_offset[H5O_LAYOUT_NDIMS];	/*offset of hyperslab	*/
     hsize_t	hsize[H5O_LAYOUT_NDIMS];	/*size of hyperslab	*/
     hssize_t	zero[H5O_LAYOUT_NDIMS];		/*zero vector		*/
@@ -445,7 +448,7 @@ H5S_point_fscat (H5F_t *f, const struct H5O_layout_t *layout,
 #endif /* QAK */
         /* Go write the point */
         if (H5F_arr_write (f, layout, pline, efl, hsize, hsize, zero,
-			   file_offset, xfer_mode, buf)<0) {
+			   file_offset, xfer_parms->xfer_mode, buf)<0) {
             HRETURN_ERROR (H5E_DATASPACE, H5E_WRITEERROR, 0, "write error");
         }