refresh (create temporary patch)

diff --git a/meta b/meta
index 41a4abd83bf48b3dead1a75d88edae270acc71d1..2b077d90b5875f9ad639cc8d53dd18cbd20867d7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 11031aae95b8cde22b44d49d93c6f223b674e5a8
-Head: f7f2fc66d5cda4b70df376995a22b3ed4c4ac0de
+Previous: 6fb1cbe068f1c268ca48af101dcc7d62d56d757f
+Head: 6c0411cd98702699f66edf9d83eb0c8f127887f3
 Applied:
   dbg-fork: f7f2fc66d5cda4b70df376995a22b3ed4c4ac0de
+  refresh-temp: 6c0411cd98702699f66edf9d83eb0c8f127887f3
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..d02fe46
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,74 @@
+Bottom: d21d7a185654b30280c213c38688f30ca0fabe87
+Top:    296e6cd8f1f1213e16e0d247ff92a700dc79ef41
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-22 15:03:29 -0700
+
+Refresh of dbg-fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 8889410..b5a67cb 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -34,6 +34,7 @@
+ #if HAVE_CONFIG_H
+ #  include <config.h>
+ #endif /* HAVE_CONFIG_H */
++#include <stdio.h>
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -413,6 +414,7 @@ int socket(int domain, int type, int protocol)
+               return index;
+ 
+       recursive = 1;
++printf("skipping rsocket call\n");
+ goto realsock;
+       ret = rsocket(domain, type, protocol);
+       recursive = 0;
+@@ -504,6 +506,7 @@ static void fork_active(int socket)
+       uint32_t msg;
+       long flags;
+ 
++      printf("fork_active\n");
+       sfd = fd_getd(socket);
+ 
+       flags = real.fcntl(sfd, F_GETFL);
+@@ -518,10 +521,12 @@ static void fork_active(int socket)
+       if (ret)
+               goto err1;
+ 
++      printf("fork_active - create rsocket\n");
+       dfd = rsocket(addr.ss_family, SOCK_STREAM, 0);
+       if (dfd < 0)
+               goto err1;
+ 
++      printf("fork_active - rconnect\n");
+       ret = rconnect(dfd, (struct sockaddr *) &addr, len);
+       if (ret)
+               goto err2;
+@@ -553,6 +558,7 @@ static void fork_passive(int socket)
+       socklen_t len;
+       uint32_t msg;
+ 
++      printf("fork_passive\n");
+       sfd = fd_getd(socket);
+ 
+       len = sizeof sin6;
+@@ -568,6 +574,7 @@ static void fork_passive(int socket)
+               ret = -1;
+               goto out;
+       }
++      printf("fork_passive - create rsocket\n");
+ 
+       lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
+       if (lfd < 0) {
+@@ -591,6 +598,7 @@ static void fork_passive(int socket)
+       len = real.write(sfd, &msg, sizeof msg);
+       if (len != sizeof msg)
+               goto lclose;
++      printf("fork_passive - raccept\n");
+ 
+       dfd = raccept(lfd, NULL, NULL);
+       if (dfd < 0) {