From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 8 Aug 2012 04:25:29 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6f65a93796fccb1d7f74c7ed218e12efb7122028;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 7a122031..cf5af8b0 100644
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 8b0ce93e67dd0b3251caae11014a294054c42194
-Head: ced33bcaa011da943cfc019a6b03b37c4402f07a
+Previous: 29e07b6d509974471b3f4861ee9f9debeabc7adc
+Head: c9f07e10a9fe1ea0b237085af8b0ca143bde001b
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   fstat: 07e07a6ee41d57eb20b3b71b1d8098408fc1de03
   dbg-out: ffeea178a7bed542f8f035ac0d4884dfdea63026
-  oobinline: 85ba05d1f4426df2fbba1e84d2c073c2e88c56d2
-  refresh-temp: ced33bcaa011da943cfc019a6b03b37c4402f07a
+  oobinline: c9f07e10a9fe1ea0b237085af8b0ca143bde001b
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
diff --git a/patches/oobinline b/patches/oobinline
index 07eede36..dd9c9b3f 100644
--- a/patches/oobinline
+++ b/patches/oobinline
@@ -1,5 +1,5 @@
 Bottom: 50835e142dc27f9d7b745b34a0d7c1416c75a0b7
-Top:    50835e142dc27f9d7b745b34a0d7c1416c75a0b7
+Top:    fe2c4b1a23430f617f17d00c91c3e49a74ede2d0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 21:25:00 -0700
 
