refresh

diff --git a/meta b/meta
index b6cdee2ee26ac4f2935dd59c45be163e20bbf111..76a8e0a3a8fea5c4b9e320e6f0f79700a2262573 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: af2c472ce7e3e9cff54f2ea840a5e4babf7373af
-Head: 53b41316a9900eeb58c6e7d4d41631a1c880da63
+Previous: cacee2eefc33be6b2bcbec4c21ba66659dcaa8ec
+Head: 761724caeae12d1d82a80f09ba5e6e3935f228df
 Applied:
   v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
   rselect: 7d25968d337e976e0e22fdba69c8a2a2f5d35008
-  shut_wr: cd25f6908f2a9aa48fd1fabe07fc3fd59b042bb9
-  refresh-temp: 53b41316a9900eeb58c6e7d4d41631a1c880da63
+  shut_wr: 761724caeae12d1d82a80f09ba5e6e3935f228df
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3cc884d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 05a5cd3651f670e432b95b931b9a56acfd6820c7
-Top:    971825c3c112e14db9db5ba78fbe42a1f9fde63d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-26 16:57:50 -0700
-
-Refresh of shut_wr
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 5fc5404..4eb1ce1 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -888,6 +888,8 @@ static int rs_poll_cq(struct rsocket *rs)
-                               if (rs_msg_data(imm_data) == RS_CTRL_DISCONNECT) {
-                                       rs->state = rs_disconnected;
-                                       return ERR(ECONNRESET);
-+                              } else if (rs_msg_data(imm_data) == RS_CTRL_SHUTDOWN) {
-+                                      rs->state &= ~rs_connect_rd;
-                               }
-                               break;
-                       default:

diff --git a/patches/shut_wr b/patches/shut_wr
index 0a7fac95dc3f5c2301edaa76c0ae207f8637d5b8..d8905cb85d283867505b205be2fd327436bb52d4 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -1,5 +1,5 @@
 Bottom: 47c055283ab722851373ec3c7f8affac14e1f08b
-Top:    05a5cd3651f670e432b95b931b9a56acfd6820c7
+Top:    971825c3c112e14db9db5ba78fbe42a1f9fde63d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 14:19:54 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index c833d46..5fc5404 100644
+index c833d46..4eb1ce1 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -96,7 +96,8 @@ enum {
@@ -100,7 +100,16 @@ index c833d46..5fc5404 100644
  }
  
  static void rs_update_credits(struct rsocket *rs)
-@@ -900,14 +905,14 @@ static int rs_poll_cq(struct rsocket *rs)
+@@ -883,6 +888,8 @@ static int rs_poll_cq(struct rsocket *rs)
+                               if (rs_msg_data(imm_data) == RS_CTRL_DISCONNECT) {
+                                       rs->state = rs_disconnected;
+                                       return ERR(ECONNRESET);
++                              } else if (rs_msg_data(imm_data) == RS_CTRL_SHUTDOWN) {
++                                      rs->state &= ~rs_connect_rd;
+                               }
+                               break;
+                       default:
+@@ -900,14 +907,14 @@ static int rs_poll_cq(struct rsocket *rs)
                        } else {
                                rs->ctrl_avail++;
                        }
@@ -117,7 +126,7 @@ index c833d46..5fc5404 100644
                while (!ret && rcnt--)
                        ret = rdma_post_recvv(rs->cm_id, NULL, NULL, 0);
  
-@@ -932,7 +937,7 @@ static int rs_get_cq_event(struct rsocket *rs)
+@@ -932,7 +939,7 @@ static int rs_get_cq_event(struct rsocket *rs)
        if (!ret) {
                ibv_ack_cq_events(rs->cm_id->recv_cq, 1);
                rs->cq_armed = 0;
@@ -126,7 +135,7 @@ index c833d46..5fc5404 100644
                rs->state = rs_error;
        }
  
-@@ -1043,7 +1048,7 @@ static int rs_can_send(struct rsocket *rs)
+@@ -1043,7 +1050,7 @@ static int rs_can_send(struct rsocket *rs)
  
  static int rs_conn_can_send(struct rsocket *rs)
  {
@@ -135,7 +144,7 @@ index c833d46..5fc5404 100644
  }
  
  static int rs_can_send_ctrl(struct rsocket *rs)
