refresh

diff --git a/meta b/meta
index 54dcfbe3589a79def5d2186d408b00ea4b40df86..cc5dc2fe9482ff3db64edce59cc4380f21401675 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 71677c45950b7758aad61929c199824b32e7d923
-Head: 264d1be51bf9494b9ca35820f9fc7b925a693418
+Previous: 3bd98343bdd8b419931e08f102600de5622b5f62
+Head: a31705e2a68851f684dc58edff0f08f3d3906cea
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
-  fork-connect: 9f41de8f49824b574067c97a6cd00b13f3e11e16
-  refresh-temp: 264d1be51bf9494b9ca35820f9fc7b925a693418
+  fork-connect: a31705e2a68851f684dc58edff0f08f3d3906cea
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   fstat: a62c653906870422edef5f6388dac9f76c953e35

diff --git a/patches/fork-connect b/patches/fork-connect
index 138ea9621cb5bbf3e94e32ee8280326a75948cc7..0279a01545bf4f76f162cc72acbe5454dc3c0f00 100644 (file)
--- a/patches/fork-connect
+++ b/patches/fork-connect
@@ -1,5 +1,5 @@
 Bottom: 3ea2748a5c41b11a2e7033c56bddd938d2770b6c
-Top:    e5851de376df609d0644456f8a89570a86a723f0
+Top:    0841906224bb250847983ffd2a5d0bee11b39b28
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-10 21:44:39 -0700
 
@@ -28,7 +28,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index b18d310..2830f14 100644
+index b18d310..33f3baf 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -99,12 +99,20 @@ static int fork_support;
@@ -292,7 +292,7 @@ index b18d310..2830f14 100644
 +              if (fdi->type == fd_fork_passive)
                        fork_passive(index);
 +              else if (fdi->type == fd_fork_active)
-+                      fork_active(index, NULL, 0);
++                      fork_active(index);
                *fd = fdi->fd;
                return fdi->type;
  
@@ -310,7 +310,7 @@ index b18d310..2830f14 100644
                ret = rconnect(fd, addr, addrlen);
                if (!ret || errno == EINPROGRESS)
                        return ret;
-@@ -591,9 +635,12 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -591,9 +635,8 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
  
                rclose(fd);
                fd = ret;
@@ -318,10 +318,6 @@ index b18d310..2830f14 100644
 -      default:
 -              break;
 +      } else if (fd_gets(socket) == fd_fork) {
-+//            flags = real.fcntl(fd, F_GETFL);
-+//            if (!(flags & O_NONBLOCK))
-+//                    return fork_active(socket, addr, addrlen);
-+//
 +              fd_store(socket, fd, fd_normal, fd_fork_active);
        }
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d02888b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: e5851de376df609d0644456f8a89570a86a723f0
-Top:    0841906224bb250847983ffd2a5d0bee11b39b28
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-13 14:43:53 -0700
-
-Refresh of fork-connect
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 2830f14..33f3baf 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -609,7 +609,7 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
-               if (fdi->type == fd_fork_passive)
-                       fork_passive(index);
-               else if (fdi->type == fd_fork_active)
--                      fork_active(index, NULL, 0);
-+                      fork_active(index);
-               *fd = fdi->fd;
-               return fdi->type;
- 
-@@ -636,10 +636,6 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
-               rclose(fd);
-               fd = ret;
-       } else if (fd_gets(socket) == fd_fork) {
--//            flags = real.fcntl(fd, F_GETFL);
--//            if (!(flags & O_NONBLOCK))
--//                    return fork_active(socket, addr, addrlen);
--//
-               fd_store(socket, fd, fd_normal, fd_fork_active);
-       }