refresh

diff --git a/meta b/meta
index fd967d1a5d4f75e539b36282c609235a765a75f3..12bad3f348b607251e970871beb17e87663ae1d7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 50d6afc75a23d46a407651500e5a8716c11a40a7
-Head: b2b71b7346a91917752d2639589fe439dd7e7f58
+Previous: e44d913a1845c441b46e92713e6e0451b97cb038
+Head: 470d7dd6682f761c2b93f997cf7ae355a2171d59
 Applied:
-  shutdown: 866f6459a78183f4a5a654800a8fd087ab2ce534
-  refresh-temp: b2b71b7346a91917752d2639589fe439dd7e7f58
+  shutdown: 470d7dd6682f761c2b93f997cf7ae355a2171d59
 Unapplied:
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b24bee3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: e17d0dd680820260f177d598f36f7d3f76f02a6f
-Top:    a0637db2c5d655b08f16411c3bc842825ea115f7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-08-22 17:18:21 -0700
-
-Refresh of shutdown
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index b4f5891..f94ddf3 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -133,8 +133,7 @@ enum {
- 
- enum {
-       RS_CTRL_DISCONNECT,
--      RS_CTRL_SHUTDOWN,
--      RS_CTRL_SYNC
-+      RS_CTRL_SHUTDOWN
- };
- 
- struct rs_msg {
-@@ -3115,11 +3114,6 @@ int rshutdown(int socket, int how)
-       int ctrl, ret = 0;
- 
-       rs = idm_at(&idm, socket);
--//    if (how == SHUT_RD) {
--//            rs->state &= ~rs_readable;
--//            return 0;
--//    }
--
-       if (rs->fd_flags & O_NONBLOCK)
-               rs_set_nonblocking(rs, 0);

diff --git a/patches/shutdown b/patches/shutdown
index cfe0a6da3174bd8c3b74de1ac95d0bee2f758199..d8ef566766a51da0fbeac7b2f338f189a75e6289 100644 (file)
--- a/patches/shutdown
+++ b/patches/shutdown
@@ -1,5 +1,5 @@
 Bottom: ffbbb287b1a2e4fbdbcedb90103f988acb8fcb42
-Top:    e17d0dd680820260f177d598f36f7d3f76f02a6f
+Top:    a0637db2c5d655b08f16411c3bc842825ea115f7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-08-16 15:15:12 -0700
 
@@ -11,20 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index d544dd0..b4f5891 100644
+index d544dd0..f94ddf3 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -133,7 +133,8 @@ enum {
- 
- enum {
-       RS_CTRL_DISCONNECT,
--      RS_CTRL_SHUTDOWN
-+      RS_CTRL_SHUTDOWN,
-+      RS_CTRL_SYNC
- };
- 
- struct rs_msg {
-@@ -1822,7 +1823,12 @@ static int rs_poll_cq(struct rsocket *rs)
+@@ -1822,7 +1822,12 @@ static int rs_poll_cq(struct rsocket *rs)
                                        rs->state = rs_disconnected;
                                        return 0;
                                } else if (rs_msg_data(msg) == RS_CTRL_SHUTDOWN) {
@@ -38,7 +28,7 @@ index d544dd0..b4f5891 100644
                                }
                                break;
                        case RS_OP_WRITE:
-@@ -2948,10 +2954,12 @@ static int rs_poll_events(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
+@@ -2948,10 +2953,12 @@ static int rs_poll_events(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
  
                rs = idm_lookup(&idm, fds[i].fd);
                if (rs) {
@@ -51,7 +41,7 @@ index d544dd0..b4f5891 100644
                        fds[i].revents = rs_poll_rs(rs, fds[i].events, 1, rs_poll_all);
                } else {
                        fds[i].revents = rfds[i].revents;
-@@ -3098,7 +3106,8 @@ int rselect(int nfds, fd_set *readfds, fd_set *writefds,
+@@ -3098,7 +3105,8 @@ int rselect(int nfds, fd_set *readfds, fd_set *writefds,
  
  /*
   * For graceful disconnect, notify the remote side that we're
@@ -61,7 +51,7 @@ index d544dd0..b4f5891 100644
   */
  int rshutdown(int socket, int how)
  {
-@@ -3106,10 +3115,10 @@ int rshutdown(int socket, int how)
+@@ -3106,11 +3114,6 @@ int rshutdown(int socket, int how)
        int ctrl, ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -69,14 +59,11 @@ index d544dd0..b4f5891 100644
 -              rs->state &= ~rs_readable;
 -              return 0;
 -      }
-+//    if (how == SHUT_RD) {
-+//            rs->state &= ~rs_readable;
-+//            return 0;
-+//    }
- 
+-
        if (rs->fd_flags & O_NONBLOCK)
                rs_set_nonblocking(rs, 0);
-@@ -3118,15 +3127,20 @@ int rshutdown(int socket, int how)
+ 
+@@ -3118,15 +3121,20 @@ int rshutdown(int socket, int how)
                if (how == SHUT_RDWR) {
                        ctrl = RS_CTRL_DISCONNECT;
                        rs->state &= ~(rs_readable | rs_writable);
@@ -99,7 +86,7 @@ index d544dd0..b4f5891 100644
                }
  
                if ((rs->state & rs_connected) && rs->ctrl_avail) {
-@@ -3138,10 +3152,17 @@ int rshutdown(int socket, int how)
+@@ -3138,10 +3146,17 @@ int rshutdown(int socket, int how)
        if (rs->state & rs_connected)
                rs_process_cq(rs, 0, rs_conn_all_sends_done);