refresh

diff --git a/meta b/meta
index 847f2a414901c5369a0c90fd9e2a4ac61a8ddee7..1396b8d7e058975acb69b1dec7c03314cb0b9bf4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 21a45bc2a4e818c0dd13ab43277e1e60e8053a5b
-Head: 13601524fd678940f09667e96a395e8f16ece6df
+Previous: 5912025254efa817ebe927bd80b9d3331ca99e4b
+Head: b2532c5a797fd47e2f6958bdfd5d3bea696ca0b6
 Applied:
   transpose: 4c834bc154a73e7edd6dd4a912933958ca142d8d
-  fork: a270468d34074ebd394e4b26b747ead8c77922ed
-  refresh-temp: 13601524fd678940f09667e96a395e8f16ece6df
+  fork: b2532c5a797fd47e2f6958bdfd5d3bea696ca0b6
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/fork b/patches/fork
index 4a4bf4bfbc4d09ca86b0ae00a2d962c54927cdeb..a33887555929fcaad149de500527cef5b8a09cba 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: 454cf9a1db769bb4bf7d2c1d4b95f0a992a0aafa
-Top:    aaae6221e67fef87997f863c01c8702f0dfc8d21
+Top:    1c8fbc5fdc8ac86358d7095d9ac4561f47eec4ea
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 0d457bf..599e5fb 100644
+index 0d457bf..177c621 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -92,10 +92,12 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
@@ -42,76 +42,7 @@ index 0d457bf..599e5fb 100644
  }
  
  static void init_preload(void)
-@@ -313,6 +319,68 @@ err:
- }
- 
- /*
-+ * Convert between an rsocket and a normal socket.  The new socket should have the
-+ * same settings and bindings as the current socket.  We currently only handle
-+ * setting a few of the more common values.
-+ */
-+static int
-+transpose_socket(int index, int *fd, enum fd_type new_type,
-+      int (*socket_new)(int domain, int type, int protocol),
-+      int (*shutdown_old)(int socket, int how),
-+      int (*close_old)(int socket),
-+      int (*getsockname_old)(int socket, struct sockaddr *addr,
-+                             socklen_t *addrlen),
-+      int (*getsockopt_old)(int socket, int level, int optname,
-+                            void *optval, socklen_t *optlen),
-+      int (*setsockopt_new)(int socket, int level, int optname,
-+                            const void *optval, socklen_t optlen),
-+      int (*fcntl_old)(int socket, int cmd, ... /* arg */),
-+      int (*fcntl_new)(int socket, int cmd, ... /* arg */))
-+{
-+      socklen_t len = 0;
-+      int new_fd, param, ret;
-+
-+      ret = getsockname_old(*fd, NULL, &len);
-+      if (ret)
-+              return ret;
-+
-+      param = (len == sizeof(struct sockaddr_in6)) ? PF_INET6 : PF_INET;
-+      new_fd = socket_new(param, SOCK_STREAM, 0);
-+      if (new_fd < 0)
-+              return new_fd;
-+
-+      ret = fcntl_old(*fd, F_GETFL);
-+      if (ret > 0)
-+              ret = fcntl_new(new_fd, F_SETFL, ret);
-+      if (ret)
-+              goto err;
-+
-+      len = sizeof param;
-+      ret = getsockopt_old(*fd, SOL_SOCKET, SO_REUSEADDR, &param, &len);
-+      if (param && !ret)
-+              ret = setsockopt_new(new_fd, SOL_SOCKET, SO_REUSEADDR, &param, len);
-+      if (ret)
-+              goto err;
-+
-+      len = sizeof param;
-+      ret = getsockopt_old(*fd, IPPROTO_TCP, TCP_NODELAY, &param, &len);
-+      if (param && !ret)
-+              ret = setsockopt_new(new_fd, IPPROTO_TCP, TCP_NODELAY, &param, len);
-+      if (ret)
-+              goto err;
-+
-+      shutdown_old(*fd, SHUT_RDWR);
-+      close_old(*fd);
-+      fd_store(socket, new_fd, new_type);
-+      *fd = new_fd;
-+      return 0;
-+
-+err:
-+      real_close(new_fd);
-+      return ret;
-+}
-+
-+/*
-  * Use defaults on failure.
-  */
- void set_rsocket_options(int rsocket)
-@@ -344,8 +412,16 @@ int socket(int domain, int type, int protocol)
+@@ -344,8 +350,16 @@ int socket(int domain, int type, int protocol)
        ret = rsocket(domain, type, protocol);
        recursive = 0;
        if (ret >= 0) {
@@ -130,7 +61,7 @@ index 0d457bf..599e5fb 100644
                return index;
        }
        fd_close(index, &ret);
-@@ -403,6 +479,29 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -403,6 +417,29 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        }
  }
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 52b6e95..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,82 +0,0 @@
-Bottom: aaae6221e67fef87997f863c01c8702f0dfc8d21
-Top:    1c8fbc5fdc8ac86358d7095d9ac4561f47eec4ea
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-16 14:31:04 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 599e5fb..177c621 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -319,68 +319,6 @@ err:
- }
- 
- /*
-- * Convert between an rsocket and a normal socket.  The new socket should have the
-- * same settings and bindings as the current socket.  We currently only handle
-- * setting a few of the more common values.
-- */
--static int
--transpose_socket(int index, int *fd, enum fd_type new_type,
--      int (*socket_new)(int domain, int type, int protocol),
--      int (*shutdown_old)(int socket, int how),
--      int (*close_old)(int socket),
--      int (*getsockname_old)(int socket, struct sockaddr *addr,
--                             socklen_t *addrlen),
--      int (*getsockopt_old)(int socket, int level, int optname,
--                            void *optval, socklen_t *optlen),
--      int (*setsockopt_new)(int socket, int level, int optname,
--                            const void *optval, socklen_t optlen),
--      int (*fcntl_old)(int socket, int cmd, ... /* arg */),
--      int (*fcntl_new)(int socket, int cmd, ... /* arg */))
--{
--      socklen_t len = 0;
--      int new_fd, param, ret;
--
--      ret = getsockname_old(*fd, NULL, &len);
--      if (ret)
--              return ret;
--
--      param = (len == sizeof(struct sockaddr_in6)) ? PF_INET6 : PF_INET;
--      new_fd = socket_new(param, SOCK_STREAM, 0);
--      if (new_fd < 0)
--              return new_fd;
--
--      ret = fcntl_old(*fd, F_GETFL);
--      if (ret > 0)
--              ret = fcntl_new(new_fd, F_SETFL, ret);
--      if (ret)
--              goto err;
--
--      len = sizeof param;
--      ret = getsockopt_old(*fd, SOL_SOCKET, SO_REUSEADDR, &param, &len);
--      if (param && !ret)
--              ret = setsockopt_new(new_fd, SOL_SOCKET, SO_REUSEADDR, &param, len);
--      if (ret)
--              goto err;
--
--      len = sizeof param;
--      ret = getsockopt_old(*fd, IPPROTO_TCP, TCP_NODELAY, &param, &len);
--      if (param && !ret)
--              ret = setsockopt_new(new_fd, IPPROTO_TCP, TCP_NODELAY, &param, len);
--      if (ret)
--              goto err;
--
--      shutdown_old(*fd, SHUT_RDWR);
--      close_old(*fd);
--      fd_store(socket, new_fd, new_type);
--      *fd = new_fd;
--      return 0;
--
--err:
--      real_close(new_fd);
--      return ret;
--}
--
--/*
-  * Use defaults on failure.
-  */
- void set_rsocket_options(int rsocket)