refresh

diff --git a/meta b/meta
index 81d184fcef5b0f11bda07d73f320c23dbef557f6..efe18c51a60e6dd0936415251b8b060a0e40490e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 2cec4f1b01538bada68e8114033431026cbb2eb6
-Head: fc46c2c6eb654faf8bc182c43b55bd6c2853cf5d
+Previous: c8b9c28cacfacfa7d484942ebc4d0e7bb1ad8dff
+Head: b9c9727b9f182f147bf7f66f1d6247d11326fcf2
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fstat: a62c653906870422edef5f6388dac9f76c953e35
-  dbg-out: 9f15722f1b274cf711a59b21164dae3613e8c8ae
-  refresh-temp: fc46c2c6eb654faf8bc182c43b55bd6c2853cf5d
+  dbg-out: b9c9727b9f182f147bf7f66f1d6247d11326fcf2
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index 827d4efbd072856f09c97d19927786548da0e065..19ddd612f0b2a2d9c769ec358be424a466689101 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 6bbb92f637582964eea7a287f91549c84da9571a
-Top:    d72d18d7f4d5c7dc8876f58182979137f1ec9894
+Top:    f808773d213c6b0b6ecbaff3f68d99d199d218b8
 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..83cf471 100644
+index 53f8543..fdb25ac 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,8 @@
@@ -41,7 +41,7 @@ index 53f8543..83cf471 100644
        if (index < 0)
                return index;
  
-+      fprintf(fout, "%d socket - %d\n", syscall(SYS_gettid), index);
++      fprintf(fout, "%d socket %d\n", syscall(SYS_gettid), index);
 +      fflush(fout);
        recursive = 1;
        ret = rsocket(domain, type, protocol);
@@ -50,31 +50,50 @@ index 53f8543..83cf471 100644
                        fd_store(index, ret, fd_rsocket);
                        set_rsocket_options(ret);
                }
-+              fprintf(fout, "%d socket - %d fd %d type %d\n",
++              fprintf(fout, "%d socket %d real fd %d type %d\n",
 +                              syscall(SYS_gettid), index, ret, fd_gett(index));
 +              fflush(fout);
                return index;
        }
        fd_close(index, &ret);
-@@ -432,6 +442,8 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -415,6 +425,8 @@ real:
+ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+       int fd;
++      fprintf(fout, "%d bind %d\n", syscall(SYS_gettid), socket);
++      fflush(fout);
+       return (fd_get(socket, &fd) == fd_rsocket) ?
+               rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
+ }
+@@ -422,6 +434,8 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ int listen(int socket, int backlog)
+ {
+       int fd;
++      fprintf(fout, "%d listen %d\n", syscall(SYS_gettid), socket);
++      fflush(fout);
+       return (fd_get(socket, &fd) == fd_rsocket) ?
+               rlisten(fd, backlog) : real.listen(fd, backlog);
+ }
+@@ -432,6 +446,8 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        enum fd_type type;
  
        type = fd_get(socket, &fd);
-+      fprintf(fout, "%d accept fd %d\n", syscall(SYS_gettid), socket);
++      fprintf(fout, "%d accept %d\n", syscall(SYS_gettid), socket);
 +      fflush(fout);
        if (type == fd_rsocket || type == fd_fork) {
                index = fd_open();
                if (index < 0)
-@@ -444,6 +456,8 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -444,6 +460,9 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
                        return ret;
                }
  
