refresh

diff --git a/meta b/meta
index 8775f4ea2b4660dfe0d081e2752a01a6ce59390c..1fa470ae2791ddd8d6e856ae01caf20d1dacc306 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 797d3c356ae008b8ee1b60bb30be26bf82b5a352
-Head: f59ad7b11e41299f5badf8a983db7076dfb61d30
+Previous: 3dfa8e51031892c911cf0558a46ebb5c4a1d249e
+Head: 9f15722f1b274cf711a59b21164dae3613e8c8ae
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fstat: a62c653906870422edef5f6388dac9f76c953e35
-  dbg-out: 1b0c2228ed7f0ad1ce3965c5e7308b914e3bcc1c
-  refresh-temp: f59ad7b11e41299f5badf8a983db7076dfb61d30
+  dbg-out: 9f15722f1b274cf711a59b21164dae3613e8c8ae
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index c60de4da1cfafce4e86d82d535d481c9b59ad31a..827d4efbd072856f09c97d19927786548da0e065 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 6bbb92f637582964eea7a287f91549c84da9571a
-Top:    7e9324f4bc6bed6e487a8af4f7f36cb559ab4572
+Top:    d72d18d7f4d5c7dc8876f58182979137f1ec9894
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 21:30:48 -0700
 
@@ -8,7 +8,7 @@ support for debug prints
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 53f8543..be2487f 100644
+index 53f8543..83cf471 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,8 @@
@@ -69,7 +69,7 @@ index 53f8543..be2487f 100644
                        return ret;
                }
  
-+              fprintf(fout, "%d accept fd %d new fd\n", syscall(SYS_gettid), socket, index);
++              fprintf(fout, "%d accept fd %d new fd %d\n", syscall(SYS_gettid), socket, index);
 +              fflush(fout);
                fd_store(index, ret, type);
                return index;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b7b7e0d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 7e9324f4bc6bed6e487a8af4f7f36cb559ab4572
-Top:    d72d18d7f4d5c7dc8876f58182979137f1ec9894
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 21:53:17 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index be2487f..83cf471 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -456,7 +456,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-                       return ret;
-               }
- 
--              fprintf(fout, "%d accept fd %d new fd\n", syscall(SYS_gettid), socket, index);
-+              fprintf(fout, "%d accept fd %d new fd %d\n", syscall(SYS_gettid), socket, index);
-               fflush(fout);
-               fd_store(index, ret, type);
-               return index;