Version: 1
-Previous: 061f2fdc6fb48e579a99f7e5bfaabf4a58075532
-Head: 078fbd5fbae75b2e92170629613c85ce9e7071e7
+Previous: f938d0adbabb09193e8bf1c4dad6d6edaf8351bd
+Head: ff7e536bf5a42aef0eb51bc6f120b42842466e0f
Applied:
real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
fork-pass: 9d661d643b62858fe119794e0ca41b5575faa0ce
fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
- sendfile: bd5281503e73a8110363c546e98b64a64a6d96dc
- refresh-temp: 078fbd5fbae75b2e92170629613c85ce9e7071e7
+ sendfile: ff7e536bf5a42aef0eb51bc6f120b42842466e0f
Unapplied:
dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
fstat: a62c653906870422edef5f6388dac9f76c953e35
+++ /dev/null
-Bottom: 4268c51745c5dc86b489f28e7c8698b7a68db3a8
-Top: 9baead7ab1e6af902e2683f1af27b76fb91f0ae2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-08-14 12:25:24 -0700
-
-Refresh of sendfile
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index d3edd24..9b71c77 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -38,6 +38,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
-+#include <sys/mman.h>
- #include <stdarg.h>
- #include <dlfcn.h>
- #include <netdb.h>
Bottom: 652ae6e1dadacc92be353adaafd434f1ff7ddbfa
-Top: 4268c51745c5dc86b489f28e7c8698b7a68db3a8
+Top: 9baead7ab1e6af902e2683f1af27b76fb91f0ae2
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-08-13 17:00:42 -0700
---
diff --git a/src/preload.c b/src/preload.c
-index 8b86415..d3edd24 100644
+index 8b86415..9b71c77 100644
--- a/src/preload.c
+++ b/src/preload.c
-@@ -48,6 +48,7 @@
+@@ -38,6 +38,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
++#include <sys/mman.h>
+ #include <stdarg.h>
+ #include <dlfcn.h>
+ #include <netdb.h>
+@@ -48,6 +49,7 @@
#include <netinet/tcp.h>
#include <unistd.h>
#include <semaphore.h>
#include <rdma/rdma_cma.h>
#include <rdma/rdma_verbs.h>
-@@ -84,6 +85,7 @@ struct socket_calls {
+@@ -84,6 +86,7 @@ struct socket_calls {
void *optval, socklen_t *optlen);
int (*fcntl)(int socket, int cmd, ... /* arg */);
int (*dup2)(int oldfd, int newfd);
};
static struct socket_calls real;
-@@ -276,6 +278,7 @@ static void init_preload(void)
+@@ -276,6 +279,7 @@ static void init_preload(void)
real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
real.fcntl = dlsym(RTLD_NEXT, "fcntl");
real.dup2 = dlsym(RTLD_NEXT, "dup2");
rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -1009,3 +1012,23 @@ int dup2(int oldfd, int newfd)
+@@ -1009,3 +1013,23 @@ int dup2(int oldfd, int newfd)
atomic_inc(&oldfdi->refcnt);
return newfd;
}