refresh (create temporary patch)

diff --git a/meta b/meta
index 63b3d1c8bf20a0b25e0c1f189dbc7e917620e209..b6a036219b4964d75b7a19fc8cb5a2f25991aaa4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6700922da03f1aababa232b2c2e0e948df9aaf24
-Head: 01509ec2d14795c1aa4056fcf2b96202f7ae8988
+Previous: 23564215321abd6935413eef48689b9e8c5c3ed1
+Head: 6654fe18b802ac428d8e64d5448cc3656efd4a30
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -10,6 +10,7 @@ Applied:
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: 54cd7a8f0be1f0af69828c837846f64661ca2c14
   dbg-out: 01509ec2d14795c1aa4056fcf2b96202f7ae8988
+  refresh-temp: 6654fe18b802ac428d8e64d5448cc3656efd4a30
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..86c9b98
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,52 @@
+Bottom: 8075f6a47dbad3c54feda08b60166abfced62daf
+Top:    1553275a3c6855e88d8b2c6f8cfb26579eb9307a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-14 16:44:49 -0700
+
+Refresh of dbg-out
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index b2cbb78..ac36642 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -411,17 +411,16 @@ int socket(int domain, int type, int protocol)
+       static __thread int recursive;
+       int index, ret;
+ 
+-      fprintf(fout, "%d socket\n", (int)syscall(SYS_gettid));
+       if (recursive)
+               goto real;
+ 
+       init_preload();
++      fprintf(fout, "%d socket\n", (int)syscall(SYS_gettid));
+       index = fd_open();
+       if (index < 0)
+               return index;
+ 
+-      fprintf(fout, "%d socket %d\n", (int)syscall(SYS_gettid), index);
+-      fflush(fout);
++      fprintf(fout, "%d socket %d\n", (int)syscall(SYS_gettid), index); fflush(fout);
+       recursive = 1;
+       ret = rsocket(domain, type, protocol);
+       recursive = 0;
+@@ -449,8 +448,7 @@ real:
+ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+       int fd;
+-      fprintf(fout, "%d bind %d\n", (int)syscall(SYS_gettid), socket);
+-      fflush(fout);
++      fprintf(fout, "%d bind %d\n", (int)syscall(SYS_gettid), socket); fflush(fout);
+       return (fd_get(socket, &fd) == fd_rsocket) ?
+               rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
+ }
+@@ -1074,7 +1072,7 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
+ 
+ int __fxstat64(int ver, int socket, struct stat64 *buf)
+ {
+-//    int fd, ret;
++      int fd, ret;
+ 
+       init_preload();
+       fprintf(fout, "%s\n", __func__); fflush(fout);