squash (CONFLICT)

diff --git a/meta b/meta
index f9d44b3f6d331ec17408685a8b55088d30e0303c..7ba857248607d7a90e0e05d784de2b22a3360e7f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: 173b81a35547db020953f8572ec38d614d0d92a8
+Previous: 51ae552a7739e937f7c789a10060cc20d5aef3f3
 Head: 7644056bd9ecfb20f190c8f5d5e4e249eb9e5282
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   fstat: 07e07a6ee41d57eb20b3b71b1d8098408fc1de03
   dbg-out: ffeea178a7bed542f8f035ac0d4884dfdea63026
+  oobinline: 7644056bd9ecfb20f190c8f5d5e4e249eb9e5282
 Unapplied:
-  oobinline: e681c16ca6b394374d1b63bd1a81541047627432
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/oobinline b/patches/oobinline
index 46ec3ef60f06dbc5167a164b23bfdb1bd7549a97..07eede36c66d97b0e6c8c1729eca307635003349 100644 (file)
--- a/patches/oobinline
+++ b/patches/oobinline
@@ -1,5 +1,5 @@
-Bottom: 7cfa8b8bbb7449eac973ab817f043b3f1a3850b7
-Top:    dab6accbfecd057dc03864b5bc34a2470658f9c7
+Bottom: 50835e142dc27f9d7b745b34a0d7c1416c75a0b7
+Top:    50835e142dc27f9d7b745b34a0d7c1416c75a0b7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 21:25:00 -0700
 
@@ -12,112 +12,4 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/src/preload.c b/src/preload.c
-index b18d310..b13ad2d 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -48,6 +48,8 @@
- #include <netinet/tcp.h>
- #include <unistd.h>
- #include <semaphore.h>
-+#include <stdio.h>
-+#include <sys/syscall.h>
- 
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>
-@@ -389,6 +391,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;
-@@ -403,6 +407,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);
-@@ -463,6 +470,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);
-@@ -493,6 +502,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);
-@@ -525,11 +536,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) {
-@@ -545,6 +562,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);
-@@ -922,6 +941,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);
-@@ -961,3 +981,23 @@ int dup2(int oldfd, int newfd)
-       atomic_inc(&oldfdi->refcnt);
-       return newfd;
- }
-+
-+int __fxstat64(int ver, int socket, struct stat64 *buf)
-+{
-+      int fd, ret;
-+
-+      init_preload();
-+      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, "%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, "%d fxstat64 - normal %d\n", syscall(SYS_gettid), ret);
-+      }
-+      fflush(fout);
-+      return ret;
-+}
+