refresh

diff --git a/meta b/meta
index 1cb2659c32f933fa607d900f8afb71fa6272dbbb..fe601e0fc51a7ed6d4ab32edbcb2ea62c16972fb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 9e305bd0b4dc229a8e8b3eeff555227240c084db
-Head: 91db749176f0efa1d9d858b7e4d24c2190122eb9
+Previous: 87d484c37836ef12d7cb125b0264b8b67f45dbb9
+Head: 6922e9a20243bc97b602293b80eed22cda59ab43
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 3deb6392dbcb0b29fb4c96f6a7c73c5e3fca3ee1
   rstream-fork: b0aa1c3fe795a4187d6675bdc0f27ea18f733f20
-  dbg: a2fff923e1765e5e7a6f88afa0cbb6719b0da45e
-  refresh-temp: 91db749176f0efa1d9d858b7e4d24c2190122eb9
+  dbg: 6922e9a20243bc97b602293b80eed22cda59ab43
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 41efc80288081168e00855258d729571d73ee76f..04b95755d01de468c487af521801ec6bc236e7e8 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: b24f77c1e42563bf836b89a48ab6228495436490
-Top:    d828c8304e1d729bdba3e1f75df1041761f4f158
+Top:    901c8528514d5af879874c624b7902e80da7c626
 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..b261c89 100644
+index e901d13..cc33e2f 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -62,12 +62,12 @@ index e901d13..b261c89 100644
        memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
  
        sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
-+      printf("fork - sem_open %d\n", sem);
++      printf("fork - sem_open\n");
        if (sem == SEM_FAILED)
                goto out;
  
        lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
-+      printf("fork - rsocket %d\n", ldf);
++      printf("fork - rsocket %d\n", lfd);
        if (lfd < 0)
                goto sclose;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index aa90f27..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,27 +0,0 @@
-Bottom: d828c8304e1d729bdba3e1f75df1041761f4f158
-Top:    901c8528514d5af879874c624b7902e80da7c626
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 09:13:54 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index b261c89..cc33e2f 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -848,12 +848,12 @@ pid_t fork(void)
-       memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
- 
-       sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
--      printf("fork - sem_open %d\n", sem);
-+      printf("fork - sem_open\n");
-       if (sem == SEM_FAILED)
-               goto out;
- 
-       lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
--      printf("fork - rsocket %d\n", ldf);
-+      printf("fork - rsocket %d\n", lfd);
-       if (lfd < 0)
-               goto sclose;