From a6174626799572803f2e2ae866091f80090c0d45 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 5 Jun 2012 11:09:06 -0700 Subject: [PATCH] refresh --- meta | 7 ++-- patches/refresh-temp | 91 -------------------------------------------- patches/rs-spin | 85 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 86 insertions(+), 97 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index f8585a94..f735dca6 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: 1c28ec8f5ca5a9c43e22ae9a7b3580f6748dd279 -Head: 03cdb7dc9625159cfa277838cca427bbd5f4dc54 +Previous: 540e38c9b71b8cb4204aa250abd745cf790a82d5 +Head: 069439b0d4b85103b5b5b7f6066144bc7be7bd80 Applied: ip6-opt: a459c228426c4d25684dcfd2a4203f013f0b454e rs-shutdown: f16748cbaea650f19805ddc6652895ca88d36a45 rs-maxseg: e7a519b8ae91403c8c0d29b2a86ae376b37a71c1 - rs-spin: 0e70b792a716764bcaaa70fb52662f5b97589fc9 - refresh-temp: 03cdb7dc9625159cfa277838cca427bbd5f4dc54 + rs-spin: 069439b0d4b85103b5b5b7f6066144bc7be7bd80 Unapplied: buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 6e231be0..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,91 +0,0 @@ -Bottom: 729b947f8c52c96a11c4a33ff4ef447cd22cc5d1 -Top: 2cf8cc52f172abb831a45fb525012c8f8d469745 -Author: Sean Hefty -Date: 2012-06-05 11:09:06 -0700 - -Refresh of rs-spin - ---- - -diff --git a/Makefile.am b/Makefile.am -index cbd874d..1dc61e1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/include - lib_LTLIBRARIES = src/librdmacm.la - - ACLOCAL_AMFLAGS = -I config --AM_CFLAGS = -g -Wall -D_GNU_SOURCE -+AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\" - - src_librdmacm_la_CFLAGS = $(AM_CFLAGS) - -diff --git a/configure.in b/configure.in -index dec6064..3ee7f9b 100644 ---- a/configure.in -+++ b/configure.in -@@ -87,5 +87,10 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script, - - AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes") - -+AC_ARG_VAR(rdmadir, [Directory for configuration files]) -+if test "x$rdmadir" = "x"; then -+ AC_SUBST(rdmadir, rdma) -+fi -+ - AC_CONFIG_FILES([Makefile librdmacm.spec]) - AC_OUTPUT -diff --git a/src/cma.c b/src/cma.c -index f688c4c..140e22c 100755 ---- a/src/cma.c -+++ b/src/cma.c -@@ -276,6 +276,7 @@ int ucma_init(void) - - cma_dev_cnt = dev_cnt; - ucma_set_af_ib_support(); -+ rs_configure(); - pthread_mutex_unlock(&mut); - ibv_free_device_list(dev_list); - return 0; -diff --git a/src/cma.h b/src/cma.h -index 2ee4767..7cd1f04 100644 ---- a/src/cma.h -+++ b/src/cma.h -@@ -114,6 +114,7 @@ static inline int ERR(int err) - } - - int ucma_init(); -+void rs_configure(); - extern int af_ib_support; - - #define RAI_ROUTEONLY 0x01000000 -@@ -166,4 +167,13 @@ struct ibv_path_data - }; - #endif - -+#ifndef SYSCONFDIR -+#define SYSCONFDIR "/etc" -+#endif -+#ifndef RDMADIR -+#define RDMADIR "rdma" -+#endif -+#define RDMA_CONF_DIR SYSCONFDIR "/" RDMADIR -+#define RS_CONF_DIR RDMA_CONF_DIR "/rsockets" -+ - #endif /* CMA_H */ -diff --git a/src/rsocket.c b/src/rsocket.c -index e899e8a..3b16913 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -197,6 +197,11 @@ struct rsocket { - uint8_t *sbuf; - }; - -+void rs_configure(void) -+{ -+ -+} -+ - /* - * We currently generate a completion per send. sqe_count = 1 - */ diff --git a/patches/rs-spin b/patches/rs-spin index d9a52b45..2d79342f 100644 --- a/patches/rs-spin +++ b/patches/rs-spin @@ -1,5 +1,5 @@ Bottom: 729b947f8c52c96a11c4a33ff4ef447cd22cc5d1 -Top: 729b947f8c52c96a11c4a33ff4ef447cd22cc5d1 +Top: 2cf8cc52f172abb831a45fb525012c8f8d469745 Author: Sean Hefty Date: 2012-06-04 14:51:41 -0700 @@ -21,4 +21,85 @@ Signed-off-by: Sean Hefty --- - +diff --git a/Makefile.am b/Makefile.am +index cbd874d..1dc61e1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/include + lib_LTLIBRARIES = src/librdmacm.la + + ACLOCAL_AMFLAGS = -I config +-AM_CFLAGS = -g -Wall -D_GNU_SOURCE ++AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\" + + src_librdmacm_la_CFLAGS = $(AM_CFLAGS) + +diff --git a/configure.in b/configure.in +index dec6064..3ee7f9b 100644 +--- a/configure.in ++++ b/configure.in +@@ -87,5 +87,10 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script, + + AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes") + ++AC_ARG_VAR(rdmadir, [Directory for configuration files]) ++if test "x$rdmadir" = "x"; then ++ AC_SUBST(rdmadir, rdma) ++fi ++ + AC_CONFIG_FILES([Makefile librdmacm.spec]) + AC_OUTPUT +diff --git a/src/cma.c b/src/cma.c +index f688c4c..140e22c 100755 +--- a/src/cma.c ++++ b/src/cma.c +@@ -276,6 +276,7 @@ int ucma_init(void) + + cma_dev_cnt = dev_cnt; + ucma_set_af_ib_support(); ++ rs_configure(); + pthread_mutex_unlock(&mut); + ibv_free_device_list(dev_list); + return 0; +diff --git a/src/cma.h b/src/cma.h +index 2ee4767..7cd1f04 100644 +--- a/src/cma.h ++++ b/src/cma.h +@@ -114,6 +114,7 @@ static inline int ERR(int err) + } + + int ucma_init(); ++void rs_configure(); + extern int af_ib_support; + + #define RAI_ROUTEONLY 0x01000000 +@@ -166,4 +167,13 @@ struct ibv_path_data + }; + #endif + ++#ifndef SYSCONFDIR ++#define SYSCONFDIR "/etc" ++#endif ++#ifndef RDMADIR ++#define RDMADIR "rdma" ++#endif ++#define RDMA_CONF_DIR SYSCONFDIR "/" RDMADIR ++#define RS_CONF_DIR RDMA_CONF_DIR "/rsockets" ++ + #endif /* CMA_H */ +diff --git a/src/rsocket.c b/src/rsocket.c +index e899e8a..3b16913 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -197,6 +197,11 @@ struct rsocket { + uint8_t *sbuf; + }; + ++void rs_configure(void) ++{ ++ ++} ++ + /* + * We currently generate a completion per send. sqe_count = 1 + */ -- 2.41.0