refresh (create temporary patch)

diff --git a/meta b/meta
index 7e72b8f6fd54dec6bb53785653f4d47686491c61..a717d475f2e76fbc63adf03454cf04765eebb573 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: bbbeba0160f354c891350b6fcd82eaf2918000e6
-Head: 8329a0e0d8a8c59fd617824f9cf4c1b99c7a0156
+Previous: 2cdb59f8f51cdccc5fe992562cb5735498cf96b0
+Head: 7e2c9cdc85e44f458247366d42fe62261e32596b
 Applied:
   fork: 8329a0e0d8a8c59fd617824f9cf4c1b99c7a0156
+  refresh-temp: 7e2c9cdc85e44f458247366d42fe62261e32596b
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..c898b5d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,121 @@
+Bottom: 38d73276ff33c48f81d135b5e5b1c3a0963111e6
+Top:    8ec84e6e24d58093de94f5921ca22d6e4c566290
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-16 14:15:33 -0700
+
+Refresh of fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 50430f7..8b9fbaf 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -210,7 +210,7 @@ void getenv_options(void)
+       if (var)
+               sq_inline = atoi(var);
+ 
+-      var = getenv("RS_FORK");
++      var = getenv("RDMAV_FORK_SAFE");
+       if (var)
+               fork_support = atoi(var);
+ }
+@@ -307,6 +307,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)
+@@ -402,6 +464,29 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+       }
+ }
+ 
++static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrlen)
++{
++      uint32_t msg;
++      int rs, fd, ret;
++
++      fd = fd_getd(socket);
++      ret = real_connect(fd, addr, addrlen);
++      if (!ret)
++              return ret;
++
++      ret = real_read(fd, &msg, sizeof msg);
++      if (ret != sizeof msg)
++              return ret;
++
++      rs = rsocket(domain, type, protocol);
++
++      real_shutdown(fd, SHUT_RDWR);
++      real_close(fd);
++
++      fd_store(socket, fd, fd_rsocket);
++      return connect(socket, addr, addrlen);
++}
++
+ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+       struct sockaddr_in *sin;