[PVFS2-CVS] commit by pcarns in pvfs2/src/client/sysint: msgpairarray.sm

CVS commit program cvs at parl.clemson.edu
Thu May 6 10:54:18 EDT 2004


Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb:/tmp/cvs-serv7972

Modified Files:
	msgpairarray.sm 
Log Message:
some minor cleanups


Index: msgpairarray.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/msgpairarray.sm,v
diff -p -u -r1.40 -r1.41
--- msgpairarray.sm	6 May 2004 13:41:40 -0000	1.40
+++ msgpairarray.sm	6 May 2004 13:54:18 -0000	1.41
@@ -281,9 +281,7 @@ static int msgpairarray_post(PINT_client
 
 	    gossip_err("Send error: cancelling recv.\n");
 
-	    ret = PINT_client_bmi_cancel(msg_p->recv_id);
-	    /* this should not fail */
-	    assert(ret == 0);
+	    PINT_client_bmi_cancel(msg_p->recv_id);
 	    
 	    /* we still have to wait for recv completion, so just decrement
 	     * comp_ct by one and keep going
@@ -357,8 +355,13 @@ static int msgpairarray_complete(PINT_cl
 	msg_p->recv_id = 0;
 	msg_p->recv_status = *js_p;
 
-	/* save error, if any, in op_status */
-	msg_p->op_status = msg_p->recv_status.error_code;
+	/* save error (if we don't already have one) in op_status */
+	if(msg_p->op_status == 0)
+	    msg_p->op_status = msg_p->recv_status.error_code;
+
+	/* TODO: if we had a good way to tell if a send were still pending,
+	 * then we could cancel here
+	 */
     }
     else
     {
@@ -368,8 +371,13 @@ static int msgpairarray_complete(PINT_cl
 	msg_p->send_id = 0;
 	msg_p->send_status = *js_p;
 
-	/* save error, if any, in op_status */
-	msg_p->op_status = msg_p->send_status.error_code;
+	/* save error (if we don't already have one) in op_status */
+	if(msg_p->op_status == 0)
+	    msg_p->op_status = msg_p->send_status.error_code;
+
+	/* TODO: if we had a good way to tell if a recv were still pending,
+	 * then we could cancel here
+	 */
     }
 
     /* decrement comp_ct until all operations have completed */



More information about the PVFS2-CVS mailing list