From 6c41d1ae6f9f6b96df3b6084819c282197598130 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 9 Jul 2012 17:35:37 -0700 Subject: [PATCH] refresh --- meta | 7 ++--- patches/build-preload | 53 ++++++++++++++++++++++++++++++--- patches/refresh-temp | 69 ------------------------------------------- 3 files changed, 52 insertions(+), 77 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 9974758f..010eeba9 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 7ec2c36d645a44bdadb39d523bd0a98c4981bc74 -Head: 3fca9cdeb3c5e2740c4db699b4dd88655cf958cc +Previous: 97ced530b5000a51794386696c5476d9f06e071d +Head: edf7a87dbaa7ccfc4fd384cbaf40671283deb734 Applied: - build-preload: 7d5fcaa40a63b04164c2910a37c807df306797b1 - refresh-temp: 3fca9cdeb3c5e2740c4db699b4dd88655cf958cc + build-preload: edf7a87dbaa7ccfc4fd384cbaf40671283deb734 Unapplied: waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de diff --git a/patches/build-preload b/patches/build-preload index 588ae4a8..f8e4441a 100644 --- a/patches/build-preload +++ b/patches/build-preload @@ -1,5 +1,5 @@ Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789 -Top: 1156af15371b9307f7a9cf12d291ba35e3e631c6 +Top: 33d02e70ba10ea30f1cdc845e1e0200a9eaea214 Author: Sean Hefty Date: 2012-07-09 14:58:14 -0700 @@ -16,10 +16,10 @@ Signed-off-by: Sean Hefty --- diff --git a/Makefile.am b/Makefile.am -index 51b2f89..9bf6070 100644 +index 51b2f89..3f1280f 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1,11 +1,13 @@ +@@ -1,16 +1,20 @@ INCLUDES = -I$(srcdir)/include lib_LTLIBRARIES = src/librdmacm.la @@ -33,13 +33,58 @@ index 51b2f89..9bf6070 100644 if HAVE_LD_VERSION_SCRIPT librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map -@@ -19,6 +21,9 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \ ++ librspreload_version_script = -Wl,--version-script=$(srcdir)/src/librspreload.map + else + librdmacm_version_script = ++ librspreload_version_script = + endif + + src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \ +@@ -19,6 +23,11 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \ $(librdmacm_version_script) src_librdmacm_la_DEPENDENCIES = $(srcdir)/src/librdmacm.map +src_librspreload_la_SOURCES = src/preload.c src/indexer.c ++src_librspreload_la_LDFLAGS = -version-info 1 -export-dynamic \ ++ $(librspreload_version_script) +src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la + 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 +diff --git a/src/librspreload.map b/src/librspreload.map +new file mode 100644 +index 0000000..554050d +--- /dev/null ++++ b/src/librspreload.map +@@ -0,0 +1,30 @@ ++RSPRELOAD_1.0 { ++ global: ++ socket; ++ bind; ++ listen; ++ accept; ++ connect; ++ shutdown; ++ close; ++ recv; ++ recvfrom; ++ recvmsg; ++ send; ++ sendto; ++ sendmsg; ++ read; ++ readv; ++ write; ++ writev; ++ poll; ++ select; ++ getpeername; ++ getsockname; ++ setsockopt; ++ getsockopt; ++ fcntl; ++ poll; ++ select; ++ local: *; ++}; diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 2b52f9f9..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,69 +0,0 @@ -Bottom: 1156af15371b9307f7a9cf12d291ba35e3e631c6 -Top: 33d02e70ba10ea30f1cdc845e1e0200a9eaea214 -Author: Sean Hefty -Date: 2012-07-09 17:35:37 -0700 - -Refresh of build-preload - ---- - -diff --git a/Makefile.am b/Makefile.am -index 9bf6070..3f1280f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -11,8 +11,10 @@ src_librspreload_la_CFLAGS = $(AM_CFLAGS) - - if HAVE_LD_VERSION_SCRIPT - librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map -+ librspreload_version_script = -Wl,--version-script=$(srcdir)/src/librspreload.map - else - librdmacm_version_script = -+ librspreload_version_script = - endif - - src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \ -@@ -22,6 +24,8 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \ - src_librdmacm_la_DEPENDENCIES = $(srcdir)/src/librdmacm.map - - src_librspreload_la_SOURCES = src/preload.c src/indexer.c -+src_librspreload_la_LDFLAGS = -version-info 1 -export-dynamic \ -+ $(librspreload_version_script) - src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la - - bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \ -diff --git a/src/librspreload.map b/src/librspreload.map -new file mode 100644 -index 0000000..554050d ---- /dev/null -+++ b/src/librspreload.map -@@ -0,0 +1,30 @@ -+RSPRELOAD_1.0 { -+ global: -+ socket; -+ bind; -+ listen; -+ accept; -+ connect; -+ shutdown; -+ close; -+ recv; -+ recvfrom; -+ recvmsg; -+ send; -+ sendto; -+ sendmsg; -+ read; -+ readv; -+ write; -+ writev; -+ poll; -+ select; -+ getpeername; -+ getsockname; -+ setsockopt; -+ getsockopt; -+ fcntl; -+ poll; -+ select; -+ local: *; -+}; -- 2.41.0