refresh

diff --git a/meta b/meta
index 4743982e660fc9d3bab16e721e3ce4fc34ca3e21..25929f501ccd57c5b1f828f294c73231e02f466a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: b5115c5544e31ddf0d0029d6765264b92e4ffd11
-Head: 11b765be0e4880b3812cf6bbdf22a5fcfa638346
+Previous: c0e649b6b5274dd74115f1082978a249909e339c
+Head: 919b733e9d28f823ad85a8a894de837748297a9c
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 3deb6392dbcb0b29fb4c96f6a7c73c5e3fca3ee1
   rstream-fork: b0aa1c3fe795a4187d6675bdc0f27ea18f733f20
-  dbg: 3297aef1cb616572b1a08b20cf2db21be460165f
-  refresh-temp: 11b765be0e4880b3812cf6bbdf22a5fcfa638346
+  dbg: 919b733e9d28f823ad85a8a894de837748297a9c
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 955755193914ca60362b47bbf36f0b6fb2904361..9fa914a08cf84019636bb226eb26c1345d3ff74f 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: b24f77c1e42563bf836b89a48ab6228495436490
-Top:    b24f77c1e42563bf836b89a48ab6228495436490
+Top:    4f509e4d5734c0779509a899a2a333341d675ac7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -8,4 +8,84 @@ debug fork
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index e901d13..9d217e9 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -463,18 +463,22 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+       int fd, ret;
+       uint32_t msg;
+ 
++      printf("connect_fork\n");
+       fd = fd_getd(socket);
+       ret = real.connect(fd, addr, addrlen);
++      printf("connect_fork - real connect %d\n", ret);
+       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;
+       }
+ 
+       ret = transpose_socket(socket, fd_rsocket);
++      printf("connect_fork - transpose socket %d\n", ret);
+       if (ret < 0)
+               return ret;
+ 
+@@ -827,11 +831,14 @@ pid_t fork(void)
+       uint32_t msg;
+ 
+       init_preload();
++      printf("fork\n");
+       pid = real.fork();
++      printf("fork - pid %d\n", pid);
+       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)
+@@ -840,10 +847,12 @@ pid_t fork(void)
+       memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
+ 
+       sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
++      printf("fork - sem_open %d\n", sem);
+       if (sem == SEM_FAILED)
+               goto out;
+ 
+       lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
++      printf("fork - rsocket %d\n", ldf);
+       if (lfd < 0)
+               goto sclose;
+ 
+@@ -852,14 +861,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;
+ 
+@@ -869,6 +881,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;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e2220e2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,90 +0,0 @@
-Bottom: b24f77c1e42563bf836b89a48ab6228495436490
-Top:    4f509e4d5734c0779509a899a2a333341d675ac7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 09:09:53 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index e901d13..9d217e9 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -463,18 +463,22 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
-       int fd, ret;
-       uint32_t msg;
- 
-+      printf("connect_fork\n");
-       fd = fd_getd(socket);
-       ret = real.connect(fd, addr, addrlen);
-+      printf("connect_fork - real connect %d\n", ret);
-       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;
-       }
- 
-       ret = transpose_socket(socket, fd_rsocket);
-+      printf("connect_fork - transpose socket %d\n", ret);
-       if (ret < 0)
-               return ret;
- 
-@@ -827,11 +831,14 @@ pid_t fork(void)
-       uint32_t msg;
- 
-       init_preload();
-+      printf("fork\n");
-       pid = real.fork();
-+      printf("fork - pid %d\n", pid);
-       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)
-@@ -840,10 +847,12 @@ pid_t fork(void)
-       memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
- 
-       sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
-+      printf("fork - sem_open %d\n", sem);
-       if (sem == SEM_FAILED)
-               goto out;
- 
-       lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
-+      printf("fork - rsocket %d\n", ldf);
-       if (lfd < 0)
-               goto sclose;
- 
-@@ -852,14 +861,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;
- 
-@@ -869,6 +881,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;