refresh

diff --git a/meta b/meta
index e1fad4cd89404d7e45c86b8e59e736608edbeaf1..1e1d70a1ed3abacb8d621f90e4512fc498a82bc2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 0aa34d8ced80f01f0c8450fd1d764e163da0a34d
-Head: 34cecedcc5282feaff46e584aca5a4132c0b0f68
+Previous: 6e3683ad10cf5b4babb574952f949a0e36fa5bf9
+Head: 54695d4a26cb90b1f65ed8a97a28e83bb5c45081
 Applied:
-  build-preload: 520dcfd5b1dd40d2ae8668789dde0974fa2e1a4e
-  refresh-temp: 34cecedcc5282feaff46e584aca5a4132c0b0f68
+  build-preload: 54695d4a26cb90b1f65ed8a97a28e83bb5c45081
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index 1a175222a9ec3eb417559168a1b5d96b9f9a7fce..2b32f8797ac3c023628af77c87bb13700adceb82 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    a4b09c3cdc7c25dd763ce76138432c0aba19fc68
+Top:    c64a76f16b2f730e7c7514ef9ef676f4e60f07e0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -15,10 +15,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..d74bbac 100644
+index 51b2f89..e01b4cc 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,17 +1,21 @@
+@@ -1,16 +1,21 @@
  INCLUDES = -I$(srcdir)/include
  
 +rslibdir = $(libdir)/rsocket
@@ -29,18 +29,18 @@ index 51b2f89..d74bbac 100644
  AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
  
  src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
-+src_librspreload_la_CFLAGS = -Wall -ldl -shared -fPIC -D_GNU_SOURCE
++src_librspreload_la_CFLAGS = $(AM_CFLAGS)
  
  if HAVE_LD_VERSION_SCRIPT
      librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
++    librspreload_version_script =
  else
      librdmacm_version_script =
++    librspreload_version_script =
  endif
-+librspreload_version_script =
  
  src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \
-               src/rsocket.c src/indexer.c
-@@ -19,6 +23,12 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
+@@ -19,6 +24,12 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
                           $(librdmacm_version_script)
  src_librdmacm_la_DEPENDENCIES =  $(srcdir)/src/librdmacm.map
  
@@ -53,7 +53,7 @@ index 51b2f89..d74bbac 100644
  bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \
               examples/rdma_client examples/rdma_server examples/rdma_xclient \
               examples/rdma_xserver examples/rstream examples/rcopy
-@@ -116,7 +126,7 @@ man_MANS = \
+@@ -116,7 +127,7 @@ man_MANS = \
        man/rdma_cm.7 \
        man/rsocket.7
  
@@ -130,29 +130,21 @@ index 0000000..554050d
 +      local: *;
 +};
 diff --git a/src/preload.c b/src/preload.c
-index d21389f..5ed77d7 100644
+index d21389f..8758d5c 100644
 --- a/src/preload.c
 +++ b/src/preload.c
-@@ -54,6 +54,7 @@
- #include <string.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
-+#include <stdio.h>
+@@ -31,14 +31,6 @@
+  *
+  */
  
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>
-@@ -224,6 +225,7 @@ static void init_preload(void)
-       /* Quick check without lock */
-       if (init)
-               return;
-+printf("%s\n", __func__);
- 
-       pthread_mutex_lock(&mut);
-       if (init)
-@@ -328,6 +330,7 @@ int socket(int domain, int type, int protocol)
-       static __thread int recursive;
-       int index, ret;
- 
-+printf("%s\n", __func__);
-       if (recursive)
-               goto real;
+-/*
+- * Build:
+- * gcc -lrdmacm -Wall -shared -fPIC -o preload.so -D_GNU_SOURCE preload.c indexer.c
+- *
+- * Use:
+- * LD_PRELOAD=preload.so binary --plus_args
+- */
+-
+ #if HAVE_CONFIG_H
+ #  include <config.h>
+ #endif /* HAVE_CONFIG_H */

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5238433..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,73 +0,0 @@
-Bottom: a4b09c3cdc7c25dd763ce76138432c0aba19fc68
-Top:    c64a76f16b2f730e7c7514ef9ef676f4e60f07e0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 17:35:28 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index d74bbac..e01b4cc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,14 +8,15 @@ ACLOCAL_AMFLAGS = -I config
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
- 
- src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
--src_librspreload_la_CFLAGS = -Wall -ldl -shared -fPIC -D_GNU_SOURCE
-+src_librspreload_la_CFLAGS = $(AM_CFLAGS)
- 
- if HAVE_LD_VERSION_SCRIPT
-     librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
-+    librspreload_version_script =
- else
-     librdmacm_version_script =
-+    librspreload_version_script =
- endif
--librspreload_version_script =
- 
- src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \
-               src/rsocket.c src/indexer.c
-diff --git a/src/preload.c b/src/preload.c
-index 5ed77d7..8758d5c 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -31,14 +31,6 @@
-  *
-  */
- 
--/*
-- * Build:
-- * gcc -lrdmacm -Wall -shared -fPIC -o preload.so -D_GNU_SOURCE preload.c indexer.c
-- *
-- * Use:
-- * LD_PRELOAD=preload.so binary --plus_args
-- */
--
- #if HAVE_CONFIG_H
- #  include <config.h>
- #endif /* HAVE_CONFIG_H */
-@@ -54,7 +46,6 @@
- #include <string.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
--#include <stdio.h>
- 
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>
-@@ -225,7 +216,6 @@ static void init_preload(void)
-       /* Quick check without lock */
-       if (init)
-               return;
--printf("%s\n", __func__);
- 
-       pthread_mutex_lock(&mut);
-       if (init)
-@@ -330,7 +320,6 @@ int socket(int domain, int type, int protocol)
-       static __thread int recursive;
-       int index, ret;
- 
--printf("%s\n", __func__);
-       if (recursive)
-               goto real;