From 29f1e86f7f48a639f749319fd4d3bcc727011b1f Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 7 Aug 2012 21:25:29 -0700
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |   5 +-
 patches/refresh-temp | 114 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 93e0e8fd..7a122031 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,13 @@
 Version: 1
-Previous: 05291ce16ba0e5fe13111d9c4852ffe6b351f214
-Head: 85ba05d1f4426df2fbba1e84d2c073c2e88c56d2
+Previous: 8b0ce93e67dd0b3251caae11014a294054c42194
+Head: ced33bcaa011da943cfc019a6b03b37c4402f07a
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   fstat: 07e07a6ee41d57eb20b3b71b1d8098408fc1de03
   dbg-out: ffeea178a7bed542f8f035ac0d4884dfdea63026
   oobinline: 85ba05d1f4426df2fbba1e84d2c073c2e88c56d2
+  refresh-temp: ced33bcaa011da943cfc019a6b03b37c4402f07a
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..778fd7dd
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,114 @@
+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;
-- 
2.41.0