refresh (create temporary patch)

diff --git a/meta b/meta
index 2034bf43f9e40588923bb9d89a24a1f500acc2d6..e079f688e8d94466de8471448098bb62c3e9f4b2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 961be909264e03c7770904dbb67c9cb0518c05ef
-Head: 4c91eafde3cd8143b4c28493a672a420c112fc62
+Previous: ea57c636b79a5bff58f028dd7bc7894c19f0bfe9
+Head: 26ad23fa0897c2a401b3eb66011c68cacd55736e
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -9,6 +9,7 @@ Applied:
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
   mpi-finalize: 4c91eafde3cd8143b4c28493a672a420c112fc62
+  refresh-temp: 26ad23fa0897c2a401b3eb66011c68cacd55736e
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..723e2c6
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,48 @@
+Bottom: 9cdfa8fc338b5927493ad5770aa1d2d9bd7f4cc6
+Top:    886009990f4d52636c380f5b4c4f051be1a8608f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-26 22:59:56 -0700
+
+Refresh of mpi-finalize
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index d374af7..784d3f8 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -132,6 +132,7 @@ union rs_wr_id {
+       };
+ };
+ 
++#define RS_RECV_WR_ID ~NULL
+ /*
+  * rsocket states are ordered as passive, connecting, connected, disconnected.
+  */
+@@ -449,7 +450,7 @@ static int rs_create_ep(struct rsocket *rs)
+               return ret;
+ 
+       for (i = 0; i < rs->rq_size; i++) {
+-              ret = rdma_post_recvv(rs->cm_id, NULL, NULL, 0);
++              ret = rdma_post_recvv(rs->cm_id, RS_RECV_WR_ID, NULL, 0);
+               if (ret)
+                       return ret;
+       }
+@@ -881,7 +882,7 @@ static int rs_poll_cq(struct rsocket *rs)
+       int ret, rcnt = 0;
+ 
+       while ((ret = ibv_poll_cq(rs->cm_id->recv_cq, 1, &wc)) > 0) {
+-              if (wc.opcode == IBV_WC_RECV_RDMA_WITH_IMM) {
++              if (wc.wr_id == RS_RECV_WR_ID) {
+                       if (wc.status != IBV_WC_SUCCESS)
+                               continue;
+                       rcnt++;
+@@ -923,7 +924,7 @@ static int rs_poll_cq(struct rsocket *rs)
+ 
+       if (rs->state & rs_connected) {
+               while (!ret && rcnt--)
+-                      ret = rdma_post_recvv(rs->cm_id, NULL, NULL, 0);
++                      ret = rdma_post_recvv(rs->cm_id, RS_RECV_WR_ID, NULL, 0);
+ 
+               if (ret) {
+                       rs->state = rs_error;