refresh (create temporary patch)

diff --git a/meta b/meta
index 8e3a429a8431b4ecdfdc1fdb750559c02e925ebf..d2852835856a8c29684c0eae8f624faf8e035580 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 07e10b4a5cb0073a9944f1eb0730b87310c01db0
-Head: 9079801a64f2313e2d48a27b87b285d7a267a56a
+Previous: 1bc07a06e62d9068fcd68eb43d7515f7c24822d6
+Head: 26ee20a544a5170ca1055443d3a80c84a7bc1633
 Applied:
   dbg-fork: 9079801a64f2313e2d48a27b87b285d7a267a56a
+  refresh-temp: 26ee20a544a5170ca1055443d3a80c84a7bc1633
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..5c5e481
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,55 @@
+Bottom: 296e6cd8f1f1213e16e0d247ff92a700dc79ef41
+Top:    3ff660268308f81ffa10068086e46e1eb0d84b77
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-22 15:30:51 -0700
+
+Refresh of dbg-fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index b5a67cb..fba0281 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -511,13 +511,16 @@ static void fork_active(int socket)
+ 
+       flags = real.fcntl(sfd, F_GETFL);
+       real.fcntl(sfd, F_SETFL, 0);
++      printf("fork_active - recv\n");
+       ret = real.recv(sfd, &msg, sizeof msg, MSG_PEEK);
++      printf("fork_active - recv %d\n", ret);
+       real.fcntl(sfd, F_SETFL, flags);
+       if ((ret != sizeof msg) || msg)
+               goto err1;
+ 
+       len = sizeof addr;
+       ret = real.getpeername(sfd, (struct sockaddr *) &addr, &len);
++      printf("fork_active - getpeername %d\n", ret);
+       if (ret)
+               goto err1;
+ 
+@@ -587,20 +590,24 @@ static void fork_passive(int socket)
+ 
+       sem_wait(sem);
+       ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
++      printf("fork_passive bind %d\n", ret);
+       if (ret)
+               goto lclose;
+ 
+       ret = rlisten(lfd, 1);
++      printf("fork_passive listen %d\n", ret);
+       if (ret)
+               goto lclose;
+ 
+       msg = 0;
+       len = real.write(sfd, &msg, sizeof msg);
++      printf("fork_passive write %d\n", len);
+       if (len != sizeof msg)
+               goto lclose;
+       printf("fork_passive - raccept\n");
+ 
+       dfd = raccept(lfd, NULL, NULL);
++      printf("fork_passive accept %d\n", dfd);
+       if (dfd < 0) {
+               ret  = dfd;
+               goto lclose;