refresh

diff --git a/meta b/meta
index 0aa6b323dc164208cacaeaec6a664edc0d6d3228..ad601a730bb2df3e1d8ebe96636bf3bfe2824a3e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 1948015c94c8cefffec22bbb5216e57e4d05d87a
-Head: fb94e8128c7be62baee6bce5123f1414dc067ce3
+Previous: d04e01941849bff19e7978c50bc1ea4d8d2cb1bd
+Head: 787c3c665c26cd4f4e898649af3897b6743d271c
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
-  fork: c41b63504fb961b432e3a09b0e9c99480ddf6a1a
-  refresh-temp: fb94e8128c7be62baee6bce5123f1414dc067ce3
+  fork: 787c3c665c26cd4f4e898649af3897b6743d271c
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/fork b/patches/fork
index 89f4e82429ac2724de649f14bc524ec6f5eaa89d..59e3a460573644d890bf03eab3a5c7ab4ed9cd8b 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
-Top:    89b109b9172f2fd26f7feaca314718e1127b4e64
+Top:    6fb26f02c06c27cb2b94fd21d21273260c3c4563
 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 d2058e2..1d76df9 100644
+index d2058e2..cdf1ea6 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -76,7 +76,7 @@ index d2058e2..1d76df9 100644
 -              set_rsocket_options(ret);
 +              if (fork_support) {
 +                      rclose(ret);
-+                      ret = real_socket(domain, type, protocol);
++                      ret = real.socket(domain, type, protocol);
 +                      if (ret < 0)
 +                              return ret;
 +                      fd_store(index, ret, fd_fork);
@@ -137,7 +137,7 @@ index d2058e2..1d76df9 100644
                sin = (struct sockaddr_in *) addr;
                if (ntohs(sin->sin_port) > 1024) {
                        ret = rconnect(fd, addr, addrlen);
-@@ -754,3 +803,85 @@ int fcntl(int socket, int cmd, ... /* arg */)
+@@ -754,3 +803,86 @@ int fcntl(int socket, int cmd, ... /* arg */)
        va_end(args);
        return ret;
  }
@@ -201,6 +201,7 @@ index d2058e2..1d76df9 100644
 +
 +      param = 1;
 +      rsetsockopt(dfd, IPPROTO_TCP, TCP_NODELAY, &param, sizeof param);
++      set_rsocket_options(dfd);
 +
 +      msg = 0;
 +      ret = real.write(sfd, &msg, sizeof msg);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1a0306a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: 89b109b9172f2fd26f7feaca314718e1127b4e64
-Top:    6fb26f02c06c27cb2b94fd21d21273260c3c4563
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-17 12:39:37 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 1d76df9..cdf1ea6 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -391,7 +391,7 @@ int socket(int domain, int type, int protocol)
-       if (ret >= 0) {
-               if (fork_support) {
-                       rclose(ret);
--                      ret = real_socket(domain, type, protocol);
-+                      ret = real.socket(domain, type, protocol);
-                       if (ret < 0)
-                               return ret;
-                       fd_store(index, ret, fd_fork);
-@@ -863,6 +863,7 @@ pid_t fork(void)
- 
-       param = 1;
-       rsetsockopt(dfd, IPPROTO_TCP, TCP_NODELAY, &param, sizeof param);
-+      set_rsocket_options(dfd);
- 
-       msg = 0;
-       ret = real.write(sfd, &msg, sizeof msg);