refresh

diff --git a/meta b/meta
index 2d1514503ca656222e2f8d6ca03cf37956871935..96199f452b49be85c2c11f1d047771bebd2d1652 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 9639059918b48962af57d64d61c7cd3666bbcde5
-Head: ab0ae36d99f292a9afce1d9742f00234e25526c3
+Previous: 17f136175ccfe178baa65bc39951b3068e15ead3
+Head: b2e126ceaf31025bbd15a22f4abc0fb22d21d4ab
 Applied:
   v6only: 36dbcc6dd62fc62a0bb8bc3cc82869eb4242fd4f
   rselect: 1fdb8dc1bff60f2748e148a081aae55b7fa80034
-  shut_wr: 3a1fc5e248717d04e0ca1cebab4b7b11e481e9dd
-  refresh-temp: ab0ae36d99f292a9afce1d9742f00234e25526c3
+  shut_wr: b2e126ceaf31025bbd15a22f4abc0fb22d21d4ab
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 84357c2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,69 +0,0 @@
-Bottom: fe4d692e928f917ad1c29688c0faf1fbc4bcfd01
-Top:    2ddb5fbcef7548a1d1c87870ef237d187fba4f30
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-26 14:08:48 -0700
-
-Refresh of shut_wr
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 8263def..5dfec0b 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -131,21 +131,21 @@ union rs_wr_id {
-       };
- };
- 
--/*
-- * rsocket states are ordered as passive, connecting, connected, disconnected.
-- */
- enum rs_state {
-       rs_init,
--      rs_bound,
--      rs_listening,
--      rs_resolving_addr,
--      rs_resolving_route,
--      rs_connecting,
--      rs_accepting,
--      rs_connect_error,
--      rs_connected,
--      rs_disconnected,
--      rs_error
-+      rs_bound           =                0x0001,
-+      rs_listening       =                0x0002,
-+      rs_opening         =                0x0004,
-+      rs_resolving_addr  = rs_opening |   0x0010,
-+      rs_resolving_route = rs_opening |   0x0020,
-+      rs_connecting      = rs_opening |   0x0040,
-+      rs_accepting       = rs_opening |   0x0080,
-+      rs_connected       =                0x0100,
-+      rs_connect_wr      = rs_connected | 0x0200,
-+      rs_connect_rd      = rs_connected | 0x0400,
-+      rs_disconnected    =                0x0800,
-+      rs_error           =                0x1000,
-+      rs_connect_error   = rs_error |     0x2000
- };
- 
- #define RS_OPT_SWAP_SGL 1
-@@ -701,9 +701,9 @@ do_connect:
-               if (!ret)
-                       goto connected;
-               if (errno == EAGAIN || errno == EWOULDBLOCK)
--                      rs->state = rs_connecting;
-+                      rs->state = rs_active_connect;
-               break;
--      case rs_connecting:
-+      case rs_active_connect:
-               ret = ucma_complete(rs->cm_id);
-               if (ret)
-                       break;
-@@ -1444,7 +1444,7 @@ static int rs_poll_rs(struct rsocket *rs, int events,
-               return fds.revents;
-       case rs_resolving_addr:
-       case rs_resolving_route:
--      case rs_connecting:
-+      case rs_active_connect:
-       case rs_accepting:
-               ret = rs_do_connect(rs);
-               if (ret) {

diff --git a/patches/shut_wr b/patches/shut_wr
index 073a256718d39182a47ddc8b08c749ee515e1d30..fd115fbb11ea8b7c69525fa296850554fb598a8f 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -1,5 +1,5 @@
 Bottom: 938168c7141b54196d5a134aca1fe7c88dcfb3b5
-Top:    fe4d692e928f917ad1c29688c0faf1fbc4bcfd01
+Top:    2ddb5fbcef7548a1d1c87870ef237d187fba4f30
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 14:19:54 -0700
 
@@ -11,9 +11,44 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ed994fe..8263def 100644
+index ed994fe..5dfec0b 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
+@@ -131,21 +131,21 @@ union rs_wr_id {
+       };
+ };
+ 
+-/*
+- * rsocket states are ordered as passive, connecting, connected, disconnected.
+- */
+ enum rs_state {
+       rs_init,
+-      rs_bound,
+-      rs_listening,
+-      rs_resolving_addr,
+-      rs_resolving_route,
+-      rs_connecting,
+-      rs_accepting,
+-      rs_connect_error,
+-      rs_connected,
+-      rs_disconnected,
+-      rs_error
++      rs_bound           =                0x0001,
++      rs_listening       =                0x0002,
++      rs_opening         =                0x0004,
++      rs_resolving_addr  = rs_opening |   0x0010,
++      rs_resolving_route = rs_opening |   0x0020,
++      rs_connecting      = rs_opening |   0x0040,
++      rs_accepting       = rs_opening |   0x0080,
++      rs_connected       =                0x0100,
++      rs_connect_wr      = rs_connected | 0x0200,
++      rs_connect_rd      = rs_connected | 0x0400,
++      rs_disconnected    =                0x0800,
++      rs_error           =                0x1000,
++      rs_connect_error   = rs_error |     0x2000
+ };
+ 
+ #define RS_OPT_SWAP_SGL 1
 @@ -321,7 +321,7 @@ static int rs_set_nonblocking(struct rsocket *rs, long arg)
        if (rs->cm_id->recv_cq_channel)
                ret = fcntl(rs->cm_id->recv_cq_channel->fd, F_SETFL, arg);
@@ -23,6 +58,18 @@ index ed994fe..8263def 100644
                ret = fcntl(rs->cm_id->channel->fd, F_SETFL, arg);
  
        return ret;
+@@ -701,9 +701,9 @@ do_connect:
+               if (!ret)
+                       goto connected;
+               if (errno == EAGAIN || errno == EWOULDBLOCK)
+-                      rs->state = rs_connecting;
++                      rs->state = rs_active_connect;
+               break;
+-      case rs_connecting:
++      case rs_active_connect:
+               ret = ucma_complete(rs->cm_id);
+               if (ret)
+                       break;
 @@ -907,7 +907,7 @@ static int rs_poll_cq(struct rsocket *rs)
                }
        }
@@ -41,6 +88,15 @@ index ed994fe..8263def 100644
                rs->state = rs_error;
        }
  
+@@ -1444,7 +1444,7 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+               return fds.revents;
+       case rs_resolving_addr:
+       case rs_resolving_route:
+-      case rs_connecting:
++      case rs_active_connect:
+       case rs_accepting:
+               ret = rs_do_connect(rs);
+               if (ret) {
 @@ -1466,10 +1466,12 @@ static int rs_poll_rs(struct rsocket *rs, int events,
                        revents |= POLLIN;
                if ((events & POLLOUT) && rs_can_send(rs))