[svn-r8317] Purpose:

    Code optimization

Description:
    Query the dataset creation and transfer properties less often.

Platforms tested:
    Solaris 2.7 (arabica)
    FreeBSD 4.9 (sleipnir) w/parallel
    h5committested

1 files changed, 14 insertions, 4 deletions

diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 2956002..b99cdba 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -185,6 +185,10 @@ struct H5F_t {
     H5F_mtab_t		mtab;		/* File mount table		*/
 };
 
+/* Forward declarations for prototype arguments */
+struct H5D_dxpl_cache_t;
+struct H5D_dcpl_cache_t;
+
 /* Private functions, not part of the publicly documented API */
 #ifdef NOT_YET
 H5_DLL void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p, uint8_t *l);
@@ -198,17 +202,23 @@ H5_DLL herr_t H5F_sieve_overlap_clear(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsi
 H5_DLL herr_t H5F_istore_init (H5F_t *f);
 H5_DLL herr_t H5F_istore_flush (H5F_t *f, hid_t dxpl_id, unsigned flags);
 H5_DLL herr_t H5F_istore_dest (H5F_t *f, hid_t dxpl_id);
-H5_DLL ssize_t H5F_istore_readvv(H5F_t *f, hid_t dxpl_id,
-    const struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, hssize_t chunk_coords[],
+H5_DLL ssize_t H5F_istore_readvv(H5F_t *f, const struct H5D_dxpl_cache_t *dxpl_cache,
+    hid_t dxpl_id,
+    const struct H5O_layout_t *layout, const struct H5D_dcpl_cache_t *dcpl_cache,
+    hssize_t chunk_coords[],
     size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[], hsize_t chunk_offset_arr[],
     size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
     void *buf);
-H5_DLL ssize_t H5F_istore_writevv(H5F_t *f, hid_t dxpl_id,
-    const struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist, hssize_t chunk_coords[],
+H5_DLL ssize_t H5F_istore_writevv(H5F_t *f, const struct H5D_dxpl_cache_t *dxpl_cache,
+    hid_t dxpl_id,
+    const struct H5O_layout_t *layout, const struct H5D_dcpl_cache_t *dcpl_cache,
+    hssize_t chunk_coords[],
     size_t chunk_max_nseq, size_t *chunk_curr_seq, size_t chunk_len_arr[], hsize_t chunk_offset_arr[],
     size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
     const void *buf);
+#ifdef H5F_ISTORE_DEBUG
 H5_DLL herr_t H5F_istore_stats (H5F_t *f, hbool_t headers);
+#endif /* H5F_ISTORE_DEBUG */
 H5_DLL herr_t H5F_istore_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream,
 				int indent, int fwidth, int ndims);