-Bottom: a625ed79a630be511a10aa72ac56ee50cd156f44
-Top: 4f509e4d5734c0779509a899a2a333341d675ac7
+Bottom: b24f77c1e42563bf836b89a48ab6228495436490
+Top: b24f77c1e42563bf836b89a48ab6228495436490
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-07-18 09:01:43 -0700
---
-diff --git a/src/preload.c b/src/preload.c
-index 6cc0d72..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.read(fd, &msg, sizeof msg);
-+ 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;
+