refresh

diff --git a/meta b/meta
index 56ab58938f4805c81229d1a104e34fbb28ab1240..7c02bb62e0cb8b8453da517d633218e6a539ae17 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 717a550710edc96e68b2ac8f70c6adcb5aa00fb3
-Head: 9dad7063ba1d0eab464245fb7e8fa0b1d2fd55f1
+Previous: 81d3ff6960dca412a2bad0dbee089fec4d505aa3
+Head: bf9af8d174dcad2841cb78ce7a44bcf307e7be82
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 7856c0c353736cee5399eb2f706a6ac2913cc368
-  fork: 23ca6d903e898561ad1da03cc6957d5aea27f62e
-  refresh-temp: 9dad7063ba1d0eab464245fb7e8fa0b1d2fd55f1
+  fork: bf9af8d174dcad2841cb78ce7a44bcf307e7be82
 Unapplied:
   rstream-fork: 2724e02d5b461f8c580249461271de0f7acefcab
   dbg: 3ec7b3dd2db8422fd840e3cee062c629e7b8f5b6

diff --git a/patches/fork b/patches/fork
index f20dcd28951d59b48703064139f7d4593750b1eb..c54f6bcf8f36b4f6e601eca5e2f647725aa6db34 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: 47adffa1c470a8413209e0679e601e328605b9da
-Top:    4860efad80a95980f7d24b72f375f62f9d743186
+Top:    04a586373bea04b3e94c31fe01c365a50b7c1bf1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-24 11:40:10 -0700
 
@@ -31,7 +31,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index d2058e2..79340c6 100644
+index d2058e2..e88c958 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -43,15 +43,7 @@ index d2058e2..79340c6 100644
  
  #include <rdma/rdma_cma.h>
  #include <rdma/rdma_verbs.h>
-@@ -81,6 +83,7 @@ struct socket_calls {
-       int (*getsockopt)(int socket, int level, int optname,
-                         void *optval, socklen_t *optlen);
-       int (*fcntl)(int socket, int cmd, ... /* arg */);
-+      pid_t (*fork)(void);
- };
- 
- static struct socket_calls real;
-@@ -92,10 +95,12 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
+@@ -92,10 +94,12 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
  static int sq_size;
  static int rq_size;
  static int sq_inline;
@@ -65,7 +57,7 @@ index d2058e2..79340c6 100644
  };
  
  struct fd_info {
-@@ -207,6 +212,10 @@ void getenv_options(void)
+@@ -207,6 +211,10 @@ void getenv_options(void)
        var = getenv("RS_INLINE");
        if (var)
                sq_inline = atoi(var);
@@ -76,15 +68,7 @@ index d2058e2..79340c6 100644
  }
  
  static void init_preload(void)
-@@ -244,6 +253,7 @@ static void init_preload(void)
-       real.setsockopt = dlsym(RTLD_NEXT, "setsockopt");
-       real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
-       real.fcntl = dlsym(RTLD_NEXT, "fcntl");
-+      real.fork = dlsym(RTLD_NEXT, "fork");
- 
-       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
-       rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -378,8 +388,16 @@ int socket(int domain, int type, int protocol)
+@@ -378,8 +386,16 @@ int socket(int domain, int type, int protocol)
        ret = rsocket(domain, type, protocol);
        recursive = 0;
        if (ret >= 0) {
@@ -103,7 +87,7 @@ index d2058e2..79340c6 100644
                return index;
        }
        fd_close(index, &ret);
-@@ -418,31 +436,161 @@ int listen(int socket, int backlog)
+@@ -418,31 +434,161 @@ int listen(int socket, int backlog)
  int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
  {
        int fd, index, ret;
@@ -269,7 +253,7 @@ index d2058e2..79340c6 100644
                sin = (struct sockaddr_in *) addr;
                if (ntohs(sin->sin_port) > 1024) {
                        ret = rconnect(fd, addr, addrlen);
-@@ -456,6 +604,9 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -456,6 +602,9 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
  
                rclose(fd);
                fd = ret;
@@ -279,7 +263,7 @@ index d2058e2..79340c6 100644
        }
  
        return real.connect(fd, addr, addrlen);
-@@ -464,7 +615,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -464,7 +613,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
  ssize_t recv(int socket, void *buf, size_t len, int flags)
  {
        int fd;
@@ -288,7 +272,7 @@ index d2058e2..79340c6 100644
                rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags);
  }
  
