[mpich2-commits] r8047 - in mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis: nemesis/include src

[buntinas at mcs.anl.gov]

Author: buntinas
Date: 2011-02-24 21:07:08 -0600 (Thu, 24 Feb 2011)
New Revision: 8047

Modified:
   mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_inline.h
   mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
Log:
Fixed undefined symbols introduced in r8031.

Modified: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_inline.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_inline.h	2011-02-24 23:26:41 UTC (rev 8046)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_inline.h	2011-02-25 03:07:08 UTC (rev 8047)
@@ -904,8 +904,8 @@
 	    mpi_errno = MPID_nem_network_poll(TRUE /* blocking */);
             if (mpi_errno) MPIU_ERR_POP (mpi_errno);
 
-            if (MPID_nem_local_lmt_pending || MPIDI_CH3I_active_send[CH3_NORMAL_QUEUE]
-                || MPIDI_CH3I_SendQ_head(CH3_NORMAL_QUEUE))
+            if (MPID_nem_local_lmt_pending || MPIDI_CH3I_shm_active_send
+                || MPIDI_CH3I_Sendq_head(MPIDI_CH3I_shm_sendq))
             {
                 *cell = NULL;
                 *in_fbox = 0;

Modified: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/src/ch3_progress.c	2011-02-24 23:26:41 UTC (rev 8046)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/src/ch3_progress.c	2011-02-25 03:07:08 UTC (rev 8047)
@@ -332,8 +332,8 @@
 
             /* make progress receiving */
             /* check queue */
-            if (!MPID_nem_local_lmt_pending && !MPIDI_CH3I_active_send[CH3_NORMAL_QUEUE]
-                && !MPIDI_CH3I_SendQ_head(CH3_NORMAL_QUEUE) && is_blocking
+            if (!MPID_nem_local_lmt_pending && !MPIDI_CH3I_shm_active_send
+                && !MPIDI_CH3I_Sendq_head(MPIDI_CH3I_shm_sendq) && is_blocking
 #ifdef MPICH_IS_THREADED
 #ifdef HAVE_RUNTIME_THREADCHECK
                 && !MPIR_ThreadInfo.isThreaded
@@ -759,7 +759,6 @@
 int MPIDI_CH3I_Progress_init(void)
 {
     int mpi_errno = MPI_SUCCESS;
-    int i;
     MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_PROGRESS_INIT);
 
     MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_PROGRESS_INIT);