@@ -12,4 +12,108 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index 1264594..4379bfc 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -49,6 +49,7 @@
+ #include <unistd.h>
+ #include <semaphore.h>
+ #include <stdio.h>
++#include <sys/syscall.h>
+ 
+ #include <rdma/rdma_cma.h>
+ #include <rdma/rdma_verbs.h>
+@@ -395,6 +396,8 @@ int socket(int domain, int type, int protocol)
+ 	if (index < 0)
+ 		return index;
+ 
++	fprintf(fout, "%d socket - %d\n", syscall(SYS_gettid), index);
++	fflush(fout);
+ 	recursive = 1;
+ 	ret = rsocket(domain, type, protocol);
+ 	recursive = 0;
+@@ -409,6 +412,9 @@ int socket(int domain, int type, int protocol)
+ 			fd_store(index, ret, fd_rsocket);
+ 			set_rsocket_options(ret);
+ 		}
++		fprintf(fout, "%d socket - %d fd %d type %d\n",
++				syscall(SYS_gettid), index, ret, fd_gett(index));
++		fflush(fout);
+ 		return index;
+ 	}
+ 	fd_close(index, &ret);
+@@ -469,6 +475,8 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
+ 	long flags;
+ 
+ 	fd = fd_getd(socket);
++	fprintf(fout, "%d fork_active - %d fd %d\n", syscall(SYS_gettid), socket, fd);
++	fflush(fout);
+ 	flags = real.fcntl(fd, F_GETFL);
+ 	real.fcntl(fd, F_SETFL, 0);
+ 	ret = real.connect(fd, addr, addrlen);
+@@ -499,6 +507,8 @@ static void fork_passive(int socket)
+ 	uint32_t msg;
+ 
+ 	fd_get(socket, &sfd);
++	fprintf(fout, "%d fork_passive - %d fd %d\n", syscall(SYS_gettid), socket, sfd);
++	fflush(fout);
+ 
+ 	len = sizeof sin6;
+ 	ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
+@@ -531,11 +541,17 @@ static void fork_passive(int socket)
+ 	ret = rlisten(lfd, 1);
+ 	if (ret)
+ 		goto lclose;
++	fprintf(fout, "%d fork_passive - %d listening for fork\n", syscall(SYS_gettid), socket);
++	fflush(fout);
+ 
+ 	msg = 0;
+ 	len = real.write(sfd, &msg, sizeof msg);
+ 	if (len != sizeof msg)
++	{
++		fprintf(fout, "%d fork_passive - %d write failed\n", syscall(SYS_gettid), socket);
++		fflush(fout);
+ 		goto lclose;
++	}
+ 
+ 	dfd = raccept(lfd, NULL, NULL);
+ 	if (dfd < 0) {
+@@ -551,6 +567,8 @@ static void fork_passive(int socket)
+ 	real.shutdown(sfd, SHUT_RDWR);
+ 	real.close(sfd);
+ 	fd_store(socket, dfd, fd_rsocket);
++	fprintf(fout, "%d fork_passive success - %d new fd %d\n", syscall(SYS_gettid), socket, dfd);
++	fflush(fout);
+ 
+ lclose:
+ 	rclose(lfd);
+@@ -928,6 +946,7 @@ int dup2(int oldfd, int newfd)
+ 	int ret;
+ 
+ 	init_preload();
++	fprintf(fout, "%d dup2 %d -> %d\n", syscall(SYS_gettid), oldfd, newfd);
+ 	oldfdi = idm_lookup(&idm, oldfd);
+ 	if (oldfdi && oldfdi->type == fd_fork)
+ 		fork_passive(oldfd);
+@@ -973,16 +992,16 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+ 	int fd, ret;
+ 
+ 	init_preload();
+-	fprintf(fout, "fxstat64 socket %d - fd %d type %d\n",
+-		socket, fd_getd(socket), fd_gett(socket));
++	fprintf(fout, "%d fxstat64 socket %d - fd %d type %d\n",
++			syscall(SYS_gettid), socket, fd_getd(socket), fd_gett(socket));
+ 	if (fd_get(socket, &fd) == fd_rsocket) {
+ 		ret = real.fxstat64(ver, socket, buf);
+-		fprintf(fout, "fxstat64 - rsocket %d\n", ret);
++		fprintf(fout, "%d fxstat64 - rsocket %d\n", syscall(SYS_gettid), ret);
+ 		if (!ret)
+ 			buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
+ 	} else {
+ 		ret = real.fxstat64(ver, fd, buf);
+-		fprintf(fout, "fxstat64 - normal %d\n", ret);
++		fprintf(fout, "%d fxstat64 - normal %d\n", syscall(SYS_gettid), ret);
+ 	}
+ 	fflush(fout);
+ 	return ret;
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 778fd7dd..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,114 +0,0 @@
-Bottom: 50835e142dc27f9d7b745b34a0d7c1416c75a0b7
-Top:    fe2c4b1a23430f617f17d00c91c3e49a74ede2d0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 21:25:29 -0700
-
-Refresh of oobinline
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 1264594..4379bfc 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -49,6 +49,7 @@
- #include <unistd.h>
- #include <semaphore.h>
- #include <stdio.h>
-+#include <sys/syscall.h>
- 
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>
-@@ -395,6 +396,8 @@ int socket(int domain, int type, int protocol)
- 	if (index < 0)
- 		return index;
- 
-+	fprintf(fout, "%d socket - %d\n", syscall(SYS_gettid), index);
-+	fflush(fout);
- 	recursive = 1;
- 	ret = rsocket(domain, type, protocol);
- 	recursive = 0;
-@@ -409,6 +412,9 @@ int socket(int domain, int type, int protocol)
- 			fd_store(index, ret, fd_rsocket);
- 			set_rsocket_options(ret);
- 		}
-+		fprintf(fout, "%d socket - %d fd %d type %d\n",
-+				syscall(SYS_gettid), index, ret, fd_gett(index));
-+		fflush(fout);
- 		return index;
- 	}
- 	fd_close(index, &ret);
-@@ -469,6 +475,8 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
- 	long flags;
- 
- 	fd = fd_getd(socket);
-+	fprintf(fout, "%d fork_active - %d fd %d\n", syscall(SYS_gettid), socket, fd);
-+	fflush(fout);
- 	flags = real.fcntl(fd, F_GETFL);
- 	real.fcntl(fd, F_SETFL, 0);
- 	ret = real.connect(fd, addr, addrlen);
-@@ -499,6 +507,8 @@ static void fork_passive(int socket)
- 	uint32_t msg;
- 
- 	fd_get(socket, &sfd);
-+	fprintf(fout, "%d fork_passive - %d fd %d\n", syscall(SYS_gettid), socket, sfd);
-+	fflush(fout);
- 
- 	len = sizeof sin6;
- 	ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
-@@ -531,11 +541,17 @@ static void fork_passive(int socket)
- 	ret = rlisten(lfd, 1);
- 	if (ret)
- 		goto lclose;
-+	fprintf(fout, "%d fork_passive - %d listening for fork\n", syscall(SYS_gettid), socket);
-+	fflush(fout);
- 
- 	msg = 0;
- 	len = real.write(sfd, &msg, sizeof msg);
- 	if (len != sizeof msg)
-+	{
-+		fprintf(fout, "%d fork_passive - %d write failed\n", syscall(SYS_gettid), socket);
-+		fflush(fout);
- 		goto lclose;
-+	}
- 
- 	dfd = raccept(lfd, NULL, NULL);
- 	if (dfd < 0) {
-@@ -551,6 +567,8 @@ static void fork_passive(int socket)
- 	real.shutdown(sfd, SHUT_RDWR);
- 	real.close(sfd);
- 	fd_store(socket, dfd, fd_rsocket);
-+	fprintf(fout, "%d fork_passive success - %d new fd %d\n", syscall(SYS_gettid), socket, dfd);
-+	fflush(fout);
- 
- lclose:
- 	rclose(lfd);
-@@ -928,6 +946,7 @@ int dup2(int oldfd, int newfd)
- 	int ret;
- 
- 	init_preload();
-+	fprintf(fout, "%d dup2 %d -> %d\n", syscall(SYS_gettid), oldfd, newfd);
- 	oldfdi = idm_lookup(&idm, oldfd);
- 	if (oldfdi && oldfdi->type == fd_fork)
- 		fork_passive(oldfd);
-@@ -973,16 +992,16 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
- 	int fd, ret;
- 
- 	init_preload();
--	fprintf(fout, "fxstat64 socket %d - fd %d type %d\n",
--		socket, fd_getd(socket), fd_gett(socket));
-+	fprintf(fout, "%d fxstat64 socket %d - fd %d type %d\n",
-+			syscall(SYS_gettid), socket, fd_getd(socket), fd_gett(socket));
- 	if (fd_get(socket, &fd) == fd_rsocket) {
- 		ret = real.fxstat64(ver, socket, buf);
--		fprintf(fout, "fxstat64 - rsocket %d\n", ret);
-+		fprintf(fout, "%d fxstat64 - rsocket %d\n", syscall(SYS_gettid), ret);
- 		if (!ret)
- 			buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
- 	} else {
- 		ret = real.fxstat64(ver, fd, buf);
--		fprintf(fout, "fxstat64 - normal %d\n", ret);
-+		fprintf(fout, "%d fxstat64 - normal %d\n", syscall(SYS_gettid), ret);
- 	}
- 	fflush(fout);
- 	return ret;