pop

diff --git a/meta b/meta
index fbd10b42dd39d231ff7b28da39ebe7957b422a57..d98b91141edd22772a2814a14eb73abf00b44d62 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: a45c330f2a0739f93177dd667c14f0db07ed5cf6
-Head: f9f6a263b1b604b0c6084441254d14ae15193c27
+Previous: 77bf0335d9d722043308d9ec4d12b1355ad0c3c7
+Head: ff02e9796a45f108da358d23b2917f0726569695
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: cf6c4a3503761d2505c4f3782e0b3529347c1f17
   rstream-fork: f9f6a263b1b604b0c6084441254d14ae15193c27
+  dbg: ff02e9796a45f108da358d23b2917f0726569695
 Unapplied:
-  dbg: da928dc34f7529cc9ab73fc325d566d4152e4437
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/dbg b/patches/dbg
index 224d9057091b0d86ed14fd146380facf9fa2f3fb..c3a2a3235990198028b3ead3fe44685c7ee979c5 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
-Bottom: 7a6199c6bbfabb859c48c87ff027b3e8d1e4d6f1
-Top:    9dd3afd153571ff1b3b3d2bcea15c8ab559d77dd
+Bottom: abbc38c21bbfe7d98d8a01bbaa634d07ca20751e
+Top:    2e0d31141fb1fe8d53014430b90995379341e284
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -9,7 +9,7 @@ debug fork
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index a1073d5..976e2e0 100644
+index 5b6b50a..942bcf1 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -26,8 +26,8 @@ index a1073d5..976e2e0 100644
  
 +      printf("connect_fork\n");
        fd = fd_getd(socket);
-       flags = real.fcntl(fd, F_GETFD);
-       real.fcntl(fd, F_SETFD, 0);
+       flags = real.fcntl(fd, F_GETFL);
+       real.fcntl(fd, F_SETFL, 0);
        ret = real.connect(fd, addr, addrlen);
 +      printf("connect_fork - real connect %d %s\n", ret, strerror(errno));
        if (ret)
@@ -40,7 +40,7 @@ index a1073d5..976e2e0 100644
                return 0;
 @@ -482,6 +486,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
  
-       real.fcntl(fd, F_SETFD, flags);
+       real.fcntl(fd, F_SETFL, flags);
        ret = transpose_socket(socket, fd_rsocket);
 +      printf("connect_fork - transpose socket %d\n", ret);
        if (ret < 0)