refresh (create temporary patch)

diff --git a/meta b/meta
index e1eea2e78cc8f35bae5681f98ef9cdbea18f7f6f..bbac16422612631d34338d253933227ca8e26d95 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6bc825880c0a15af0df92d0549dcabb5f9f813c1
-Head: 0687e42f87b1129e584afae0e28b5a9c15f75510
+Previous: 34c3143c60e4cb021d022787a1126629b51005f6
+Head: 8e6928dc1c8dc4b60c9eac7da459ef6484954689
 Applied:
   rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
@@ -8,6 +8,7 @@ Applied:
   fork: 1768d762d8a2100e5250234ddf080b722a5e582f
   rstream-fork: 2724e02d5b461f8c580249461271de0f7acefcab
   dbg: 0687e42f87b1129e584afae0e28b5a9c15f75510
+  refresh-temp: 8e6928dc1c8dc4b60c9eac7da459ef6484954689
 Unapplied:
   fork-xfer: c1e7aba9bea4bc2830c2a92a5c9f4873e87b346b
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..05679d4
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,53 @@
+Bottom: fc0d4fef187ee5bca74ac50c3bb7806917a0a428
+Top:    666a13482ed38495f414616597d974158f974a48
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-19 17:35:33 -0700
+
+Refresh of dbg
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 47e1e64..983ffe1 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -386,6 +386,7 @@ int socket(int domain, int type, int protocol)
+       if (index < 0)
+               return index;
+ 
++      printf("socket\n");
+       recursive = 1;
+       ret = rsocket(domain, type, protocol);
+       recursive = 0;
+@@ -400,6 +401,7 @@ int socket(int domain, int type, int protocol)
+                       fd_store(index, ret, fd_rsocket);
+                       set_rsocket_options(ret);
+               }
++              printf("socket - %d\n", index);
+               return index;
+       }
+       fd_close(index, &ret);
+@@ -431,6 +433,7 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ int listen(int socket, int backlog)
+ {
+       int fd;
++      printf("listen %d\n", socket);
+       return (fd_get(socket, &fd) == fd_rsocket) ?
+               rlisten(fd, backlog) : real.listen(fd, backlog);
+ }
+@@ -455,6 +458,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+ 
+               fd_store(index, ret, type);
+               last_accept = (type == fd_fork) ? index : -1;
++              printf("accept %d\n", socket);
+               return index;
+       } else {
+               last_accept = -1;
+@@ -500,6 +504,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+       struct sockaddr_in *sin;
+       int fd, ret;
+ 
++      printf("conect %d\n", socket);
+       switch (fd_get(socket, &fd)) {
+       case fd_fork:
+               return connect_fork(socket, addr, addrlen);