refresh

diff --git a/meta b/meta
index d9b2f767c4976624fa0ec14a7300eab8b2816a01..ef97ca8b3ecd1c36df7757e6381467730b1c78f9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 62e06c17bb0ece86c0a51d4732031661bda525b5
-Head: 74081e47e5a3c0f92cf363149f7261626439075c
+Previous: 8fe3d0df4fad1857ba5f99c573207419e6d35e41
+Head: ffeea178a7bed542f8f035ac0d4884dfdea63026
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   fstat: 07e07a6ee41d57eb20b3b71b1d8098408fc1de03
-  dbg-out: f653a3515ca7de04fc3e5759b961d85fc9335818
-  refresh-temp: 74081e47e5a3c0f92cf363149f7261626439075c
+  dbg-out: ffeea178a7bed542f8f035ac0d4884dfdea63026
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index ae5cf3eac4c24a190409605f0a01f7ad5fbb3b4c..aa857fe4cc94ac754013a9fe66ada690e2c0e286 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 8706747d8841cecefce6c394ef08bec016dd0348
-Top:    d375a8c3b149a38d9c0e691a32801dcd2977c4e9
+Top:    50835e142dc27f9d7b745b34a0d7c1416c75a0b7
 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 53f8543..4ebcc85 100644
+index 53f8543..1264594 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -37,12 +37,13 @@ index 53f8543..4ebcc85 100644
        getenv_options();
        init = 1;
  out:
-@@ -968,12 +972,17 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+@@ -968,12 +972,18 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
  {
        int fd, ret;
  
 +      init_preload();
-+      fprintf(fout, "fxstat64 socket %d\n", socket);
++      fprintf(fout, "fxstat64 socket %d - fd %d type %d\n",
++              socket, fd_getd(socket), fd_gett(socket));
        if (fd_get(socket, &fd) == fd_rsocket) {
                ret = real.fxstat64(ver, socket, buf);
 +              fprintf(fout, "fxstat64 - rsocket %d\n", ret);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 091c641..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: d375a8c3b149a38d9c0e691a32801dcd2977c4e9
-Top:    50835e142dc27f9d7b745b34a0d7c1416c75a0b7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 14:06:47 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 4ebcc85..1264594 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -973,7 +973,8 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
-       int fd, ret;
- 
-       init_preload();
--      fprintf(fout, "fxstat64 socket %d\n", socket);
-+      fprintf(fout, "fxstat64 socket %d - fd %d type %d\n",
-+              socket, fd_getd(socket), fd_gett(socket));
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = real.fxstat64(ver, socket, buf);
-               fprintf(fout, "fxstat64 - rsocket %d\n", ret);