[svn-r7372] Purpose:

    Added some comments, etc.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    too trivial for h5committest

2 files changed, 10 insertions, 2 deletions

diff --git a/src/H5F.c b/src/H5F.c
index f312934..7bf6ce5 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1999,6 +1999,9 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
             H5P_genplist_t *d_plist;
 
             /* Wait for all processes to catch up */
+            /* XXX: Calls which end up here are already required to be
+             * collective, is this barrier really necessary? -QAK
+             */
             MPI_Barrier(H5FP_SAP_BARRIER_COMM);
 
             /* Get the data xfer property list */
@@ -3136,6 +3139,9 @@ H5F_close(H5F_t *f)
         }
 
         /* Let's all meet up now... */
+        /* XXX: Calls which end up here are already required to be
+         * collective, is this barrier really necessary? -QAK
+         */
         if (H5FD_is_fphdf5_driver(f->shared->lf))
             MPI_Barrier(H5FP_SAP_BARRIER_COMM);
 #endif  /* H5_HAVE_FPHDF5 */
diff --git a/src/H5FD.c b/src/H5FD.c
index aa1935c..0284d2d 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -2084,9 +2084,9 @@ H5FD_free(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t si
 
 #ifdef H5_HAVE_FPHDF5
     /*
-     * When we're using the FPHDF5 driver, allocate from the SAP. If this
+     * When we're using the FPHDF5 driver, free with the SAP. If this
      * is the SAP executing this code, then skip the send to the SAP and
-     * try to do the actual allocations.
+     * try to do the actual free.
      */
     if (H5FD_is_fphdf5_driver(file) && !H5FD_fphdf5_is_sap(file)) {
         unsigned        req_id;
@@ -2306,7 +2306,9 @@ H5FD_free(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t si
             HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver free request failed");
     } else {
         /* leak memory */
+#ifdef H5F_DEBUG
 HDfprintf(stderr, "%s: LEAKED MEMORY!!!!!!\n", FUNC);
+#endif /* H5F_DEBUG */
     }
 
 done: