refresh

diff --git a/meta b/meta
index facbbee9c70e0ec8187eca6efadeac0145191903..ec4c21037e1da60be0c2a29a16ea6ef2aaa774f0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: b1f0558bb7d761fdd0360c7e17cd1f400c925eb1
-Head: 649b520d648ed31871fde8c67e66aa941703fb19
+Previous: 5fa20824a3be313175881b05b9cf68c53aec2d9d
+Head: a2fff923e1765e5e7a6f88afa0cbb6719b0da45e
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 3deb6392dbcb0b29fb4c96f6a7c73c5e3fca3ee1
   rstream-fork: b0aa1c3fe795a4187d6675bdc0f27ea18f733f20
-  dbg: 919b733e9d28f823ad85a8a894de837748297a9c
-  refresh-temp: 649b520d648ed31871fde8c67e66aa941703fb19
+  dbg: a2fff923e1765e5e7a6f88afa0cbb6719b0da45e
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 9fa914a08cf84019636bb226eb26c1345d3ff74f..41efc80288081168e00855258d729571d73ee76f 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: b24f77c1e42563bf836b89a48ab6228495436490
-Top:    4f509e4d5734c0779509a899a2a333341d675ac7
+Top:    d828c8304e1d729bdba3e1f75df1041761f4f158
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -9,10 +9,18 @@ debug fork
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index e901d13..9d217e9 100644
+index e901d13..b261c89 100644
 --- a/src/preload.c
 +++ b/src/preload.c
-@@ -463,18 +463,22 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+@@ -48,6 +48,7 @@
+ #include <netinet/tcp.h>
+ #include <unistd.h>
+ #include <semaphore.h>
++#include <stdio.h>
+ 
+ #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
        int fd, ret;
        uint32_t msg;
  
@@ -35,7 +43,7 @@ index e901d13..9d217e9 100644
        if (ret < 0)
                return ret;
  
-@@ -827,11 +831,14 @@ pid_t fork(void)
+@@ -827,11 +832,14 @@ pid_t fork(void)
        uint32_t msg;
  
        init_preload();
@@ -50,7 +58,7 @@ index e901d13..9d217e9 100644
        len = sizeof sin6;
        ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
        if (ret)
-@@ -840,10 +847,12 @@ pid_t fork(void)
+@@ -840,10 +848,12 @@ pid_t fork(void)
        memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
  
        sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
@@ -63,7 +71,7 @@ index e901d13..9d217e9 100644
        if (lfd < 0)
                goto sclose;
  
-@@ -852,14 +861,17 @@ pid_t fork(void)
+@@ -852,14 +862,17 @@ pid_t fork(void)
  
        sem_wait(sem);
        ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
@@ -81,7 +89,7 @@ index e901d13..9d217e9 100644
        if (dfd < 0)
                goto lclose;
  
-@@ -869,6 +881,7 @@ pid_t fork(void)
+@@ -869,6 +882,7 @@ pid_t fork(void)
  
        msg = 0;
        ret = real.write(sfd, &msg, sizeof msg);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index dc75d61..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 4f509e4d5734c0779509a899a2a333341d675ac7
-Top:    d828c8304e1d729bdba3e1f75df1041761f4f158
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 09:13:18 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 9d217e9..b261c89 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -48,6 +48,7 @@
- #include <netinet/tcp.h>
- #include <unistd.h>
- #include <semaphore.h>
-+#include <stdio.h>
- 
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>