refresh

diff --git a/meta b/meta
index ea469ac1c72b4444b60e8aa57ef56f9e67a5c95f..c99466ff76f778ef9dc40a3999b2b7fa756e90fb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 74d289189de0a9a74da5486c75e0ade117888b29
-Head: 76e51bc51482587f1ab8616f78ee208e44780948
+Previous: 959aace5bd7d42c3ea7ae7468d728f96b43330c2
+Head: 0681cbfc282dbccb39d9b801460c82e1aac9b425
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: 1df5d0ba001a0777074e6ab8ca215762b9431b53
   fstat: b3146de2e39672cc98915604e2bc94dd98312356
-  dbg-out: 73cd6ca4e6e0e167e0c830434b13c71b953c6ef5
-  refresh-temp: 76e51bc51482587f1ab8616f78ee208e44780948
+  dbg-out: 0681cbfc282dbccb39d9b801460c82e1aac9b425
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index 0ac687c8b6edd88c0c3d31528be0c35a1d03e3e9..a55864d44073c531b54c391fd01f4321ca18a802 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 799d9bfcd5b6545c40e5e19c7b50907bd25ed616
-Top:    fc96efd9ca533bb3c515c1f03319ead1d9f8b91a
+Top:    427327f6d7f80a4a3fd819feac923c9113a18154
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 11:08:30 -0700
 
@@ -9,7 +9,7 @@ support for debug prints
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 749857e..6a89d41 100644
+index 749857e..d606273 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -41,15 +41,15 @@ index 749857e..6a89d41 100644
  {
        int fd, ret;
  
-+      fprintf(fout, "fstat");
++      fprintf(fout, "fstat socket %d\n", socket);
        if (fd_get(socket, &fd) == fd_rsocket) {
                ret = real.fstat(socket, buf);
-+              fprintf(fout, "fstat - rsocket %d", ret);
++              fprintf(fout, "fstat - rsocket %d\n", ret);
                if (!ret)
                        buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
        } else {
                ret = real.fstat(fd, buf);
-+              fprintf(fout, "fstat - normal %d", ret);
++              fprintf(fout, "fstat - normal %d\n", ret);
        }
 +      fflush(fout);
        return ret;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 53ce185..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: fc96efd9ca533bb3c515c1f03319ead1d9f8b91a
-Top:    427327f6d7f80a4a3fd819feac923c9113a18154
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 11:34:58 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 6a89d41..d606273 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -971,15 +971,15 @@ int fstat(int socket, struct stat *buf)
- {
-       int fd, ret;
- 
--      fprintf(fout, "fstat");
-+      fprintf(fout, "fstat socket %d\n", socket);
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = real.fstat(socket, buf);
--              fprintf(fout, "fstat - rsocket %d", ret);
-+              fprintf(fout, "fstat - rsocket %d\n", ret);
-               if (!ret)
-                       buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
-       } else {
-               ret = real.fstat(fd, buf);
--              fprintf(fout, "fstat - normal %d", ret);
-+              fprintf(fout, "fstat - normal %d\n", ret);
-       }
-       fflush(fout);
-       return ret;