-@@ -1058,7 +1063,7 @@ static int rs_have_rdata(struct rsocket *rs)
+@@ -1058,7 +1065,7 @@ static int rs_have_rdata(struct rsocket *rs)
  
  static int rs_conn_have_rdata(struct rsocket *rs)
  {
@@ -144,7 +153,7 @@ index c833d46..5fc5404 100644
  }
  
  static int rs_all_sends_done(struct rsocket *rs)
-@@ -1111,7 +1116,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+@@ -1111,7 +1118,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
        int ret;
  
        rs = idm_at(&idm, socket);
@@ -153,7 +162,7 @@ index c833d46..5fc5404 100644
                ret = rs_do_connect(rs);
                if (ret) {
                        if (errno == EINPROGRESS)
-@@ -1213,7 +1218,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+@@ -1213,7 +1220,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
        int ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -162,7 +171,7 @@ index c833d46..5fc5404 100644
                ret = rs_do_connect(rs);
                if (ret) {
                        if (errno == EINPROGRESS)
-@@ -1229,7 +1234,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+@@ -1229,7 +1236,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
                                          rs_conn_can_send);
                        if (ret)
                                break;
@@ -171,7 +180,7 @@ index c833d46..5fc5404 100644
                                ret = ERR(ECONNRESET);
                                break;
                        }
-@@ -1322,7 +1327,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+@@ -1322,7 +1329,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
        int i, ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -180,7 +189,7 @@ index c833d46..5fc5404 100644
                ret = rs_do_connect(rs);
                if (ret) {
                        if (errno == EINPROGRESS)
-@@ -1343,7 +1348,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+@@ -1343,7 +1350,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
                                          rs_conn_can_send);
                        if (ret)
                                break;
@@ -189,7 +198,7 @@ index c833d46..5fc5404 100644
                                ret = ERR(ECONNRESET);
                                break;
                        }
-@@ -1435,17 +1440,35 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+@@ -1435,17 +1442,35 @@ static int rs_poll_rs(struct rsocket *rs, int events,
        short revents;
        int ret;
  
@@ -231,7 +240,7 @@ index c833d46..5fc5404 100644
                ret = rs_do_connect(rs);
                if (ret) {
                        if (errno == EINPROGRESS) {
-@@ -1455,28 +1478,13 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+@@ -1455,28 +1480,13 @@ static int rs_poll_rs(struct rsocket *rs, int events,
                                return POLLOUT;
                        }
                }
@@ -265,7 +274,7 @@ index c833d46..5fc5404 100644
  }
  
  static int rs_poll_check(struct pollfd *fds, nfds_t nfds)
-@@ -1688,14 +1696,27 @@ int rselect(int nfds, fd_set *readfds, fd_set *writefds,
+@@ -1688,14 +1698,27 @@ int rselect(int nfds, fd_set *readfds, fd_set *writefds,
  int rshutdown(int socket, int how)
  {
        struct rsocket *rs;
@@ -296,7 +305,7 @@ index c833d46..5fc5404 100644
                if (!rs_can_send_ctrl(rs)) {
                        ret = rs_process_cq(rs, 0, rs_can_send_ctrl);
                        if (ret)
-@@ -1704,13 +1725,16 @@ int rshutdown(int socket, int how)
+@@ -1704,13 +1727,16 @@ int rshutdown(int socket, int how)
  
                rs->ctrl_avail--;
                ret = rs_post_write(rs, 0, NULL, 0,
@@ -315,7 +324,7 @@ index c833d46..5fc5404 100644
        return 0;
  }
  
-@@ -1719,7 +1743,7 @@ int rclose(int socket)
+@@ -1719,7 +1745,7 @@ int rclose(int socket)
        struct rsocket *rs;
  
        rs = idm_at(&idm, socket);
@@ -324,7 +333,7 @@ index c833d46..5fc5404 100644
                rshutdown(socket, SHUT_RDWR);
  
        rs_free(rs);
-@@ -1830,8 +1854,9 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -1830,8 +1856,9 @@ int rsetsockopt(int socket, int level, int optname,
                default:
                        break;
                }