refresh

diff --git a/meta b/meta
index 85d3d70af3eecfe2fa3d026abd0903e79df8cf80..80464f4a0e2b95dc05482ca6ce785d4d5f180cde 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: ca0b450df298d6e39c147760269b6576644bf017
-Head: c1774f49666ff877a116ff767a2b95f643797608
+Previous: 15d347cadd5ced4030c8aef22f15de9eb07a620d
+Head: 48ad17250a8b5952d8e84ebc5b8d8a78c89f99d0
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fstat: a62c653906870422edef5f6388dac9f76c953e35
-  dbg-out: b9c9727b9f182f147bf7f66f1d6247d11326fcf2
-  refresh-temp: c1774f49666ff877a116ff767a2b95f643797608
+  dbg-out: 48ad17250a8b5952d8e84ebc5b8d8a78c89f99d0
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index 19ddd612f0b2a2d9c769ec358be424a466689101..771f95b58618d22edebc67579d703b6584a9fecc 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 6bbb92f637582964eea7a287f91549c84da9571a
-Top:    f808773d213c6b0b6ecbaff3f68d99d199d218b8
+Top:    5623cf863fc9cc2ced3b180c705ed739b95978f8
 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..fdb25ac 100644
+index 53f8543..458362d 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,8 @@
@@ -176,13 +176,14 @@ index 53f8543..fdb25ac 100644
        return newfd;
  }
  
-@@ -968,12 +1009,18 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+@@ -968,12 +1009,19 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
  {
        int fd, ret;
  
 +      init_preload();
 +      fprintf(fout, "%d fxstat64 socket %d - fd %d type %d\n",
 +                      syscall(SYS_gettid), socket, fd_getd(socket), fd_gett(socket));
++      fflush(fout);
        if (fd_get(socket, &fd) == fd_rsocket) {
                ret = real.fxstat64(ver, socket, buf);
 +              fprintf(fout, "%d fxstat64 - rsocket %d\n", syscall(SYS_gettid), ret);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7fe6f40..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: f808773d213c6b0b6ecbaff3f68d99d199d218b8
-Top:    5623cf863fc9cc2ced3b180c705ed739b95978f8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 22:10:13 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index fdb25ac..458362d 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -1012,6 +1012,7 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
-       init_preload();
-       fprintf(fout, "%d fxstat64 socket %d - fd %d type %d\n",
-                       syscall(SYS_gettid), socket, fd_getd(socket), fd_gett(socket));
-+      fflush(fout);
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = real.fxstat64(ver, socket, buf);
-               fprintf(fout, "%d fxstat64 - rsocket %d\n", syscall(SYS_gettid), ret);