From b7a4dca66758b61293be0dcabbcbeec05e4e2615 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 18 Jul 2012 09:09:33 -0700 Subject: [PATCH] pop (CONFLICT) --- meta | 4 +-- patches/dbg | 87 ++--------------------------------------------------- 2 files changed, 5 insertions(+), 86 deletions(-) diff --git a/meta b/meta index e0778855..5d672099 100644 --- a/meta +++ b/meta @@ -1,12 +1,12 @@ Version: 1 -Previous: eee98f1d5103993d156be8e2f5379ececd93211d +Previous: 9d45397300203e65219323efb7ac6cdf28ecd4b8 Head: 3297aef1cb616572b1a08b20cf2db21be460165f Applied: transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6 fork: 3deb6392dbcb0b29fb4c96f6a7c73c5e3fca3ee1 rstream-fork: b0aa1c3fe795a4187d6675bdc0f27ea18f733f20 + dbg: 3297aef1cb616572b1a08b20cf2db21be460165f Unapplied: - dbg: a0d321cdff2a8176172650619686e0e6e0d41b61 waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de Hidden: diff --git a/patches/dbg b/patches/dbg index 72ba194f..95575519 100644 --- a/patches/dbg +++ b/patches/dbg @@ -1,5 +1,5 @@ -Bottom: a625ed79a630be511a10aa72ac56ee50cd156f44 -Top: 4f509e4d5734c0779509a899a2a333341d675ac7 +Bottom: b24f77c1e42563bf836b89a48ab6228495436490 +Top: b24f77c1e42563bf836b89a48ab6228495436490 Author: Sean Hefty Date: 2012-07-18 09:01:43 -0700 @@ -8,85 +8,4 @@ debug fork --- -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; + -- 2.46.0