Refresh of rs-spin

diff --git a/Makefile.am b/Makefile.am
index cbd874dcbd76a92ffb4bb57add06550ac67dfc11..1dc61e152f190d46e004039bc7c50c05a4a46035 100644 (file)
--- 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 dec6064cc3e1351080b802638fc8bd15daf709d9..3ee7f9bed60767c65a75bc4bd77be7592126e6c1 100644 (file)
--- 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 f688c4c24b098a05c31bc1953959b6b076856ffb..140e22c9178fe43f47a73ca7bb3c80dfd474c36d 100755 (executable)
--- 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 2ee47675d83cb5e1a00531c5170c3a1cf24f30bc..7cd1f041e01937260aea37d8bbfea5e762e791b5 100644 (file)
--- 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 e899e8ae38dcfcbd6aa19ab16a652fd78102a9d7..3b16913b7681f0bbaac1603f7f64937eedbb5666 100644 (file)
--- 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
  */