-+              fprintf(fout, "%d accept fd %d new fd %d\n", syscall(SYS_gettid), socket, index);
++              fprintf(fout, "%d accept %d new fd %d new real fd %d\n",
++                      syscall(SYS_gettid), socket, index, ret);
 +              fflush(fout);
                fd_store(index, ret, type);
                return index;
        } else {
-@@ -465,6 +479,8 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
+@@ -465,6 +484,8 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
        long flags;
  
        fd = fd_getd(socket);
@@ -83,20 +102,20 @@ index 53f8543..83cf471 100644
        flags = real.fcntl(fd, F_GETFL);
        real.fcntl(fd, F_SETFL, 0);
        ret = real.connect(fd, addr, addrlen);
-@@ -495,6 +511,8 @@ static void fork_passive(int socket)
+@@ -495,6 +516,8 @@ static void fork_passive(int socket)
        uint32_t msg;
  
        fd_get(socket, &sfd);
-+      fprintf(fout, "%d fork_passive - %d fd %d\n", syscall(SYS_gettid), socket, sfd);
++      fprintf(fout, "%d fork_passive %d real fd %d\n", syscall(SYS_gettid), socket, sfd);
 +      fflush(fout);
  
        len = sizeof sin6;
        ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
-@@ -527,11 +545,17 @@ static void fork_passive(int socket)
+@@ -527,11 +550,17 @@ static void fork_passive(int socket)
        ret = rlisten(lfd, 1);
        if (ret)
                goto lclose;
-+      fprintf(fout, "%d fork_passive - %d listening for fork\n", syscall(SYS_gettid), socket);
++      fprintf(fout, "%d fork_passive %d, listening for fork\n", syscall(SYS_gettid), socket);
 +      fflush(fout);
  
        msg = 0;
@@ -110,24 +129,54 @@ index 53f8543..83cf471 100644
  
        dfd = raccept(lfd, NULL, NULL);
        if (dfd < 0) {
-@@ -547,6 +571,8 @@ static void fork_passive(int socket)
+@@ -547,6 +576,9 @@ static void fork_passive(int socket)
        real.shutdown(sfd, SHUT_RDWR);
        real.close(sfd);
        fd_store(socket, dfd, fd_rsocket);
-+      fprintf(fout, "%d fork_passive success - %d new fd %d\n", syscall(SYS_gettid), socket, dfd);
++      fprintf(fout, "%d fork_passive success %d new fd %d old fd %d\n",
++              syscall(SYS_gettid), socket, dfd, sfd);
 +      fflush(fout);
  
  lclose:
        rclose(lfd);
-@@ -924,6 +950,7 @@ int dup2(int oldfd, int newfd)
+@@ -628,6 +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));
++      fflush(fout);
+       return (fd_fork_get(socket, &fd) == fd_rsocket) ?
+               rread(fd, buf, count) : real.read(fd, buf, count);
+ }
+@@ -820,6 +854,8 @@ int close(int socket)
+       int ret;
+ 
+       init_preload();
++      fprintf(fout, "%d close %d real fd %d\n", syscall(SYS_gettid), socket, fd_getd(socket));
++      fflush(fout);
+       fdi = idm_lookup(&idm, socket);
+       if (!fdi)
+               return real.close(socket);
+@@ -924,6 +960,8 @@ int dup2(int oldfd, int newfd)
        int ret;
  
        init_preload();
 +      fprintf(fout, "%d dup2 %d -> %d\n", syscall(SYS_gettid), oldfd, newfd);
++      fflush(fout);
        oldfdi = idm_lookup(&idm, oldfd);
        if (oldfdi && oldfdi->type == fd_fork)
                fork_passive(oldfd);
