[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, 20 insertions, 32 deletions

diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index a027171..e820b92 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -24,27 +24,17 @@
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
 #define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
 
-#include "H5private.h"          /* Internal types, etc. */
-#include "H5Eprivate.h"         /* Error reporting */
-#include "H5Fpkg.h"             /* Ugly, but necessary for the MPIO I/O accesses */
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5Fpkg.h"		/* Files				*/
 #include "H5FDmpio.h"		/* MPIO file driver			*/
-#include "H5FDprivate.h"        /* Necessary for the H5FD_write & H5FD_read prototypes.. */
-#include "H5Iprivate.h"		/* Object IDs */
-#include "H5Pprivate.h"		/* Property Lists */
-#include "H5Spkg.h"             /* Dataspaces */
-
-#ifndef H5_HAVE_PARALLEL
-/* 
- * The H5S_mpio_xxxx functions are for parallel I/O only and are
- * valid only when H5_HAVE_PARALLEL is #defined.  This empty #ifndef
- * body is used to allow this source file be included in the serial
- * distribution.
- * Some compilers/linkers may complain about "empty" object file.
- * If that happens, uncomment the following statement to pacify
- * them.
- */
-/* const hbool_t H5S_mpio_avail = FALSE; */
-#else /* H5_HAVE_PARALLEL */
+#include "H5FDprivate.h"	/* File drivers				*/
+#include "H5Iprivate.h"		/* IDs			  		*/
+#include "H5Pprivate.h"         /* Property lists                       */
+#include "H5Spkg.h"		/* Dataspaces 				*/
+
+#ifdef H5_HAVE_PARALLEL
+
 /* Interface initialization */
 #define PABLO_MASK      H5Sall_mask
 #define INTERFACE_INIT  NULL
@@ -751,17 +741,16 @@ done:
  */
 herr_t
 H5S_mpio_spaces_read(H5F_t *f, const H5O_layout_t *layout,
-    H5P_genplist_t UNUSED *dc_plist, const H5D_storage_t UNUSED *store, size_t elmt_size,
-    const H5S_t *file_space, const H5S_t *mem_space, hid_t dxpl_id,
-    void *buf/*out*/)
+    const H5D_dcpl_cache_t UNUSED *dcpl_cache, const H5D_storage_t UNUSED *store, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space, const H5D_dxpl_cache_t UNUSED *dxpl_cache,
+    hid_t dxpl_id, void *buf/*out*/)
 {
     herr_t ret_value;
 
     FUNC_ENTER_NOAPI(H5S_mpio_spaces_read, FAIL);
 
-    ret_value = H5S_mpio_spaces_xfer(f, layout, elmt_size,
-				     file_space, mem_space, dxpl_id,
-				     buf, 0/*read*/);
+    ret_value = H5S_mpio_spaces_xfer(f, layout, elmt_size, file_space,
+        mem_space, dxpl_id, buf, 0/*read*/);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -790,18 +779,17 @@ done:
  */
 herr_t
 H5S_mpio_spaces_write(H5F_t *f, H5O_layout_t *layout,
-    H5P_genplist_t UNUSED *dc_plist, const H5D_storage_t UNUSED *store, size_t elmt_size,
-    const H5S_t *file_space, const H5S_t *mem_space, hid_t dxpl_id,
-    const void *buf)
+    const H5D_dcpl_cache_t UNUSED *dcpl_cache, const H5D_storage_t UNUSED *store, size_t elmt_size,
+    const H5S_t *file_space, const H5S_t *mem_space, const H5D_dxpl_cache_t UNUSED *dxpl_cache,
+    hid_t dxpl_id, const void *buf)
 {
     herr_t ret_value;
 
     FUNC_ENTER_NOAPI(H5S_mpio_spaces_write, FAIL);
 
     /*OKAY: CAST DISCARDS CONST QUALIFIER*/
-    ret_value = H5S_mpio_spaces_xfer(f, layout, elmt_size,
-				     file_space, mem_space, dxpl_id,
-				     (void*)buf, 1/*write*/);
+    ret_value = H5S_mpio_spaces_xfer(f, layout, elmt_size, file_space,
+        mem_space, dxpl_id, (void*)buf, 1/*write*/);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);