From 5f242d355bb60ff40fc31f033311813778ae08cb Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 18 Jul 2012 11:31:15 -0700 Subject: [PATCH] pop (CONFLICT) --- meta | 4 +-- patches/dbg | 100 ++-------------------------------------------------- 2 files changed, 5 insertions(+), 99 deletions(-) diff --git a/meta b/meta index d2e6a0c5..143130d9 100644 --- a/meta +++ b/meta @@ -1,12 +1,12 @@ Version: 1 -Previous: 537839d91f4b58f9376069488a138fe2c264890b +Previous: 3fcc4b42640eac513d94e9590ae90302daca443e Head: 04d0358064d7455f92e2f6036e4596adca94f379 Applied: transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6 fork: f9fddc8f75f50d70032e9a084aad0421cc7886a1 rstream-fork: 1dc5b7e931e62c81846d0ce7cbfdffc7c3993c65 + dbg: 04d0358064d7455f92e2f6036e4596adca94f379 Unapplied: - dbg: d926df55f527306232be7787a15034b44d84f740 waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de Hidden: diff --git a/patches/dbg b/patches/dbg index 98c1540d..c8f24af7 100644 --- a/patches/dbg +++ b/patches/dbg @@ -1,5 +1,5 @@ -Bottom: 2a72a2033c31744303e1d0a6d6948a14916e2250 -Top: 70805cfad1b485e7eb4797899387fd49dc07653c +Bottom: 96ab09f7aba32ca2e184a5f3b2d856bc4e9111f6 +Top: 96ab09f7aba32ca2e184a5f3b2d856bc4e9111f6 Author: Sean Hefty Date: 2012-07-18 09:01:43 -0700 @@ -8,98 +8,4 @@ debug fork --- -diff --git a/src/preload.c b/src/preload.c -index 56c6c7d..8f2d67b 100644 ---- a/src/preload.c -+++ b/src/preload.c -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -467,15 +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); -- if (ret) { -+ 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; -@@ -483,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; - -@@ -835,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) -@@ -848,10 +856,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\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; - -@@ -860,14 +870,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; - -@@ -877,6 +890,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