refresh

diff --git a/meta b/meta
index 751d48f47ed9503a8d1035255d44c0682bdb8c4d..c071acbd8629d8bdd7cfaf97f41d6947f5a2bdf4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 6569ea3dfb317fc8fdaf2a3160b2e6f24a583b2f
-Head: 1391acba75aac0eca6e39afe8bb0b7d5aa57fc71
+Previous: c97138dee10c874dda3938b4a8027d051474b175
+Head: 0744fbe2b19f7924faf0dce72349307cc445577e
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
-  fork: 3954e0217e42a05d30c8ad773cdc0d80529ab553
-  refresh-temp: 1391acba75aac0eca6e39afe8bb0b7d5aa57fc71
+  fork: 0744fbe2b19f7924faf0dce72349307cc445577e
 Unapplied:
   rstream-fork: b948492c5ebb014507f66b5445ecd38ee52aaac9
   dbg: 39a0eb24e8fda68380d463afc169ec5ab7a6c097

diff --git a/patches/fork b/patches/fork
index e97e151ac0ed655833952e2574430eb6db8406cb..82b015f6005fc232f3bb7addd3a1415e8abc4a20 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
-Top:    94fad5ac7a70819178822801a6a0dc686831107d
+Top:    b4a26d5e7818127e6cc14cfd2d7591232b5e775b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index d2058e2..2c07cc2 100644
+index d2058e2..f824af3 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -172,7 +172,7 @@ index d2058e2..2c07cc2 100644
        }
  
        return real.connect(fd, addr, addrlen);
-@@ -754,3 +812,87 @@ int fcntl(int socket, int cmd, ... /* arg */)
+@@ -754,3 +812,85 @@ int fcntl(int socket, int cmd, ... /* arg */)
        va_end(args);
        return ret;
  }
@@ -231,6 +231,11 @@ index d2058e2..2c07cc2 100644
 +      if (ret)
 +              goto lclose;
 +
++      msg = 0;
++      ret = real.write(sfd, &msg, sizeof msg);
++      if (ret != sizeof msg)
++              goto lclose;
++
 +      dfd = raccept(lfd, NULL, NULL);
 +      if (dfd < 0)
 +              goto lclose;
@@ -239,13 +244,6 @@ index d2058e2..2c07cc2 100644
 +      rsetsockopt(dfd, IPPROTO_TCP, TCP_NODELAY, &param, sizeof param);
 +      set_rsocket_options(dfd);
 +
-+      msg = 0;
-+      ret = real.write(sfd, &msg, sizeof msg);
-+      if (ret != sizeof msg) {
-+              rclose(dfd);
-+              goto lclose;
-+      }
-+
 +      copysockopts(dfd, sfd, &rs, &real);
 +      real.shutdown(sfd, SHUT_RDWR);
 +      real.close(sfd);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index bf6e964..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: 94fad5ac7a70819178822801a6a0dc686831107d
-Top:    b4a26d5e7818127e6cc14cfd2d7591232b5e775b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 12:02:42 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 2c07cc2..f824af3 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -867,6 +867,11 @@ pid_t fork(void)
-       if (ret)
-               goto lclose;
- 
-+      msg = 0;
-+      ret = real.write(sfd, &msg, sizeof msg);
-+      if (ret != sizeof msg)
-+              goto lclose;
-+
-       dfd = raccept(lfd, NULL, NULL);
-       if (dfd < 0)
-               goto lclose;
-@@ -875,13 +880,6 @@ pid_t fork(void)
-       rsetsockopt(dfd, IPPROTO_TCP, TCP_NODELAY, &param, sizeof param);
-       set_rsocket_options(dfd);
- 
--      msg = 0;
--      ret = real.write(sfd, &msg, sizeof msg);
--      if (ret != sizeof msg) {
--              rclose(dfd);
--              goto lclose;
--      }
--
-       copysockopts(dfd, sfd, &rs, &real);
-       real.shutdown(sfd, SHUT_RDWR);
-       real.close(sfd);