commit

diff --git a/meta b/meta
index c95be4d0417ab53f7818a322f53ebcbf51269dc5..36ea1a52de82c96967bb9902d13309bde29f5cd7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: e59c2fc95586b7868ce9c7ea8911e50afe529cdf
+Previous: 789fdaec514c822a96d810ab2e423a6dcd28da9e
 Head: dce5bd27a522646b83d347e5483fe7be04f95f71
 Applied:
-  fork-fix: dce5bd27a522646b83d347e5483fe7be04f95f71
 Unapplied:
   af_ib: 35b4fe1c3e856dee01d437af0950a3ff2e59dade
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a

diff --git a/patches/fork-fix b/patches/fork-fix
deleted file mode 100644 (file)
index 3f7b17e..0000000
--- a/patches/fork-fix
+++ /dev/null
@@ -1,67 +0,0 @@
-Bottom: 30191aa638f3f574e67a71c82fa7771bcc620c52
-Top:    f28ec49823485e069c95d7c5851dbd01583cf091
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-23 11:20:08 -0700
-
-rspreload: Avoid rsocket calls until after fork
-
-When an rsocket call is made before an application calls fork(),
-the forked applications can hang.  This can be seen by running
-netserver and two netperf clients simultaneously.  The second
-netperf client will eventually stop performing data transfers.
-
-LD_PRELOAD=librspreload.so netserver -D
-
-LD_PRELOAD=librspreload.so netperf -v2 -c -C -H 192.168.0.101 -l30
-LD_PRELOAD=librspreload.so netperf -v2 -c -C -H 192.168.0.101 -l30
-
-It's not clear what the specific problem is.  The best guess is
-that libibverbs or the provider library (e.g. libmlx4) perform
-some initialization, such as mmap'ing device memory, which does not
-work when fork is called.
-
-As a work-around, avoid calling rsocket routines until immediately
-before they are needed.  This allows the process to fork before
-the libraries are initialized.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 0645f6d..4ba38f5 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -412,20 +412,21 @@ int socket(int domain, int type, int protocol)
-       if (index < 0)
-               return index;
- 
-+      if (fork_support && (domain == PF_INET || domain == PF_INET6) &&
-+          (type == SOCK_STREAM) && (!protocol || protocol == IPPROTO_TCP)) {
-+              ret = real.socket(domain, type, protocol);
-+              if (ret < 0)
-+                      return ret;
-+              fd_store(index, ret, fd_normal, fd_fork);
-+              return index;
-+      }
-+
-       recursive = 1;
-       ret = rsocket(domain, type, protocol);
-       recursive = 0;
-       if (ret >= 0) {
--              if (fork_support) {
--                      rclose(ret);
--                      ret = real.socket(domain, type, protocol);
--                      if (ret < 0)
--                              return ret;
--                      fd_store(index, ret, fd_normal, fd_fork);
--              } else {
--                      fd_store(index, ret, fd_rsocket, fd_ready);
--                      set_rsocket_options(ret);
--              }
-+              fd_store(index, ret, fd_rsocket, fd_ready);
-+              set_rsocket_options(ret);
-               return index;
-       }
-       fd_close(index, &ret);