refresh

diff --git a/meta b/meta
index 5582e13b1271c524e26b0b855502677650d89a23..fafa5ce588c3d75c000f476f1183e89f4842e4d6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 05b37a7c38a763006679deb2ca49894c74cdab7e
-Head: 2bbe1072c4d783170c77545a31aeabdedb48e4b7
+Previous: 7fc4623e18cd3384e1d80069a81830710e1101da
+Head: 6aaa4102545fc23b3b8b90fd16878aaa4fddf1f1
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: 1df5d0ba001a0777074e6ab8ca215762b9431b53
   fstat: b3146de2e39672cc98915604e2bc94dd98312356
-  dbg-out: d069e75875e47d0d8bc0a027de883f57083dacb8
-  refresh-temp: 2bbe1072c4d783170c77545a31aeabdedb48e4b7
+  dbg-out: 6aaa4102545fc23b3b8b90fd16878aaa4fddf1f1
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index 2411e05c7524f7319faaa625003e43dd17714276..829b268f5f9a81671edc114ced83fe3e9be9035f 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 799d9bfcd5b6545c40e5e19c7b50907bd25ed616
-Top:    c408747c0e5c24a1315850f4934c3397b2381a9e
+Top:    2eb494d99a798d8027fb436887977340a27bc96c
 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..c1f68a6 100644
+index 749857e..55ee535 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -37,11 +37,20 @@ index 749857e..c1f68a6 100644
        getenv_options();
        init = 1;
  out:
-@@ -967,6 +971,7 @@ int fstat(int socket, struct stat *buf)
+@@ -967,12 +971,16 @@ int fstat(int socket, struct stat *buf)
  {
        int fd, ret;
  
 +      fprintf(fout, "fstat");
        if (fd_get(socket, &fd) == fd_rsocket) {
                ret = real.fstat(socket, buf);
++              fprintf(fout, "fstat - rsocket %d", 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);
+       }
++      fflush(fout);
+       return ret;
+ }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1a1266c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,27 +0,0 @@
-Bottom: c408747c0e5c24a1315850f4934c3397b2381a9e
-Top:    2eb494d99a798d8027fb436887977340a27bc96c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 11:29:28 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index c1f68a6..55ee535 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -974,10 +974,13 @@ int fstat(int socket, struct stat *buf)
-       fprintf(fout, "fstat");
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = real.fstat(socket, buf);
-+              fprintf(fout, "fstat - rsocket %d", 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);
-       }
-+      fflush(fout);
-       return ret;
- }