refresh

diff --git a/meta b/meta
index 759269433c432c75304a95dca77d5e0f1388717e..37b8a3d52288682b80ec2d9e5c3f4b41a11c3160 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: e961a44dba5f8cd0ffdb6d6e3bac9628aa6cbe77
-Head: 204a6b6203d2363604a2074abc2ab2e293f465cd
+Previous: e9ccdef320137f050851d1edafec546b571c1743
+Head: 85934ae0f5efd5fb11c2f7414e69787d81d62b1c
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
-  fork-connect: f6e62054b50421dc41a3a2a3734dd3f656ac1b7c
-  refresh-temp: 204a6b6203d2363604a2074abc2ab2e293f465cd
+  fork-connect: 85934ae0f5efd5fb11c2f7414e69787d81d62b1c
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   fstat: a62c653906870422edef5f6388dac9f76c953e35

diff --git a/patches/fork-connect b/patches/fork-connect
index 8ccc39298511a6ca97be11170ba093827565cfb5..b4e0640a1742eb73be2117b250cdf45825e4bbc1 100644 (file)
--- a/patches/fork-connect
+++ b/patches/fork-connect
@@ -1,5 +1,5 @@
 Bottom: 3ea2748a5c41b11a2e7033c56bddd938d2770b6c
-Top:    869244971263f9cd4426b0428f1505bf77030a32
+Top:    652ae6e1dadacc92be353adaafd434f1ff7ddbfa
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-10 21:44:39 -0700
 
@@ -29,7 +29,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index b18d310..9182b6a 100644
+index b18d310..8b86415 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -99,12 +99,20 @@ static int fork_support;
@@ -133,37 +133,37 @@ index b18d310..9182b6a 100644
 -      type = fd_get(socket, &fd);
 -      if (type == fd_rsocket || type == fd_fork) {
 +      if (fd_get(socket, &fd) == fd_rsocket) {
++              index = fd_open();
++              if (index < 0)
++                      return index;
++
++              ret = raccept(fd, addr, addrlen);
++              if (ret < 0) {
++                      fd_close(index, &fd);
++                      return ret;
++              }
++
++              fd_store(index, ret, fd_rsocket, fd_ready);
++              return index;
++      } else if (fd_gets(socket) == fd_fork_listen) {
                index = fd_open();
                if (index < 0)
                        return index;
  
 -              ret = (type == fd_rsocket) ? raccept(fd, addr, addrlen) :
 -                                           real.accept(fd, addr, addrlen);
-+              ret = raccept(fd, addr, addrlen);
++              ret = real.accept(fd, addr, addrlen);
                if (ret < 0) {
                        fd_close(index, &fd);
                        return ret;
                }
  
 -              fd_store(index, ret, type);
-+              fd_store(index, ret, fd_rsocket, fd_ready);
-+              return index;
-+      } else if (fd_gets(socket) == fd_fork_listen) {
-+              index = fd_open();
-+              if (index < 0)
-+                      return index;
-+
-+              ret = real.accept(fd, addr, addrlen);
-+              if (ret < 0) {
-+                      fd_close(index, &fd);
-+                      return ret;
-+              }
-+
 +              fd_store(index, ret, fd_normal, fd_fork_passive);
                return index;
        } else {
                return real.accept(fd, addr, addrlen);
-@@ -453,35 +486,49 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -453,37 +486,57 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
   * We can't fork RDMA connections and pass them from the parent to the child
   * process.  Instead, we need to establish the RDMA connection after calling
   * fork.  To do this, we delay establishing the RDMA connection until we try
@@ -216,24 +216,32 @@ index b18d310..9182b6a 100644
 +      ret = rconnect(ret, (struct sockaddr *) &addr, len);
 +      if (ret)
 +              goto err2;
- 
--      real.close(fd);
--      return rconnect(ret, addr, addrlen);
++
 +      set_rsocket_options(dfd);
 +      copysockopts(dfd, sfd, &rs, &real);
 +      real.shutdown(sfd, SHUT_RDWR);
 +      real.close(sfd);
 +      fd_store(socket, dfd, fd_rsocket, fd_ready);
 +      return;
-+
+ 
+-      real.close(fd);
+-      return rconnect(ret, addr, addrlen);
 +err2:
 +      rclose(dfd);
 +err1:
 +      fd_store(socket, sfd, fd_normal, fd_ready);
  }
  
++/*
++ * The server will start listening for the new connection, then send a
++ * message to the active side when the listen is ready.  This does leave
++ * fork unsupported in the following case: the server is nonblocking and
++ * calls select/poll waiting to receive data from the client.
++ */
  static void fork_passive(int socket)
-@@ -492,7 +539,7 @@ static void fork_passive(int socket)
+ {
+       struct sockaddr_in6 sin6;
+@@ -492,7 +545,7 @@ static void fork_passive(int socket)
        socklen_t len;
        uint32_t msg;
  
@@ -242,7 +250,7 @@ index b18d310..9182b6a 100644
  
        len = sizeof sin6;
        ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
-@@ -510,7 +557,7 @@ static void fork_passive(int socket)
+@@ -510,7 +563,7 @@ static void fork_passive(int socket)
  
        lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
        if (lfd < 0) {
@@ -251,7 +259,7 @@ index b18d310..9182b6a 100644
                goto sclose;
        }
  
-@@ -537,14 +584,11 @@ static void fork_passive(int socket)
+@@ -537,14 +590,11 @@ static void fork_passive(int socket)
                goto lclose;
        }
  
@@ -267,7 +275,7 @@ index b18d310..9182b6a 100644
  
  lclose:
        rclose(lfd);
-@@ -553,7 +597,7 @@ sclose:
+@@ -553,7 +603,7 @@ sclose:
        sem_close(sem);
  out:
        if (ret)
@@ -276,7 +284,7 @@ index b18d310..9182b6a 100644
  }
  
  static inline enum fd_type fd_fork_get(int index, int *fd)
-@@ -562,8 +606,10 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
+@@ -562,8 +612,10 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
  
        fdi = idm_lookup(&idm, index);
        if (fdi) {
@@ -288,7 +296,7 @@ index b18d310..9182b6a 100644
                *fd = fdi->fd;
                return fdi->type;
  
-@@ -577,10 +623,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -577,10 +629,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
  {
        int fd, ret;
  
@@ -300,7 +308,7 @@ index b18d310..9182b6a 100644
                ret = rconnect(fd, addr, addrlen);
                if (!ret || errno == EINPROGRESS)
                        return ret;
-@@ -591,9 +634,8 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -591,9 +640,8 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
  
                rclose(fd);
                fd = ret;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c002e79..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 869244971263f9cd4426b0428f1505bf77030a32
-Top:    652ae6e1dadacc92be353adaafd434f1ff7ddbfa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-13 15:59:00 -0700
-
-Refresh of fork-connect
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 9182b6a..8b86415 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -531,6 +531,12 @@ err1:
-       fd_store(socket, sfd, fd_normal, fd_ready);
- }
- 
-+/*
-+ * The server will start listening for the new connection, then send a
-+ * message to the active side when the listen is ready.  This does leave
-+ * fork unsupported in the following case: the server is nonblocking and
-+ * calls select/poll waiting to receive data from the client.
-+ */
- static void fork_passive(int socket)
- {
-       struct sockaddr_in6 sin6;