refresh

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

diff --git a/patches/mpi-finalize b/patches/mpi-finalize
index c0107ecc3e926f17e4d0d1ec1f98575821eabff3..c236f2a31ff98d525961101cdcbb346b2f05466e 100644 (file)
--- a/patches/mpi-finalize
+++ b/patches/mpi-finalize
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    9cdfa8fc338b5927493ad5770aa1d2d9bd7f4cc6
+Top:    886009990f4d52636c380f5b4c4f051be1a8608f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-26 15:35:32 -0700
 
@@ -13,10 +13,45 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ed125b3..d374af7 100644
+index ed125b3..784d3f8 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -1708,6 +1708,7 @@ int rshutdown(int socket, int how)
+@@ -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;
+@@ -1708,6 +1709,7 @@ int rshutdown(int socket, int how)
        int ctrl, ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -24,7 +59,7 @@ index ed125b3..d374af7 100644
        if (how == SHUT_RD) {
                rs_shutdown_state(rs, rs_connect_rd);
                return 0;
-@@ -1726,7 +1727,9 @@ int rshutdown(int socket, int how)
+@@ -1726,7 +1728,9 @@ int rshutdown(int socket, int how)
                                RS_CTRL_SHUTDOWN : RS_CTRL_DISCONNECT;
                }
                if (!rs_can_send_ctrl(rs)) {
@@ -34,7 +69,7 @@ index ed125b3..d374af7 100644
                        if (ret)
                                return ret;
                }
-@@ -1735,14 +1738,21 @@ int rshutdown(int socket, int how)
+@@ -1735,14 +1739,21 @@ int rshutdown(int socket, int how)
                ret = rs_post_write(rs, 0, NULL, 0,
                                    rs_msg_set(RS_OP_CTRL, ctrl),
                                    0, 0, 0);
@@ -56,7 +91,7 @@ index ed125b3..d374af7 100644
        return 0;
  }
  
-@@ -1751,9 +1761,11 @@ int rclose(int socket)
+@@ -1751,9 +1762,11 @@ int rclose(int socket)
        struct rsocket *rs;
  
        rs = idm_at(&idm, socket);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 723e2c6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,48 +0,0 @@
-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;