refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..e050c8d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,54 @@
+Bottom: 5623cf863fc9cc2ced3b180c705ed739b95978f8
+Top:    ed2f9afb0d122614fb6b76d78e385a49be99b24f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-08 10:27:51 -0700
+
+Refresh of dbg-out
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 458362d..939325a 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -660,7 +660,8 @@ ssize_t read(int socket, void *buf, size_t count)
+ {
+       int fd;
+       init_preload();
+-      fprintf(fout, "%d read %d read fd %d\n", syscall(SYS_gettid), socket, fd_getd(socket));
++      fprintf(fout, "%d read %d real fd %d type %d\n",
++              syscall(SYS_gettid), socket, fd_getd(socket), fd_gett(socket));
+       fflush(fout);
+       return (fd_fork_get(socket, &fd) == fd_rsocket) ?
+               rread(fd, buf, count) : real.read(fd, buf, count);
+@@ -854,20 +855,29 @@ int close(int socket)
+       int ret;
+ 
+       init_preload();
+-      fprintf(fout, "%d close %d real fd %d\n", syscall(SYS_gettid), socket, fd_getd(socket));
++      fprintf(fout, "%d close %d real fd %d type %d\n",
++              syscall(SYS_gettid), socket, fd_getd(socket), fd_gett(socket));
+       fflush(fout);
+       fdi = idm_lookup(&idm, socket);
+       if (!fdi)
+               return real.close(socket);
+ 
+       if (fdi->dupfd != -1) {
++              fprintf(fout, "%d closing dupfd %d\n",
++                      syscall(SYS_gettid), fdi->dupfd);
++              fflush(fout);
+               ret = close(fdi->dupfd);
+               if (ret)
+                       return ret;
+       }
+ 
+       if (atomic_dec(&fdi->refcnt))
++      {
++              fprintf(fout, "%d close - still have ref %d\n",
++                      syscall(SYS_gettid), atomic_get(&fdi->refcnt));
++              fflush(fout);
+               return 0;
++      }
+ 
+       idm_clear(&idm, socket);
+       real.close(socket);