[svn-r28959] merge from trunk.

renaming metadata dxpl properties.

1 files changed, 30 insertions, 7 deletions

diff --git a/src/H5Pint.c b/src/H5Pint.c
index 75b9f1e..4064b66 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -31,6 +31,7 @@
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5Fprivate.h"		/* File access				*/
 #include "H5FLprivate.h"	/* Free lists                           */
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5MMprivate.h"	/* Memory management			*/
@@ -5450,7 +5451,8 @@ H5P_get_class(const H5P_genplist_t *plist)
  *-------------------------------------------------------------------------
  */
 herr_t 
-H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *dxpl_id)
+H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *dxpl_id, 
+                        hid_t loc_id, hbool_t is_collective)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -5465,13 +5467,18 @@ H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *
     if(H5P_DEFAULT == *acspl_id)
         *acspl_id = *libclass->def_plist_id;
     else {
+#ifdef H5_HAVE_PARALLEL
         H5P_coll_md_read_flag_t is_collective;      /* Collective metadata read flag */
         H5P_genplist_t *plist;          /* Property list pointer */
+#endif /* H5_HAVE_PARALLEL */
 
         /* Sanity check the access property list class */
         if(TRUE != H5P_isa_class(*acspl_id, *libclass->class_id))
             HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not the required access property list")
 
+        *dxpl_id = H5AC_ind_read_dxpl_id;
+
+#ifdef H5_HAVE_PARALLEL
         /* Get the plist structure for the access property list */
         if(NULL == (plist = (H5P_genplist_t *)H5I_object(*acspl_id)))
             HGOTO_ERROR(H5E_PLIST, H5E_BADATOM, FAIL, "can't find object for ID")
@@ -5481,14 +5488,30 @@ H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get core collective metadata read flag")
 
         /* If collective metadata read requested and using internal DXPL, switch to internal collective DXPL */
-        if(H5P_USER_TRUE == is_collective) {
-            if(*dxpl_id == H5AC_dxpl_id)
-                *dxpl_id = H5AC_coll_write_coll_read_dxpl_id;
-            else if(*dxpl_id == H5AC_ind_dxpl_id)
-                *dxpl_id = H5AC_ind_write_coll_read_dxpl_id;
-        } /* end if */
+        if(H5P_USER_TRUE == is_collective)
+            *dxpl_id = H5AC_coll_read_dxpl_id;
+#endif /* H5_HAVE_PARALLEL */
     } /* end else */
 
+#ifdef H5_HAVE_PARALLEL
+    /* If parallel is enabled and the file driver used in the MPI-IO
+    VFD, issue an MPI barrier for easier debugging if the API function
+    calling this is supposed to be called collectively. Note that this
+    happens only when the environment variable H5_COLL_BARRIER is set
+    to non 0. */
+    if(is_collective && H5_coll_api_sanity_check_g) {
+        MPI_Comm mpi_comm;
+
+        /* retrieve the MPI communicator from the loc_id or the fapl_id */
+        if(H5F_mpi_retrieve_comm(loc_id, *acspl_id, &mpi_comm) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get MPI communicator")
+
+        /* issue the barrier */
+        if(mpi_comm != MPI_COMM_NULL)
+            MPI_Barrier(mpi_comm);
+    }
+#endif /* H5_HAVE_PARALLEL */
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_verify_apl_and_dxpl() */