[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.2-10-g020c33d

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  020c33d656620fd1269d9f92c7a0c424f0b0a3c3 (commit)
      from  9443bde42e261f681e664114d460aa63134cc2a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/020c33d656620fd1269d9f92c7a0c424f0b0a3c3

commit 020c33d656620fd1269d9f92c7a0c424f0b0a3c3
Author: Pavan Balaji <balaji at anl.gov>
Date:   Tue Jul 22 22:54:53 2014 -0500

    Revert "mpid: Add cancel_recv and cancel_send netmod calls"
    
    This reverts commit 9443bde42e261f681e664114d460aa63134cc2a9.

diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h
index 5545984..8c3a68e 100644
--- a/src/mpid/ch3/include/mpidpre.h
+++ b/src/mpid/ch3/include/mpidpre.h
@@ -176,7 +176,6 @@ typedef struct MPIDI_CH3I_comm
     struct MPID_nem_barrier_vars *barrier_vars; /* shared memory variables used in barrier */
     struct MPID_Comm *next; /* next pointer for list of communicators */
     struct MPID_Comm *prev; /* prev pointer for list of communicators */
-    void *netmod_comm;      /* netmod communicator context */
 }
 MPIDI_CH3I_comm_t;
 
diff --git a/src/mpid/ch3/src/mpid_cancel_recv.c b/src/mpid/ch3/src/mpid_cancel_recv.c
index ce377cb..24a04f6 100644
--- a/src/mpid/ch3/src/mpid_cancel_recv.c
+++ b/src/mpid/ch3/src/mpid_cancel_recv.c
@@ -12,8 +12,6 @@
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
 int MPID_Cancel_recv(MPID_Request * rreq)
 {
-    int mpi_errno = MPI_SUCCESS;
-
     MPIDI_STATE_DECL(MPID_STATE_MPID_CANCEL_RECV);
     
     MPIDI_FUNC_ENTER(MPID_STATE_MPID_CANCEL_RECV);
@@ -22,23 +20,7 @@ int MPID_Cancel_recv(MPID_Request * rreq)
     
     if (MPIDI_CH3U_Recvq_DP(rreq))
     {
-        /* code in cancel_recv */
-        /* FIXME: The vc is only needed to find which function to call*/
-        /* This is otherwise any_source ready */
-#ifdef ENABLE_COMM_OVERRIDES
-        {
-            MPIDI_VC_t *vc;
-            MPIU_Assert(rreq->dev.match.parts.rank != MPI_ANY_SOURCE);
-            MPIDI_Comm_get_vc_set_active(rreq->comm, rreq->dev.match.parts.rank, &vc);
-            if (vc->comm_ops && vc->comm_ops->cancel_recv)
-            {
-                mpi_errno = vc->comm_ops->cancel_recv(NULL, rreq);
-                if (mpi_errno)
-                    goto fn_exit;
-             }
-        }
-#endif
-    MPIU_DBG_MSG_P(CH3_OTHER,VERBOSE,
+	MPIU_DBG_MSG_P(CH3_OTHER,VERBOSE,
 		       "request 0x%08x cancelled", rreq->handle);
         MPIR_STATUS_SET_CANCEL_BIT(rreq->status, TRUE);
         MPIR_STATUS_SET_COUNT(rreq->status, 0);
@@ -51,8 +33,6 @@ int MPID_Cancel_recv(MPID_Request * rreq)
 	    "request 0x%08x already matched, unable to cancel", rreq->handle);
     }
 
-    fn_fail:
-    fn_exit:
-       MPIDI_FUNC_EXIT(MPID_STATE_MPID_CANCEL_RECV);
-       return mpi_errno;
+    MPIDI_FUNC_EXIT(MPID_STATE_MPID_CANCEL_RECV);
+    return MPI_SUCCESS;
 }
diff --git a/src/mpid/ch3/src/mpid_cancel_send.c b/src/mpid/ch3/src/mpid_cancel_send.c
index e749b05..4772c8c 100644
--- a/src/mpid/ch3/src/mpid_cancel_send.c
+++ b/src/mpid/ch3/src/mpid_cancel_send.c
@@ -140,16 +140,6 @@ int MPID_Cancel_send(MPID_Request * sreq)
 	else
 	{
 	    cancelled = FALSE;
-	    /* code in mpid_cancel_send */
-#ifdef ENABLE_COMM_OVERRIDES
-        if (vc->comm_ops && vc->comm_ops->cancel_send)
-	    {
-	        mpi_errno = vc->comm_ops->cancel_send(vc, sreq);
-	        if (mpi_errno)
-	          goto fn_exit;
-	    }
-        cancelled = MPIR_STATUS_GET_CANCEL_BIT(sreq->status);
-#endif
 	    if (cancelled)
 	    {
 		MPIR_STATUS_SET_CANCEL_BIT(sreq->status, TRUE);

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/ch3/include/mpidpre.h      |    1 -
 src/mpid/ch3/src/mpid_cancel_recv.c |   26 +++-----------------------
 src/mpid/ch3/src/mpid_cancel_send.c |   10 ----------
 3 files changed, 3 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
MPICH primary repository