refresh (create temporary patch)

diff --git a/meta b/meta
index b8c6a33fd0b725f4a72194b2d6f12fe108f0aed5..3944c7aae8d4160c5f736a0479327ff63bc5d688 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 71bdb63f05b299b03292d540e9145de289d66ae7
-Head: 1b132fad3d5b0f0c0a4dba2176e9c0792b42e633
+Previous: 0cb978a21e0c31fa2f5052571df8e8a9f11768d6
+Head: 0d1a80f7abd746b507e657d2eaba752fc78f8fc4
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -9,6 +9,7 @@ Applied:
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
   dbg: 1b132fad3d5b0f0c0a4dba2176e9c0792b42e633
+  refresh-temp: 0d1a80f7abd746b507e657d2eaba752fc78f8fc4
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..173bbdc
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,62 @@
+Bottom: 6a80dbc9a9422453e6bcd2724cd614a7768cb5e7
+Top:    d02cc7716cf9826fa0d5cc49b028d9a4ad2c229f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-25 13:03:38 -0700
+
+Refresh of dbg
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index bc95da8..370e8bc 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -474,9 +474,12 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
+       if (ret)
+               return ret;
+ 
+-      ret = real.recv(fd, &msg, sizeof msg, MSG_PEEK);
++      do {
++              ret = real.recv(fd, &msg, sizeof msg, MSG_PEEK);
++      } while (!ret);
+       printf("connect_fork - real recv %d msg %d\n", ret, msg);
+       if ((ret != sizeof msg) || msg) {
++              printf("connect_fork - falling back to normal socket\n");
+               fd_store(socket, fd, fd_normal);
+               return 0;
+       }
+@@ -500,10 +503,12 @@ static void fork_passive(int socket)
+       socklen_t len;
+       uint32_t msg;
+ 
++      printf("fork_passive\n");
+       fd_get(socket, &sfd);
+ 
+       len = sizeof sin6;
+       ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
++      printf("fork_passive - getsockname %d (%s)\n", ret, strerror(errno));
+       if (ret)
+               goto out;
+       sin6.sin6_flowinfo = sin6.sin6_scope_id = 0;
+@@ -511,12 +516,14 @@ static void fork_passive(int socket)
+ 
+       sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR,
+                      S_IRWXU | S_IRWXG, 1);
++      printf("fork_passive - sem_open %p (%s)\n", (void *) sem, strerror(errno));
+       if (sem == SEM_FAILED) {
+               ret = -1;
+               goto out;
+       }
+ 
+       lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
++      printf("fork_passive - rsocket %d (%s)\n", lfd, strerror(errno));
+       if (lfd < 0) {
+               ret  = lfd;
+               goto sclose;
+@@ -527,6 +534,7 @@ static void fork_passive(int socket)
+ 
+       sem_wait(sem);
+       ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
++      printf("fork_passive - rbind %d (%s)\n", ret, strerror(errno));
+       if (ret)
+               goto lclose;