refresh (create temporary patch)

diff --git a/meta b/meta
index b1bd7150380ff666e70fb0204073863ee01e480b..d1a38e57bdaa9ffa22116be7aec428e45141a03d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: e0801e57a929bcd92d67ca92b20aded7df5d869d
-Head: a2437503c235e8aa5f5713e75b3518ab2edd9f49
+Previous: 62581a7ae4c9ef478bbf3c211c070a6e2c3b5325
+Head: 5eb2078811a75b43a0e4d8af193ce6b042c13b11
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -9,6 +9,7 @@ Applied:
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
   dbg: a2437503c235e8aa5f5713e75b3518ab2edd9f49
+  refresh-temp: 5eb2078811a75b43a0e4d8af193ce6b042c13b11
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..7008940
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,61 @@
+Bottom: 3b5b8e1557fedc1a739d19b10a2301d6d2461fe4
+Top:    8754908f54691ebf8eb338a5cf23c230a90d34d4
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-25 12:01:34 -0700
+
+Refresh of dbg
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 9b205f9..6f8e4f8 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -391,6 +391,7 @@ int socket(int domain, int type, int protocol)
+               if (fork_support) {
+                       rclose(ret);
+                       ret = real.socket(domain, type, protocol);
++                      printf("socket - fork support - real socket %d\n", ret);
+                       if (ret < 0)
+                               return ret;
+                       fd_store(index, ret, fd_fork);
+@@ -398,7 +399,7 @@ int socket(int domain, int type, int protocol)
+                       fd_store(index, ret, fd_rsocket);
+                       set_rsocket_options(ret);
+               }
+-              printf("socket - %d\n", index);
++              printf("socket - return %d\n", index);
+               return index;
+       }
+       fd_close(index, &ret);
+@@ -409,6 +410,7 @@ real:
+ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+       int fd;
++      printf("bind %d\n", socket);
+       return (fd_get(socket, &fd) == fd_rsocket) ?
+               rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
+ }
+@@ -426,6 +428,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+       int fd, index, ret;
+       enum fd_type type;
+ 
++      printf("accept %d\n", socket);
+       type = fd_get(socket, &fd);
+       if (type == fd_rsocket || type == fd_fork) {
+               index = fd_open();
+@@ -434,11 +437,14 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+ 
+               ret = (type == fd_rsocket) ? raccept(fd, addr, addrlen) :
+                                            real.accept(fd, addr, addrlen);
++              printf("accept %d, new index %d new socket %d err %s\n",
++                      socket, index, ret, strerr(errno));
+               if (ret < 0) {
+                       fd_close(index, &fd);
+                       return ret;
+               }
+ 
++              printf("accept %d, new index %d new socket %d\n", socket, index, ret);
+               fd_store(index, ret, type);
+               return index;
+       } else {