refresh

diff --git a/meta b/meta
index b4a311249cfab56ae24e9f6427ef4efce38c076c..417fad7c4bc5c08163151c45fe4758fe4af8c770 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 7a687054636c0b875851ff8e3899e1ef27d4060f
-Head: 3efec2d9db59d05d50239e6fba2c8513609348de
+Previous: 2ab819739712013fa391ca6a3ab3ec2f400b2bbe
+Head: 2f89395cc8839513ea88c311a5c6943f8f0783da
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fstat: a62c653906870422edef5f6388dac9f76c953e35
-  dbg-out: a9ad17b0370bead1675c4f3b015304063f716f18
-  refresh-temp: 3efec2d9db59d05d50239e6fba2c8513609348de
+  dbg-out: 2f89395cc8839513ea88c311a5c6943f8f0783da
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index 3120b27371cef3d8ed8128e8a361f20cdf7510d0..c462c398fa87fb9f222fa52040cee215573ec40e 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 6bbb92f637582964eea7a287f91549c84da9571a
-Top:    fa1eec5fa4fe4b1b52f28c77f055b6791b5b8ab6
+Top:    0449301a511d37b585d312ac34d727ba2987e824
 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..27e244e 100644
+index 53f8543..2165147 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,8 @@
@@ -139,7 +139,16 @@ index 53f8543..27e244e 100644
  
  lclose:
        rclose(lfd);
-@@ -628,6 +660,9 @@ ssize_t read(int socket, void *buf, size_t count)
+@@ -579,6 +611,8 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+       int fd, ret;
+ 
++      fprintf(fout, "%d connect %d\n", (int)syscall(SYS_gettid), socket);
++      fflush(fout);
+       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();
@@ -149,7 +158,7 @@ index 53f8543..27e244e 100644
        return (fd_fork_get(socket, &fd) == fd_rsocket) ?
                rread(fd, buf, count) : real.read(fd, buf, count);
  }
-@@ -820,18 +855,29 @@ int close(int socket)
+@@ -820,18 +857,29 @@ int close(int socket)
        int ret;
  
        init_preload();
@@ -179,7 +188,7 @@ index 53f8543..27e244e 100644
  
        idm_clear(&idm, socket);
        real.close(socket);
-@@ -924,6 +970,8 @@ int dup2(int oldfd, int newfd)
+@@ -924,6 +972,8 @@ int dup2(int oldfd, int newfd)
        int ret;
  
        init_preload();
@@ -188,7 +197,7 @@ index 53f8543..27e244e 100644
        oldfdi = idm_lookup(&idm, oldfd);
        if (oldfdi && oldfdi->type == fd_fork)
                fork_passive(oldfd);
-@@ -961,6 +1009,9 @@ int dup2(int oldfd, int newfd)
+@@ -961,6 +1011,9 @@ int dup2(int oldfd, int newfd)
        atomic_init(&newfdi->refcnt);
        atomic_set(&newfdi->refcnt, 1);
        atomic_inc(&oldfdi->refcnt);
@@ -198,7 +207,7 @@ index 53f8543..27e244e 100644
        return newfd;
  }
  
-@@ -968,12 +1019,19 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+@@ -968,12 +1021,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 00f60de..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: fa1eec5fa4fe4b1b52f28c77f055b6791b5b8ab6
-Top:    0449301a511d37b585d312ac34d727ba2987e824
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-08 14:08:27 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 27e244e..2165147 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -611,6 +611,8 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
- {
-       int fd, ret;
- 
-+      fprintf(fout, "%d connect %d\n", (int)syscall(SYS_gettid), socket);
-+      fflush(fout);
-       switch (fd_get(socket, &fd)) {
-       case fd_fork:
-               return fork_active(socket, addr, addrlen);