[mpich2-commits] r3931 - mpich2/trunk/src/mpid/ch3/src

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-03 20:58:40 -0600 (Tue, 03 Mar 2009)
New Revision: 3931

Modified:
   mpich2/trunk/src/mpid/ch3/src/ch3u_recvq.c
Log:
Enabling a queue search optimization that was accidentally disabled earlier. Bad booboo!

Reviewed by buntinas.


Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_recvq.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/src/ch3u_recvq.c	2009-03-03 22:48:28 UTC (rev 3930)
+++ mpich2/trunk/src/mpid/ch3/src/ch3u_recvq.c	2009-03-04 02:58:40 UTC (rev 3931)
@@ -54,18 +54,19 @@
 /* MATCH_WITH_NO_MASK compares the match values without masking
  * them. This is useful for the case where there are no ANY_TAG or
  * ANY_SOURCE wild cards. */
-#define MATCH_WITH_NO_MASK(match1, match2) \
-    ((sizeof(MPIDI_Message_match) == SIZEOF_VOID_P && 0) ? ((match1).whole == (match2).whole) : \
-     (((match1).parts.rank == (match2).parts.rank) && \
-      ((match1).parts.tag == (match2).parts.tag) && \
+#define MATCH_WITH_NO_MASK(match1, match2)                              \
+    ((sizeof(MPIDI_Message_match) == SIZEOF_VOID_P) ? ((match1).whole == (match2).whole) : \
+     (((match1).parts.rank == (match2).parts.rank) &&                   \
+      ((match1).parts.tag == (match2).parts.tag) &&                     \
       ((match1).parts.context_id == (match2).parts.context_id)))
 
 /* MATCH_WITH_LEFT_MASK compares the match values after masking only
  * the left field. This is useful for the case where the right match
  * is a part of the unexpected queue and has no ANY_TAG or ANY_SOURCE
  * wild cards, but the left match might have them. */
-#define MATCH_WITH_LEFT_MASK(match1, match2, mask) \
-    ((sizeof(MPIDI_Message_match) == SIZEOF_VOID_P && 0) ? (((match1).whole & (mask).whole) == (match2).whole) : \
+#define MATCH_WITH_LEFT_MASK(match1, match2, mask)                      \
+    ((sizeof(MPIDI_Message_match) == SIZEOF_VOID_P) ?                   \
+     (((match1).whole & (mask).whole) == (match2).whole) :              \
      ((((match1).parts.rank & (mask).parts.rank) == (match2).parts.rank) && \
       (((match1).parts.tag & (mask).parts.tag) == (match2).parts.tag) && \
       ((match1).parts.context_id == (match2).parts.context_id)))
@@ -73,8 +74,9 @@
 /* This is the most general case where both matches have to be
  * masked. Both matches are masked with the same value. There doesn't
  * seem to be a need for two different masks at this time. */
-#define MATCH_WITH_LEFT_RIGHT_MASK(match1, match2, mask) \
-    ((sizeof(MPIDI_Message_match) == SIZEOF_VOID_P && 0) ? (((match1).whole & (mask).whole) == ((match2).whole & (mask).whole)) : \
+#define MATCH_WITH_LEFT_RIGHT_MASK(match1, match2, mask)                \
+    ((sizeof(MPIDI_Message_match) == SIZEOF_VOID_P) ?                   \
+     (((match1).whole & (mask).whole) == ((match2).whole & (mask).whole)) : \
      ((((match1).parts.rank & (mask).parts.rank) == ((match2).parts.rank & (mask).parts.rank)) && \
       (((match1).parts.tag & (mask).parts.tag) == ((match2).parts.tag & (mask).parts.tag)) && \
       ((match1).parts.context_id == (match2).parts.context_id)))