refresh

diff --git a/meta b/meta
index 6226f04922a241956b75c6c5c45711a53dc74135..8a269d9fee9d43b46795d6e7c8a766e544b5688b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 7efacf7ea17ad977a8136ca211b4691e53f56e96
-Head: 7a3c92db1a46322c09c0907122e957f606d42172
+Previous: d9bd1b8a82fbd74fd194e268bdb2a316abdc8cc3
+Head: ec90e76ee347bb92b73fa7e7d969782f67d4eccf
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 3deb6392dbcb0b29fb4c96f6a7c73c5e3fca3ee1
   rstream-fork: b0aa1c3fe795a4187d6675bdc0f27ea18f733f20
-  dbg: 6922e9a20243bc97b602293b80eed22cda59ab43
-  refresh-temp: 7a3c92db1a46322c09c0907122e957f606d42172
+  dbg: ec90e76ee347bb92b73fa7e7d969782f67d4eccf
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 04b95755d01de468c487af521801ec6bc236e7e8..6a8a383bc7651e14b632f8bf0516472d872e97e4 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: b24f77c1e42563bf836b89a48ab6228495436490
-Top:    901c8528514d5af879874c624b7902e80da7c626
+Top:    98832702950f2e332d80d220d103204a5af221fa
 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..cc33e2f 100644
+index e901d13..1b7ad06 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -43,13 +43,14 @@ index e901d13..cc33e2f 100644
        if (ret < 0)
                return ret;
  
-@@ -827,11 +832,14 @@ pid_t fork(void)
+@@ -827,11 +832,15 @@ pid_t fork(void)
        uint32_t msg;
  
        init_preload();
 +      printf("fork\n");
        pid = real.fork();
-+      printf("fork - pid %d\n", pid);
++      printf("fork - pid %d fork_support %d last_accept %d \n",
++              pid, fork_support, last_accept);
        if (pid || !fork_support || (last_accept < 0) ||
            (fd_get(last_accept, &sfd) != fd_fork))
                goto out;
@@ -58,7 +59,7 @@ index e901d13..cc33e2f 100644
        len = sizeof sin6;
        ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
        if (ret)
-@@ -840,10 +848,12 @@ pid_t fork(void)
+@@ -840,10 +849,12 @@ pid_t fork(void)
        memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
  
        sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
@@ -71,7 +72,7 @@ index e901d13..cc33e2f 100644
        if (lfd < 0)
                goto sclose;
  
-@@ -852,14 +862,17 @@ pid_t fork(void)
+@@ -852,14 +863,17 @@ pid_t fork(void)
  
        sem_wait(sem);
        ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
@@ -89,7 +90,7 @@ index e901d13..cc33e2f 100644
        if (dfd < 0)
                goto lclose;
  
-@@ -869,6 +882,7 @@ pid_t fork(void)
+@@ -869,6 +883,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 6731b4c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 901c8528514d5af879874c624b7902e80da7c626
-Top:    98832702950f2e332d80d220d103204a5af221fa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 09:23:17 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index cc33e2f..1b7ad06 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -834,7 +834,8 @@ pid_t fork(void)
-       init_preload();
-       printf("fork\n");
-       pid = real.fork();
--      printf("fork - pid %d\n", pid);
-+      printf("fork - pid %d fork_support %d last_accept %d \n",
-+              pid, fork_support, last_accept);
-       if (pid || !fork_support || (last_accept < 0) ||
-           (fd_get(last_accept, &sfd) != fd_fork))
-               goto out;