[mpich2-commits] r7920 - mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad

[mercierg at mcs.anl.gov]

Author: mercierg
Date: 2011-02-08 11:05:43 -0600 (Tue, 08 Feb 2011)
New Revision: 7920

Modified:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_probe.c
Log:
In any source case, VC ptr is NULL, replace the gate field with the right value


Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_probe.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_probe.c	2011-02-08 16:26:26 UTC (rev 7919)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/newmad/newmad_probe.c	2011-02-08 17:05:43 UTC (rev 7920)
@@ -17,6 +17,7 @@
     nm_tag_t  match_info = 0;
     nm_tag_t  match_mask = NEM_NMAD_MATCH_FULL_MASK;
     nm_gate_t out_gate;
+    nm_gate_t in_gate;
     int mpi_errno = MPI_SUCCESS;
     int ret;
 
@@ -25,10 +26,14 @@
     {
        NEM_NMAD_SET_ANYSRC(match_info);
        NEM_NMAD_SET_ANYSRC(match_mask);
+       in_gate = NM_ANY_GATE;
     }
-   else
-     NEM_NMAD_SET_SRC(match_info,source);
- 
+    else
+    { 
+	NEM_NMAD_SET_SRC(match_info,source);
+	in_gate = VC_FIELD(vc,p_gate);
+    }
+   
     if (tag != MPI_ANY_TAG)
     {
         NEM_NMAD_SET_TAG(match_info,tag);
@@ -40,7 +45,7 @@
     }
 
     do {
-	ret = nm_sr_probe(mpid_nem_newmad_session,VC_FIELD(vc,p_gate),&out_gate,match_info,match_mask);
+	ret = nm_sr_probe(mpid_nem_newmad_session,in_gate,&out_gate,match_info,match_mask);
     }
     while (ret != NM_ESUCCESS);
 
@@ -65,6 +70,7 @@
     nm_tag_t  match_info = 0;
     nm_tag_t  match_mask = NEM_NMAD_MATCH_FULL_MASK;
     nm_gate_t out_gate;
+    nm_gate_t in_gate;
     int mpi_errno = MPI_SUCCESS;
     int ret;
 
@@ -73,9 +79,13 @@
     {
        NEM_NMAD_SET_ANYSRC(match_info);
        NEM_NMAD_SET_ANYSRC(match_mask);
+       in_gate = NM_ANY_GATE;
     }
-   else
-     NEM_NMAD_SET_SRC(match_info,source);
+    else
+    {
+	NEM_NMAD_SET_SRC(match_info,source);
+	in_gate = VC_FIELD(vc,p_gate);
+    }
    
     if (tag != MPI_ANY_TAG)
     {
@@ -87,7 +97,7 @@
        NEM_NMAD_SET_ANYTAG(match_mask);
     }
 
-    ret = nm_sr_probe(mpid_nem_newmad_session,VC_FIELD(vc,p_gate),&out_gate,match_info,match_mask);
+    ret = nm_sr_probe(mpid_nem_newmad_session,in_gate,&out_gate,match_info,match_mask);
     if (ret == NM_ESUCCESS)
     {   
 	/*