-@@ -968,12 +995,18 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+@@ -961,6 +999,9 @@ int dup2(int oldfd, int newfd)
+       atomic_init(&newfdi->refcnt);
+       atomic_set(&newfdi->refcnt, 1);
+       atomic_inc(&oldfdi->refcnt);
++      fprintf(fout, "%d dup2 %d -> %d, real fd %d type %d\n",
++              syscall(SYS_gettid), oldfd, newfd, newfdi->fd, newfdi->type);
++      fflush(fout);
+       return newfd;
+ }
+ 
+@@ -968,12 +1009,18 @@ 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 49c2acf..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,131 +0,0 @@
-Bottom: d72d18d7f4d5c7dc8876f58182979137f1ec9894
-Top:    f808773d213c6b0b6ecbaff3f68d99d199d218b8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 22:09:47 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 83cf471..fdb25ac 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -396,7 +396,7 @@ int socket(int domain, int type, int protocol)
-       if (index < 0)
-               return index;
- 
--      fprintf(fout, "%d socket - %d\n", syscall(SYS_gettid), index);
-+      fprintf(fout, "%d socket %d\n", syscall(SYS_gettid), index);
-       fflush(fout);
-       recursive = 1;
-       ret = rsocket(domain, type, protocol);
-@@ -412,7 +412,7 @@ int socket(int domain, int type, int protocol)
-                       fd_store(index, ret, fd_rsocket);
-                       set_rsocket_options(ret);
-               }
--              fprintf(fout, "%d socket - %d fd %d type %d\n",
-+              fprintf(fout, "%d socket %d real fd %d type %d\n",
-                               syscall(SYS_gettid), index, ret, fd_gett(index));
-               fflush(fout);
-               return index;
-@@ -425,6 +425,8 @@ real:
- int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
- {
-       int fd;
-+      fprintf(fout, "%d bind %d\n", syscall(SYS_gettid), socket);
-+      fflush(fout);
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
- }
-@@ -432,6 +434,8 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
- int listen(int socket, int backlog)
- {
-       int fd;
-+      fprintf(fout, "%d listen %d\n", syscall(SYS_gettid), socket);
-+      fflush(fout);
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rlisten(fd, backlog) : real.listen(fd, backlog);
- }
-@@ -442,7 +446,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-       enum fd_type type;
- 
-       type = fd_get(socket, &fd);
--      fprintf(fout, "%d accept fd %d\n", syscall(SYS_gettid), socket);
-+      fprintf(fout, "%d accept %d\n", syscall(SYS_gettid), socket);
-       fflush(fout);
-       if (type == fd_rsocket || type == fd_fork) {
-               index = fd_open();
-@@ -456,7 +460,8 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-                       return ret;
-               }
- 
--              fprintf(fout, "%d accept fd %d new fd %d\n", syscall(SYS_gettid), socket, index);
-+              fprintf(fout, "%d accept %d new fd %d new real fd %d\n",
-+                      syscall(SYS_gettid), socket, index, ret);
-               fflush(fout);
-               fd_store(index, ret, type);
-               return index;
-@@ -511,7 +516,7 @@ static void fork_passive(int socket)
-       uint32_t msg;
- 
-       fd_get(socket, &sfd);
--      fprintf(fout, "%d fork_passive - %d fd %d\n", syscall(SYS_gettid), socket, sfd);
-+      fprintf(fout, "%d fork_passive %d real fd %d\n", syscall(SYS_gettid), socket, sfd);
-       fflush(fout);
- 
-       len = sizeof sin6;
-@@ -545,7 +550,7 @@ static void fork_passive(int socket)
-       ret = rlisten(lfd, 1);
-       if (ret)
-               goto lclose;
--      fprintf(fout, "%d fork_passive - %d listening for fork\n", syscall(SYS_gettid), socket);
-+      fprintf(fout, "%d fork_passive %d, listening for fork\n", syscall(SYS_gettid), socket);
-       fflush(fout);
- 
-       msg = 0;
-@@ -571,7 +576,8 @@ static void fork_passive(int socket)
-       real.shutdown(sfd, SHUT_RDWR);
-       real.close(sfd);
-       fd_store(socket, dfd, fd_rsocket);
--      fprintf(fout, "%d fork_passive success - %d new fd %d\n", syscall(SYS_gettid), socket, dfd);
-+      fprintf(fout, "%d fork_passive success %d new fd %d old fd %d\n",
-+              syscall(SYS_gettid), socket, dfd, sfd);
-       fflush(fout);
- 
- lclose:
-@@ -654,6 +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));
-+      fflush(fout);
-       return (fd_fork_get(socket, &fd) == fd_rsocket) ?
-               rread(fd, buf, count) : real.read(fd, buf, count);
- }
-@@ -846,6 +854,8 @@ int close(int socket)
-       int ret;
- 
-       init_preload();
-+      fprintf(fout, "%d close %d real fd %d\n", syscall(SYS_gettid), socket, fd_getd(socket));
-+      fflush(fout);
-       fdi = idm_lookup(&idm, socket);
-       if (!fdi)
-               return real.close(socket);
-@@ -951,6 +961,7 @@ int dup2(int oldfd, int newfd)
- 
-       init_preload();
-       fprintf(fout, "%d dup2 %d -> %d\n", syscall(SYS_gettid), oldfd, newfd);
-+      fflush(fout);
-       oldfdi = idm_lookup(&idm, oldfd);
-       if (oldfdi && oldfdi->type == fd_fork)
-               fork_passive(oldfd);
-@@ -988,6 +999,9 @@ int dup2(int oldfd, int newfd)
-       atomic_init(&newfdi->refcnt);
-       atomic_set(&newfdi->refcnt, 1);
-       atomic_inc(&oldfdi->refcnt);
-+      fprintf(fout, "%d dup2 %d -> %d, real fd %d type %d\n",
-+              syscall(SYS_gettid), oldfd, newfd, newfdi->fd, newfdi->type);
-+      fflush(fout);
-       return newfd;
- }