[mpich2-commits] r3964 - mpich2/trunk/src/mpi/coll

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-07 11:31:11 -0600 (Sat, 07 Mar 2009)
New Revision: 3964

Modified:
   mpich2/trunk/src/mpi/coll/gatherv.c
   mpich2/trunk/src/mpi/coll/scatterv.c
Log:
Error handling fixes for the coverage tests.

Modified: mpich2/trunk/src/mpi/coll/gatherv.c
===================================================================
--- mpich2/trunk/src/mpi/coll/gatherv.c	2009-03-07 17:03:54 UTC (rev 3963)
+++ mpich2/trunk/src/mpi/coll/gatherv.c	2009-03-07 17:31:11 UTC (rev 3964)
@@ -117,6 +117,7 @@
                     mpi_errno = starray[i].MPI_ERROR;
             }
         }
+        /* --END ERROR HANDLING-- */
     }
 
     else if (root != MPI_PROC_NULL) { /* non-root nodes, and in the intercomm. case, non-root nodes on remote side */
@@ -134,6 +135,12 @@
                 mpi_errno = MPIC_Send(sendbuf, sendcnt, sendtype, root, 
                                       MPIR_GATHERV_TAG, comm);
             }
+            /* --BEGIN ERROR HANDLING-- */
+            if (mpi_errno) {
+                mpi_errno = MPIR_Err_create_code(mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**fail", 0);
+                return mpi_errno;
+            }
+            /* --END ERROR HANDLING-- */
         }
     }
     

Modified: mpich2/trunk/src/mpi/coll/scatterv.c
===================================================================
--- mpich2/trunk/src/mpi/coll/scatterv.c	2009-03-07 17:03:54 UTC (rev 3963)
+++ mpich2/trunk/src/mpi/coll/scatterv.c	2009-03-07 17:31:11 UTC (rev 3964)
@@ -121,12 +121,20 @@
                     mpi_errno = starray[i].MPI_ERROR;
             }
         }
+        /* --END ERROR HANDLING-- */
     }
 
     else if (root != MPI_PROC_NULL) { /* non-root nodes, and in the intercomm. case, non-root nodes on remote side */
-        if (recvcnt)
+        if (recvcnt) {
             mpi_errno = MPIC_Recv(recvbuf,recvcnt,recvtype,root,
                                   MPIR_SCATTERV_TAG,comm,MPI_STATUS_IGNORE);
+            /* --BEGIN ERROR HANDLING-- */
+            if (mpi_errno) {
+                mpi_errno = MPIR_Err_create_code(mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**fail", 0);
+                return mpi_errno;
+            }
+            /* --END ERROR HANDLING-- */
+        }
     }
     
     /* check if multiple threads are calling this collective function */