pop

diff --git a/meta b/meta
index 9f0a1a51f10c878403dae769fee0aa76098461dd..73b4a1c39aa3abbc1fdbbd7a56899681cd42af4b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 75720545cc56d6e5787e699327dfb6f0f05b914b
-Head: 7410b462c4f733276a83dedda753dcd34677fb23
+Previous: 2b48bd0ddf50e1a080704f4c50cff29bdcaf1e40
+Head: 68aec9c7b217177e25e839113078362f261d4178
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 186a9caab5e2bbfd189e5fb2679ce35e63cd40ce
   rstream-fork: 7410b462c4f733276a83dedda753dcd34677fb23
+  dbg: 68aec9c7b217177e25e839113078362f261d4178
 Unapplied:
-  dbg: ec90e76ee347bb92b73fa7e7d969782f67d4eccf
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/dbg b/patches/dbg
index 6a8a383bc7651e14b632f8bf0516472d872e97e4..8931be0e6bb97650793c38c83866f450d30eb8d4 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
-Bottom: b24f77c1e42563bf836b89a48ab6228495436490
-Top:    98832702950f2e332d80d220d103204a5af221fa
+Bottom: db6f379646ca0fae747ef5cd04b50c3952350431
+Top:    03db0fc9f2cb988f6b56ccc07b7f9522e9f73c2f
 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 e901d13..1b7ad06 100644
+index 7be40f6..c83da39 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -20,7 +20,7 @@ index e901d13..1b7ad06 100644
  
  #include <rdma/rdma_cma.h>
  #include <rdma/rdma_verbs.h>
-@@ -463,18 +464,22 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+@@ -466,18 +467,22 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
        int fd, ret;
        uint32_t msg;
  
@@ -43,7 +43,7 @@ index e901d13..1b7ad06 100644
        if (ret < 0)
                return ret;
  
-@@ -827,11 +832,15 @@ pid_t fork(void)
+@@ -830,11 +835,15 @@ pid_t fork(void)
        uint32_t msg;
  
        init_preload();
@@ -59,7 +59,7 @@ index e901d13..1b7ad06 100644
        len = sizeof sin6;
        ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
        if (ret)
-@@ -840,10 +849,12 @@ pid_t fork(void)
+@@ -843,10 +852,12 @@ pid_t fork(void)
        memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
  
        sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
@@ -72,7 +72,7 @@ index e901d13..1b7ad06 100644
        if (lfd < 0)
                goto sclose;
  
-@@ -852,14 +863,17 @@ pid_t fork(void)
+@@ -855,14 +866,17 @@ pid_t fork(void)
  
        sem_wait(sem);
        ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
@@ -90,7 +90,7 @@ index e901d13..1b7ad06 100644
        if (dfd < 0)
                goto lclose;
  
-@@ -869,6 +883,7 @@ pid_t fork(void)
+@@ -872,6 +886,7 @@ pid_t fork(void)
  
        msg = 0;
        ret = real.write(sfd, &msg, sizeof msg);