refresh

diff --git a/meta b/meta
index f125152d7fb00a2a9e3d25be25590bc8f592f1ec..565dbc38472baea96189a760446383323162170d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: cf6edb53b093933528fa9e3492d2e7f404831305
-Head: 4c3f32c793047d22f9d9b5a9f25d7ef61eb015d7
+Previous: 6a8d43103c349466fa52ae8812c421e7e1fdef44
+Head: 454d730c27cbe7efcf9927edc0826f7f833fb95f
 Applied:
   transpose: 4c834bc154a73e7edd6dd4a912933958ca142d8d
-  fork: b2532c5a797fd47e2f6958bdfd5d3bea696ca0b6
-  refresh-temp: 4c3f32c793047d22f9d9b5a9f25d7ef61eb015d7
+  fork: 454d730c27cbe7efcf9927edc0826f7f833fb95f
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/fork b/patches/fork
index a33887555929fcaad149de500527cef5b8a09cba..fd75ff193b2fa4d026ee9ade3553bcd03ca0994b 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: 454cf9a1db769bb4bf7d2c1d4b95f0a992a0aafa
-Top:    1c8fbc5fdc8ac86358d7095d9ac4561f47eec4ea
+Top:    6824bd04c82761ee7e8d74496b6527b2166fd460
 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 0d457bf..177c621 100644
+index 0d457bf..9c4c423 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -92,10 +92,12 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
@@ -61,7 +61,7 @@ index 0d457bf..177c621 100644
                return index;
        }
        fd_close(index, &ret);
-@@ -403,6 +417,29 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -403,6 +417,27 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        }
  }
  
@@ -79,12 +79,10 @@ index 0d457bf..177c621 100644
 +      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);
++      ret = transpose_socket(socket, &fd, fd_rsocket, rsocket,
++                             real_close, rclose, real_getsockname,
++                             real_getsockopt, rsetsockopt,
++                             real_fcntl, rfcntl);
 +      return connect(socket, addr, addrlen);
 +}
 +

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 420df3a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 1c8fbc5fdc8ac86358d7095d9ac4561f47eec4ea
-Top:    6824bd04c82761ee7e8d74496b6527b2166fd460
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-16 14:45:34 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 177c621..9c4c423 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -431,12 +431,10 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
-       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);
-+      ret = transpose_socket(socket, &fd, fd_rsocket, rsocket,
-+                             real_close, rclose, real_getsockname,
-+                             real_getsockopt, rsetsockopt,
-+                             real_fcntl, rfcntl);
-       return connect(socket, addr, addrlen);
- }