refresh

diff --git a/meta b/meta
index 2d09e5f21ef3c9935d292a3292ae8efc25b3e844..9c960c1e87a4150ce37dbb2d3809a85883e4969f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 48ef6005052ce9ba640527924100b8385d22b82f
-Head: d322cc176ae382ffe270200ff18c362d26ce4fbe
+Previous: 92d0d0d1d794f7da251e8e3db9b5b86384efa568
+Head: 48869e2516ff5e646795c8ea875a19843da2c9ae
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -8,8 +8,7 @@ Applied:
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
-  mpi-finalize: a932a825f6a814c75963c05579a6dd13e68c5f32
-  refresh-temp: d322cc176ae382ffe270200ff18c362d26ce4fbe
+  mpi-finalize: 48869e2516ff5e646795c8ea875a19843da2c9ae
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/mpi-finalize b/patches/mpi-finalize
index c236f2a31ff98d525961101cdcbb346b2f05466e..af048aa72c04d940846c31f7758cd67a107f421e 100644 (file)
--- a/patches/mpi-finalize
+++ b/patches/mpi-finalize
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    886009990f4d52636c380f5b4c4f051be1a8608f
+Top:    34a422e20b6864421c4dcbf249875027c9956b02
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-26 15:35:32 -0700
 
@@ -13,27 +13,48 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ed125b3..784d3f8 100644
+index ed125b3..c53d5d5 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -132,6 +132,7 @@ union rs_wr_id {
+@@ -132,6 +132,8 @@ union rs_wr_id {
        };
  };
  
-+#define RS_RECV_WR_ID ~NULL
++#define RS_RECV_WR_ID (~((uint64_t) 0))
++
  /*
   * rsocket states are ordered as passive, connecting, connected, disconnected.
   */
-@@ -449,7 +450,7 @@ static int rs_create_ep(struct rsocket *rs)
+@@ -418,6 +420,19 @@ err1:
+       return -1;
+ }
+ 
++static inline int
++rs_post_recv(struct rsocket *rs)
++{
++      struct ibv_recv_wr wr, *bad;
++
++      wr.wr_id = RS_RECV_WR_ID;
++      wr.next = NULL;
++      wr.sg_list = NULL;
++      wr.num_sge = 0;
++
++      return rdma_seterrno(ibv_post_recv(rs->cm_id->qp, &wr, &bad));
++}
++
+ static int rs_create_ep(struct rsocket *rs)
+ {
+       struct ibv_qp_init_attr qp_attr;
+@@ -449,7 +464,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);
++              ret = rs_post_recv(rs);
                if (ret)
                        return ret;
        }
-@@ -881,7 +882,7 @@ static int rs_poll_cq(struct rsocket *rs)
+@@ -881,7 +896,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) {
@@ -42,16 +63,16 @@ index ed125b3..784d3f8 100644
                        if (wc.status != IBV_WC_SUCCESS)
                                continue;
                        rcnt++;
-@@ -923,7 +924,7 @@ static int rs_poll_cq(struct rsocket *rs)
+@@ -923,7 +938,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);
++                      ret = rs_post_recv(rs);
  
                if (ret) {
                        rs->state = rs_error;
-@@ -1708,6 +1709,7 @@ int rshutdown(int socket, int how)
+@@ -1708,6 +1723,7 @@ int rshutdown(int socket, int how)
        int ctrl, ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -59,7 +80,7 @@ index ed125b3..784d3f8 100644
        if (how == SHUT_RD) {
                rs_shutdown_state(rs, rs_connect_rd);
                return 0;
-@@ -1726,7 +1728,9 @@ int rshutdown(int socket, int how)
+@@ -1726,7 +1742,9 @@ int rshutdown(int socket, int how)
                                RS_CTRL_SHUTDOWN : RS_CTRL_DISCONNECT;
                }
                if (!rs_can_send_ctrl(rs)) {
@@ -69,7 +90,7 @@ index ed125b3..784d3f8 100644
                        if (ret)
                                return ret;
                }
-@@ -1735,14 +1739,21 @@ int rshutdown(int socket, int how)
+@@ -1735,14 +1753,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);
@@ -91,7 +112,7 @@ index ed125b3..784d3f8 100644
        return 0;
  }
  
-@@ -1751,9 +1762,11 @@ int rclose(int socket)
+@@ -1751,9 +1776,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 99b9f6c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,61 +0,0 @@
-Bottom: 886009990f4d52636c380f5b4c4f051be1a8608f
-Top:    34a422e20b6864421c4dcbf249875027c9956b02
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-26 23:11:19 -0700
-
-Refresh of mpi-finalize
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 784d3f8..c53d5d5 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -132,7 +132,8 @@ union rs_wr_id {
-       };
- };
- 
--#define RS_RECV_WR_ID ~NULL
-+#define RS_RECV_WR_ID (~((uint64_t) 0))
-+
- /*
-  * rsocket states are ordered as passive, connecting, connected, disconnected.
-  */
-@@ -419,6 +420,19 @@ err1:
-       return -1;
- }
- 
-+static inline int
-+rs_post_recv(struct rsocket *rs)
-+{
-+      struct ibv_recv_wr wr, *bad;
-+
-+      wr.wr_id = RS_RECV_WR_ID;
-+      wr.next = NULL;
-+      wr.sg_list = NULL;
-+      wr.num_sge = 0;
-+
-+      return rdma_seterrno(ibv_post_recv(rs->cm_id->qp, &wr, &bad));
-+}
-+
- static int rs_create_ep(struct rsocket *rs)
- {
-       struct ibv_qp_init_attr qp_attr;
-@@ -450,7 +464,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, RS_RECV_WR_ID, NULL, 0);
-+              ret = rs_post_recv(rs);
-               if (ret)
-                       return ret;
-       }
-@@ -924,7 +938,7 @@ static int rs_poll_cq(struct rsocket *rs)
- 
-       if (rs->state & rs_connected) {
-               while (!ret && rcnt--)
--                      ret = rdma_post_recvv(rs->cm_id, RS_RECV_WR_ID, NULL, 0);
-+                      ret = rs_post_recv(rs);
- 
-               if (ret) {
-                       rs->state = rs_error;