-@@ -472,7 +623,7 @@ ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
+@@ -472,7 +621,7 @@ ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
                 struct sockaddr *src_addr, socklen_t *addrlen)
  {
        int fd;
@@ -297,7 +281,7 @@ index d2058e2..79340c6 100644
                rrecvfrom(fd, buf, len, flags, src_addr, addrlen) :
                real.recvfrom(fd, buf, len, flags, src_addr, addrlen);
  }
-@@ -480,7 +631,7 @@ ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
+@@ -480,7 +629,7 @@ ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
  ssize_t recvmsg(int socket, struct msghdr *msg, int flags)
  {
        int fd;
@@ -306,7 +290,7 @@ index d2058e2..79340c6 100644
                rrecvmsg(fd, msg, flags) : real.recvmsg(fd, msg, flags);
  }
  
-@@ -488,7 +639,7 @@ ssize_t read(int socket, void *buf, size_t count)
+@@ -488,7 +637,7 @@ ssize_t read(int socket, void *buf, size_t count)
  {
        int fd;
        init_preload();
@@ -315,7 +299,7 @@ index d2058e2..79340c6 100644
                rread(fd, buf, count) : real.read(fd, buf, count);
  }
  
-@@ -496,14 +647,14 @@ ssize_t readv(int socket, const struct iovec *iov, int iovcnt)
+@@ -496,14 +645,14 @@ ssize_t readv(int socket, const struct iovec *iov, int iovcnt)
  {
        int fd;
        init_preload();
@@ -332,7 +316,7 @@ index d2058e2..79340c6 100644
                rsend(fd, buf, len, flags) : real.send(fd, buf, len, flags);
  }
  
-@@ -511,7 +662,7 @@ ssize_t sendto(int socket, const void *buf, size_t len, int flags,
+@@ -511,7 +660,7 @@ ssize_t sendto(int socket, const void *buf, size_t len, int flags,
                const struct sockaddr *dest_addr, socklen_t addrlen)
  {
        int fd;
@@ -341,7 +325,7 @@ index d2058e2..79340c6 100644
                rsendto(fd, buf, len, flags, dest_addr, addrlen) :
                real.sendto(fd, buf, len, flags, dest_addr, addrlen);
  }
-@@ -519,7 +670,7 @@ ssize_t sendto(int socket, const void *buf, size_t len, int flags,
+@@ -519,7 +668,7 @@ ssize_t sendto(int socket, const void *buf, size_t len, int flags,
  ssize_t sendmsg(int socket, const struct msghdr *msg, int flags)
  {
        int fd;
@@ -350,7 +334,7 @@ index d2058e2..79340c6 100644
                rsendmsg(fd, msg, flags) : real.sendmsg(fd, msg, flags);
  }
  
-@@ -527,7 +678,7 @@ ssize_t write(int socket, const void *buf, size_t count)
+@@ -527,7 +676,7 @@ ssize_t write(int socket, const void *buf, size_t count)
  {
        int fd;
        init_preload();
@@ -359,7 +343,7 @@ index d2058e2..79340c6 100644
                rwrite(fd, buf, count) : real.write(fd, buf, count);
  }
  
-@@ -535,7 +686,7 @@ ssize_t writev(int socket, const struct iovec *iov, int iovcnt)
+@@ -535,7 +684,7 @@ ssize_t writev(int socket, const struct iovec *iov, int iovcnt)
  {
        int fd;
        init_preload();

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index dbe1b88..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 4860efad80a95980f7d24b72f375f62f9d743186
-Top:    04a586373bea04b3e94c31fe01c365a50b7c1bf1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-24 14:11:49 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 79340c6..e88c958 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -83,7 +83,6 @@ struct socket_calls {
-       int (*getsockopt)(int socket, int level, int optname,
-                         void *optval, socklen_t *optlen);
-       int (*fcntl)(int socket, int cmd, ... /* arg */);
--      pid_t (*fork)(void);
- };
- 
- static struct socket_calls real;
-@@ -253,7 +252,6 @@ static void init_preload(void)
-       real.setsockopt = dlsym(RTLD_NEXT, "setsockopt");
-       real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
-       real.fcntl = dlsym(RTLD_NEXT, "fcntl");
--      real.fork = dlsym(RTLD_NEXT, "fork");
- 
-       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
-       rs.bind = dlsym(RTLD_DEFAULT, "rbind");