refresh

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

diff --git a/patches/fork b/patches/fork
index ea0bf5c327a9a613d584f3a0e278ed2b8c0ceaf3..3740c83bffccf22947ace23a334fe18d968fd293 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: 7ec243f3149e9a1ff1d5183f18e30d2458e354d6
-Top:    38d73276ff33c48f81d135b5e5b1c3a0963111e6
+Top:    8ec84e6e24d58093de94f5921ca22d6e4c566290
 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 2750b30..50430f7 100644
+index 2750b30..8b9fbaf 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -92,10 +92,12 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
@@ -36,13 +36,82 @@ index 2750b30..50430f7 100644
        if (var)
                sq_inline = atoi(var);
 +
-+      var = getenv("RS_FORK");
++      var = getenv("RDMAV_FORK_SAFE");
 +      if (var)
 +              fork_support = atoi(var);
  }
  
  static void init_preload(void)
-@@ -332,8 +338,16 @@ int socket(int domain, int type, int protocol)
+@@ -301,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)
+@@ -332,8 +400,16 @@ int socket(int domain, int type, int protocol)
        ret = rsocket(domain, type, protocol);
        recursive = 0;
        if (ret >= 0) {
@@ -61,3 +130,33 @@ index 2750b30..50430f7 100644
                return index;
        }
        fd_close(index, &ret);
+@@ -388,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;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c898b5d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,121 +0,0 @@
-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;