commit

diff --git a/meta b/meta
index 6dc44290f4a4b52196eae47f3e63b8980cd1f4f4..f7d21242f9a210f26f3ae98e87f65cc43d71af54 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: ba3a2e591cb3f5c8aa45f85540c1bfeaedd8f7d8
+Previous: 59bf1f7abe4b9175f1d1b4c15397f5c024982606
 Head: fa37ec50248e8bc04a9a6662dcd2183bfc93af54
 Applied:
-  pre-udp: fa37ec50248e8bc04a9a6662dcd2183bfc93af54
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/pre-udp b/patches/pre-udp
deleted file mode 100644 (file)
index bd37813..0000000
--- a/patches/pre-udp
+++ /dev/null
@@ -1,55 +0,0 @@
-Bottom: cf8998b9f06f893b499b9478f40610fb02b1993a
-Top:    1d1da945e49647331f04f82a45cc353e9541a6ae
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-01-09 14:54:47 -0800
-
-rsockets: Add support for existing UDP apps
-
-Support for existing UDP applications is done via the rspreload
-library.  However, when the preload library is loaded, socket
-calls used by rsockets get intercepted and converted into
-rsocket calls.
-
-The preload library was able to handle this for TCP rsockets
-by using a per thread variable and checking for recursive calls
-coming from rsockets back into the preload library.  The preload
-library would direct such calls to the real socket calls.
-
-The problem is more complex for UDP rsockets, which can invoke
-socket calls from an internal rsocket thread.  The result is that
-the preload library intercepts socket calls that originate from
-the rsocket library which are not recursive.
-
-Although, this is really a problem with the preload library,
-the simplest solution is for rsockets to fully initialize the
-library when allocating the first rsocket, versus deferring
-initialization until required.  The preload library can then
-detect the recursive calls.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 7be42ca..9b6c667 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008-2012 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2008-2013 Intel Corporation.  All rights reserved.
-  *
-  * This software is available to you under a choice of one of two
-  * licenses.  You may choose to be licensed under the terms of the GNU
-@@ -452,6 +452,10 @@ void rs_configure(void)
-       if (init)
-               goto out;
- 
-+      if (ucma_init())
-+              goto out;
-+      ucma_ib_init();
-+
-       if ((f = fopen(RS_CONF_DIR "/polling_time", "r"))) {
-               (void) fscanf(f, "%u", &polling_time);
-               fclose(f);