refresh (create temporary patch)

diff --git a/meta b/meta
index 8b3ebb6d2c75837c8ad97c7d03c3cf7916c239d5..eee71c81deed2550960c0c327a777eea577e911c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: a0a95f15ccff0b76ccddcb157f535b42982cadd2
-Head: 545e25f4288f41ff5a5a58004907d2435ce598fc
+Previous: c0c18643c5b6baf8fe88b031aaa898b2468091fb
+Head: 4f8cca73b95582f6cee927228d80be1d9eec205f
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: c3882ddaea14673b5b3b3322459209c02f4083bf
   rstream-fork: ecd866920791883b70e9ed0f963bda63336664bc
   dbg: 545e25f4288f41ff5a5a58004907d2435ce598fc
+  refresh-temp: 4f8cca73b95582f6cee927228d80be1d9eec205f
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..d860365
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,103 @@
+Bottom: 7a6199c6bbfabb859c48c87ff027b3e8d1e4d6f1
+Top:    bf048d50734809a4f00efa630a5b8d1d2b1ac8c4
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-18 11:38:00 -0700
+
+Refresh of dbg
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index a1073d5..c38935a 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -48,6 +48,7 @@
+ #include <netinet/tcp.h>
+ #include <unistd.h>
+ #include <semaphore.h>
++#include <stdio.h>
+ 
+ #include <rdma/rdma_cma.h>
+ #include <rdma/rdma_verbs.h>
+@@ -467,14 +468,17 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+       uint32_t msg;
+       long flags;
+ 
++      printf("connect_fork\n");
+       fd = fd_getd(socket);
+       flags = real.fcntl(fd, F_GETFD);
+       real.fcntl(fd, F_SETFD, 0);
+       ret = real.connect(fd, addr, addrlen);
++      printf("connect_fork - real connect %d %s\n", ret, strerror(errno));
+       if (ret)
+               return ret;
+ 
+       ret = real.recv(fd, &msg, sizeof msg, MSG_PEEK);
++      printf("connect_fork - real recv %d msg %d\n", ret, msg);
+       if ((ret != sizeof msg) || msg) {
+               fd_store(socket, fd, fd_normal);
+               return 0;
+@@ -482,6 +486,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+ 
+       real.fcntl(fd, F_SETFD, flags);
+       ret = transpose_socket(socket, fd_rsocket);
++      printf("connect_fork - transpose socket %d\n", ret);
+       if (ret < 0)
+               return ret;
+ 
+@@ -834,11 +839,15 @@ pid_t fork(void)
+       uint32_t msg;
+ 
+       init_preload();
++      printf("fork\n");
+       pid = real.fork();
++      printf("fork - pid %d fork_support %d last_accept %d \n",
++              pid, fork_support, last_accept);
+       if (pid || !fork_support || (last_accept < 0) ||
+           (fd_get(last_accept, &sfd) != fd_fork))
+               goto out;
+ 
++      printf("fork - switching to rsocket\n");
+       len = sizeof sin6;
+       ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
+       if (ret)
+@@ -847,10 +856,13 @@ pid_t fork(void)
+       memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
+ 
+       sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR, S_IRWXU, 1);
++      sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
++      printf("fork - sem_open\n");
+       if (sem == SEM_FAILED)
+               goto out;
+ 
+       lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
++      printf("fork - rsocket %d\n", lfd);
+       if (lfd < 0)
+               goto sclose;
+ 
+@@ -859,14 +871,17 @@ pid_t fork(void)
+ 
+       sem_wait(sem);
+       ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
++      printf("fork - rbind %d\n", ret);
+       if (ret)
+               goto lclose;
+ 
+       ret = rlisten(lfd, 1);
++      printf("fork - rlisten %d\n", ret);
+       if (ret)
+               goto lclose;
+ 
+       dfd = raccept(lfd, NULL, NULL);
++      printf("fork - raccept %d\n", dfd);
+       if (dfd < 0)
+               goto lclose;
+ 
+@@ -876,6 +891,7 @@ pid_t fork(void)
+ 
+       msg = 0;
+       ret = real.write(sfd, &msg, sizeof msg);
++      printf("fork - real write %d\n", ret);
+       if (ret != sizeof msg) {
+               rclose(dfd);
+               goto lclose;