[Pvfs2-cvs] commit by slang in pvfs2/src/io/bmi/bmi_mx: mx.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/bmi/bmi_mx
In directory parlweb1:/tmp/cvs-serv9898/src/io/bmi/bmi_mx

Modified Files:
	mx.c 
Log Message:
lets try not waiting for unexpected sends.


Index: mx.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_mx/mx.c,v
diff -p -u -r1.3 -r1.4
--- mx.c	18 Jul 2007 16:33:34 -0000	1.3
+++ mx.c	18 Jul 2007 20:52:11 -0000	1.4
@@ -2332,21 +2332,12 @@ BMI_mx_testcontext(int incount, bmi_op_i
         }
         if (!bmi_mx->bmx_is_server) { /* client */
                 /* check for completed unexpected sends */
-                match = (uint64_t) BMX_MSG_UNEXPECTED << 60;
+                match |= (uint64_t) BMX_MSG_UNEXPECTED << 60;
                 for (i = completed; i < incount; i++) {
                         uint32_t        result  = 0;
                         mx_status_t     status;
         
-			if(wait == 0 || wait == 2)
-			{
-			    mx_test_any(bmi_mx->bmx_ep, match, mask, &status, &result);
-			    if(!result && wait == 0 && max_idle_time > 0) wait = 1;
-			}
-			else if(wait == 1 && max_idle_time > 0)
-			{
-			    mx_wait_any(bmi_mx->bmx_ep, max_idle_time, match, mask, &status, &result);
-			    wait = 2;
-			}
+                        mx_test_any(bmi_mx->bmx_ep, match, mask, &status, &result);
 			
                         if (result) {
                                 ctx = (struct bmx_ctx *) status.context;
@@ -2392,8 +2383,7 @@ BMI_mx_testcontext(int incount, bmi_op_i
         /* return completed messages
          * we will always try (incount - completed) times even
          *     if some iterations have no result */
-        match = (uint64_t) BMX_MSG_EXPECTED << 60;
-	wait = 0;
+        match |= (uint64_t) BMX_MSG_EXPECTED << 60;
         for (i = completed; i < incount; i++) {
                 uint32_t        result  = 0;
                 mx_status_t     status;