refresh

diff --git a/meta b/meta
index ad4388435c03ecce75e475a5bde2a96eae9ca90f..2a8fc60ea139ad8a3d22986122d03718ddb0d240 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 889e1fc2f3b9eb1be47a3ac4142435933f245144
-Head: e1083a1a86976767d8bd6347d2bb13a99d599a81
+Previous: 303cb33f8da5c00fcde36bce1ec45bbb5c61cb93
+Head: 9a9aeb5954821434af3ace09e041bc06f8d7b1af
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 0744fbe2b19f7924faf0dce72349307cc445577e
   rstream-fork: edf0409ab2138bdaf8283fa19ef0d2560c723478
-  dbg: 13dcd9612e21fad56c356aee7ffe1f03ee1282d0
-  refresh-temp: e1083a1a86976767d8bd6347d2bb13a99d599a81
+  dbg: 9a9aeb5954821434af3ace09e041bc06f8d7b1af
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 105475ca6586511cc14621e4fe4f075bf1f05902..abb44c52c75dc1e3efb11ab8fbd0e899a750030c 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: 1f4485c0b98410aa12e6f2832d81210b64ac5c0f
-Top:    bf38d805cecbb29ad4eeaf8fed937dbf9eeaa591
+Top:    51cdc21140cba2d70c2ae10355c2ed5354963fe1
 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 f824af3..aa1939d 100644
+index f824af3..e429ad6 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -101,6 +101,6 @@ index f824af3..aa1939d 100644
                goto lclose;
  
        dfd = raccept(lfd, NULL, NULL);
-+      printf("fork - raccept %d\n", dfd);
++      printf("fork - raccept %d %s\n", dfd, strerror(errno));
        if (dfd < 0)
                goto lclose;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 46e59a9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: bf38d805cecbb29ad4eeaf8fed937dbf9eeaa591
-Top:    51cdc21140cba2d70c2ae10355c2ed5354963fe1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 12:36:32 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index aa1939d..e429ad6 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -890,7 +890,7 @@ pid_t fork(void)
-               goto lclose;
- 
-       dfd = raccept(lfd, NULL, NULL);
--      printf("fork - raccept %d\n", dfd);
-+      printf("fork - raccept %d %s\n", dfd, strerror(errno));
-       if (dfd < 0)
-               goto lclose;