[Pvfs2-cvs] commit by pw in pvfs2/src/io/bmi/bmi_ib: ib.c vapi.c

[CVS commit program]

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

Modified Files:
	ib.c vapi.c 
Log Message:
Fix some VAPI bit rot.


Index: ib.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_ib/ib.c,v
diff -u -p -p -u -r1.55 -r1.56
--- ib.c	22 Aug 2007 16:12:45 -0000	1.55
+++ ib.c	7 Sep 2007 16:02:14 -0000	1.56
@@ -6,7 +6,7 @@
  *
  * See COPYING in top-level directory.
  *
- * $Id: ib.c,v 1.55 2007/08/22 16:12:45 slang Exp $
+ * $Id: ib.c,v 1.56 2007/09/07 16:02:14 pw Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -214,8 +214,9 @@ static int ib_check_cq(void)
 		else if (state == SQ_WAITING_RTS_DONE_SEND_COMPLETION)
 		    sq->state.send = SQ_WAITING_USER_TEST;
 		else
-		    assert(0, "%s: unknown send state %s of sq %p",
-		           __func__, sq_state_name(sq->state.send), sq);
+		    assert(0, "%s: unknown send state %s (%d) of sq %p",
+		           __func__, sq_state_name(sq->state.send),
+			   sq->state.send, sq);
 		debug(2, "%s: send to %s completed locally: -> %s",
 		      __func__, bh->c->peername, sq_state_name(sq->state.send));
 

Index: vapi.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_ib/vapi.c,v
diff -u -p -p -u -r1.11 -r1.12
--- vapi.c	8 May 2007 21:28:01 -0000	1.11
+++ vapi.c	7 Sep 2007 16:02:14 -0000	1.12
@@ -5,7 +5,7 @@
  *
  * See COPYING in top-level directory.
  *
- * $Id: vapi.c,v 1.11 2007/05/08 21:28:01 pw Exp $
+ * $Id: vapi.c,v 1.12 2007/09/07 16:02:14 pw Exp $
  */
 #include <stdio.h>
 #include <string.h>
@@ -417,12 +417,14 @@ static void vapi_post_sr(const struct bu
 
     memset(&sr, 0, sizeof(sr));
     sr.opcode = VAPI_SEND;
-    sr.id = int64_from_ptr(c);  /* for error checking if send fails */
+    sr.id = int64_from_ptr(bh);
+    sr.comp_type = VAPI_SIGNALED;
+/* no unsignaled anymore, see openib.c
     if (++vc->num_unsignaled_wr + 100 == vd->max_outstanding_wr) {
 	vc->num_unsignaled_wr = 0;
-	sr.comp_type = VAPI_SIGNALED;
     } else
-	sr.comp_type = VAPI_UNSIGNALED;  /* == 1 */
+	sr.comp_type = VAPI_UNSIGNALED;
+ */
     sr.sg_lst_p = &sg;
     sr.sg_lst_len = 1;
     ret = VAPI_post_sr(vd->nic_handle, vc->qp, &sr);