From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 18 Jul 2012 18:30:27 +0000 (-0700)
Subject: pop (CONFLICT)
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d5be8ba0d133f815fe601cc57548ba253d2268c6;p=~shefty%2Flibrdmacm.git

pop (CONFLICT)
---

diff --git a/meta b/meta
index 8db4364c..3cbb4592 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: a63a84d774be23669c899a9dcdd37332d274f84f
+Previous: 762b77aa3ea50e15c9152e28654c0d2534405e1b
 Head: ffb902360538c837025b000dfbffc19e9ae508d0
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: d5c12aeec51e502abb9e152e2722a7ecfc0c0909
   rstream-fork: 139ce2d00d35db46877d3460c1efd6fb8d23a0c3
+  dbg: ffb902360538c837025b000dfbffc19e9ae508d0
 Unapplied:
-  dbg: 93074ae941ec0afc77c41b9840058dd4a128b262
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:
diff --git a/patches/dbg b/patches/dbg
index bd378823..ab0f3ce0 100644
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
-Bottom: db6f379646ca0fae747ef5cd04b50c3952350431
-Top:    f01035aaf2318888602d8db4ba44878cf14d21ca
+Bottom: 2a72a2033c31744303e1d0a6d6948a14916e2250
+Top:    2a72a2033c31744303e1d0a6d6948a14916e2250
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -8,93 +8,4 @@ debug fork
 
 ---
 
-diff --git a/src/preload.c b/src/preload.c
-index 7be40f6..576d7dd 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>
-@@ -466,18 +467,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 %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;
- 	}
- 
- 	ret = transpose_socket(socket, fd_rsocket);
-+	printf("connect_fork - transpose socket %d\n", ret);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -830,11 +835,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)
-@@ -843,10 +852,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;
- 
-@@ -855,14 +866,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;
- 
-@@ -872,6 +886,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;
+