[mpich2-commits] r7932 - in mpich2/trunk/src/mpid/ch3/channels/nemesis: include src

[buntinas at mcs.anl.gov]

Author: buntinas
Date: 2011-02-10 16:36:23 -0600 (Thu, 10 Feb 2011)
New Revision: 7932

Modified:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h
   mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
Log:
fixed some debug statements that weren't using iov_count correctly.  Reviewed by jayesh@

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h	2011-02-10 22:10:34 UTC (rev 7931)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h	2011-02-10 22:36:23 UTC (rev 7932)
@@ -59,22 +59,22 @@
 
 
 #if 0
-#define DUMP_REQUEST(req) do {							\
-    int i;									\
-    MPIDI_DBG_PRINTF((55, FCNAME, "request %p\n", (req)));			\
-    MPIDI_DBG_PRINTF((55, FCNAME, "  handle = %d\n", (req)->handle));		\
-    MPIDI_DBG_PRINTF((55, FCNAME, "  ref_count = %d\n", (req)->ref_count));	\
-    MPIDI_DBG_PRINTF((55, FCNAME, "  cc = %d\n", (req)->cc));			\
-    for (i = 0; i < (req)->iov_count; ++i)					\
-        MPIDI_DBG_PRINTF((55, FCNAME, "  dev.iov[%d] = (%p, %d)\n", i,		\
-                (req)->dev.iov[i].MPID_IOV_BUF,					\
-                (req)->dev.iov[i].MPID_IOV_LEN));				\
-    MPIDI_DBG_PRINTF((55, FCNAME, "  dev.iov_count = %d\n",			\
-			 (req)->dev.iov_count));				\
-    MPIDI_DBG_PRINTF((55, FCNAME, "  dev.state = 0x%x\n", (req)->dev.state));	\
-    MPIDI_DBG_PRINTF((55, FCNAME, "    type = %d\n",				\
-		      MPIDI_Request_get_type(req)));				\
-} while (0)
+#define DUMP_REQUEST(req) do {                                                          \
+        int i;                                                                          \
+        MPIDI_DBG_PRINTF((55, FCNAME, "request %p\n", (req)));                          \
+        MPIDI_DBG_PRINTF((55, FCNAME, "  handle = %d\n", (req)->handle));		\
+        MPIDI_DBG_PRINTF((55, FCNAME, "  ref_count = %d\n", (req)->ref_count));         \
+        MPIDI_DBG_PRINTF((55, FCNAME, "  cc = %d\n", (req)->cc));			\
+        for (i = 0; i < (req)->iov_count; ++i)                                          \
+            MPIDI_DBG_PRINTF((55, FCNAME, "  dev.iov[%d] = (%p, %d)\n", i,		\
+                              (req)->dev.iov[i+(req)->dev.iov_offset].MPID_IOV_BUF,     \
+                              (req)->dev.iov[i+(req)->dev.iov_offset].MPID_IOV_LEN));  \
+    MPIDI_DBG_PRINTF((55, FCNAME, "  dev.iov_count = %d\n",                             \
+                      (req)->dev.iov_count));                                           \
+    MPIDI_DBG_PRINTF((55, FCNAME, "  dev.state = 0x%x\n", (req)->dev.state));           \
+    MPIDI_DBG_PRINTF((55, FCNAME, "    type = %d\n",                                    \
+		      MPIDI_Request_get_type(req)));                                    \
+    } while (0)
 #else
 #define DUMP_REQUEST(req) do { } while (0)
 #endif

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c	2011-02-10 22:10:34 UTC (rev 7931)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c	2011-02-10 22:36:23 UTC (rev 7932)
@@ -702,7 +702,7 @@
                 rreq->dev.iov_offset = iov - rreq->dev.iov;
                 rreq->dev.iov_count = n_iov;
                 vc_ch->recv_active = rreq;
-		MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "        remaining: " MPIDI_MSG_SZ_FMT " bytes + %d iov entries\n", iov->MPID_IOV_LEN, n_iov - rreq->dev.iov_offset - 1));
+		MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "        remaining: " MPIDI_MSG_SZ_FMT " bytes + %d iov entries\n", iov->MPID_IOV_LEN, n_iov));
             }
             else
             {