refresh

diff --git a/meta b/meta
index 52de46173112dbb39a044cafa6fbd46f34a83869..38eb1c9f519b92a717286738c90987011bf82f3e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: b3cfdc91c0bceee3841a8a53f9f3a81a354b470c
-Head: a46febac036874347e122ab654e7fe84e63a18f5
+Previous: 44a7f5320244698251b7632e0dd53779bc800af5
+Head: 2bdbef2a35d662f908dd7a3bfbe1584698f66648
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fstat: a62c653906870422edef5f6388dac9f76c953e35
-  dbg-out: 2f89395cc8839513ea88c311a5c6943f8f0783da
-  refresh-temp: a46febac036874347e122ab654e7fe84e63a18f5
+  dbg-out: 2bdbef2a35d662f908dd7a3bfbe1584698f66648
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index c462c398fa87fb9f222fa52040cee215573ec40e..2b04740583a42cfef0618987d826b4deb97f0982 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 6bbb92f637582964eea7a287f91549c84da9571a
-Top:    0449301a511d37b585d312ac34d727ba2987e824
+Top:    0382bfbc76f972809dc6224e88bb2a5833ff6631
 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..2165147 100644
+index 53f8543..abe9471 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,8 @@
@@ -148,17 +148,7 @@ index 53f8543..2165147 100644
        switch (fd_get(socket, &fd)) {
        case fd_fork:
                return fork_active(socket, addr, addrlen);
-@@ -628,6 +662,9 @@ ssize_t read(int socket, void *buf, size_t count)
- {
-       int fd;
-       init_preload();
-+      fprintf(fout, "%d read %d real fd %d type %d\n",
-+              (int)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);
- }
-@@ -820,18 +857,29 @@ int close(int socket)
+@@ -820,18 +854,29 @@ int close(int socket)
        int ret;
  
        init_preload();
@@ -188,7 +178,7 @@ index 53f8543..2165147 100644
  
        idm_clear(&idm, socket);
        real.close(socket);
-@@ -924,6 +972,8 @@ int dup2(int oldfd, int newfd)
+@@ -924,6 +969,8 @@ int dup2(int oldfd, int newfd)
        int ret;
  
        init_preload();
@@ -197,7 +187,7 @@ index 53f8543..2165147 100644
        oldfdi = idm_lookup(&idm, oldfd);
        if (oldfdi && oldfdi->type == fd_fork)
                fork_passive(oldfd);
-@@ -961,6 +1011,9 @@ int dup2(int oldfd, int newfd)
+@@ -961,6 +1008,9 @@ int dup2(int oldfd, int newfd)
        atomic_init(&newfdi->refcnt);
        atomic_set(&newfdi->refcnt, 1);
        atomic_inc(&oldfdi->refcnt);
@@ -207,7 +197,7 @@ index 53f8543..2165147 100644
        return newfd;
  }
  
-@@ -968,12 +1021,19 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+@@ -968,12 +1018,19 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
  {
        int fd, ret;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index afad5dc..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 0449301a511d37b585d312ac34d727ba2987e824
-Top:    0382bfbc76f972809dc6224e88bb2a5833ff6631
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-08 14:26:51 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 2165147..abe9471 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -662,9 +662,6 @@ ssize_t read(int socket, void *buf, size_t count)
- {
-       int fd;
-       init_preload();
--      fprintf(fout, "%d read %d real fd %d type %d\n",
--              (int)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);
- }