refresh

diff --git a/meta b/meta
index 4139c60753ee244e311d9523fcd9a708e9ec3dae..63b3d1c8bf20a0b25e0c1f189dbc7e917620e209 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a70179b422ad2e5c9e7593f68ab201bcff27c116
-Head: 26ade0a586dc46277450f199435d9d22b06636d9
+Previous: 6700922da03f1aababa232b2c2e0e948df9aaf24
+Head: 01509ec2d14795c1aa4056fcf2b96202f7ae8988
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -9,8 +9,7 @@ Applied:
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: 54cd7a8f0be1f0af69828c837846f64661ca2c14
-  dbg-out: 07aabaed268d5247984df4c175f30891742c3b9c
-  refresh-temp: 26ade0a586dc46277450f199435d9d22b06636d9
+  dbg-out: 01509ec2d14795c1aa4056fcf2b96202f7ae8988
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index 9d03cef0e15e435af43df50561656c381c7eb3f7..3d62d9c1efb43ce8fdea4815d550eb4ea468eca3 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 758d450afd5a63013c7540fa171eea46bb810c1a
-Top:    2d92ae89cbff3b1eccae9de8b9718649004e2453
+Top:    8075f6a47dbad3c54feda08b60166abfced62daf
 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 ec62e69..efdb414 100644
+index ec62e69..b2cbb78 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -50,6 +50,8 @@
@@ -148,18 +148,20 @@ index ec62e69..efdb414 100644
        return newfd;
  }
  
-@@ -1042,6 +1076,7 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+@@ -1042,6 +1076,8 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
  {
  //    int fd, ret;
  
++      init_preload();
 +      fprintf(fout, "%s\n", __func__); fflush(fout);
  //    if (fd_get(socket, &fd) == fd_rsocket) {
  //            ret = real.fxstat64(ver, socket, buf);
  //            if (!ret)
-@@ -1055,5 +1090,6 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+@@ -1055,5 +1091,7 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
  
  int __fxstat(int ver, int socket, struct stat *buf)
  {
++      init_preload();
 +      fprintf(fout, "%s\n", __func__); fflush(fout);
        return real.fxstat(ver, socket, buf);
  }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7d6c952..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 2d92ae89cbff3b1eccae9de8b9718649004e2453
-Top:    8075f6a47dbad3c54feda08b60166abfced62daf
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-14 16:36:14 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index efdb414..b2cbb78 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -1076,6 +1076,7 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
- {
- //    int fd, ret;
- 
-+      init_preload();
-       fprintf(fout, "%s\n", __func__); fflush(fout);
- //    if (fd_get(socket, &fd) == fd_rsocket) {
- //            ret = real.fxstat64(ver, socket, buf);
-@@ -1090,6 +1091,7 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
- 
- int __fxstat(int ver, int socket, struct stat *buf)
- {
-+      init_preload();
-       fprintf(fout, "%s\n", __func__); fflush(fout);
-       return real.fxstat(ver, socket, buf);
- }