refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..5238433
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,73 @@
+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;