Commit 2983e6b5 authored by David Rich's avatar David Rich

Makefile.am fix for manual build linking issue. Bug fix in kvgroup-client for...

Makefile.am fix for manual build linking issue. Bug fix in kvgroup-client for addr_str size argument to margo_addr_to_string. The size is in/out so need to be careful in the loop.
parent 1aaf73ae
...@@ -71,7 +71,7 @@ test_test_mpi_LDFLAGS = -Llib -lkvclient -lkvserver -lssg -lboost_filesystem -lb ...@@ -71,7 +71,7 @@ test_test_mpi_LDFLAGS = -Llib -lkvclient -lkvserver -lssg -lboost_filesystem -lb
test_test_mpi_group_SOURCES = test/test-mpi-group.cc test_test_mpi_group_SOURCES = test/test-mpi-group.cc
test_test_mpi_group_CPPFLAGS = ${CPPFLAGS} -I${srcdir}/src test_test_mpi_group_CPPFLAGS = ${CPPFLAGS} -I${srcdir}/src
test_test_mpi_group_DEPENDENCIES = lib/libkvgroupserver.la lib/libkvgroupclient.la lib/libkvserver.la lib/libkvclient.la test_test_mpi_group_DEPENDENCIES = lib/libkvgroupserver.la lib/libkvgroupclient.la lib/libkvserver.la lib/libkvclient.la
test_test_mpi_group_LDFLAGS = -Llib -lkvgroupserver -lkvgroupclient -lkvclient -lkvserver -lssg -lch-placement -lleveldb -ldb_cxx -lboost_filesystem -lboost_system test_test_mpi_group_LDFLAGS = -Llib -lkvgroupserver -lkvgroupclient -lkvclient -lkvserver -lssg -lch-placement -lboost_filesystem -lboost_system
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = maint/kv-server.pc \ pkgconfig_DATA = maint/kv-server.pc \
......
...@@ -5,7 +5,7 @@ To Build: ...@@ -5,7 +5,7 @@ To Build:
On Darwin, run configure like this: On Darwin, run configure like this:
With BwTree: ./configure CC=mpicc CXX=mpicxx --prefix=$HOME/mochi --enable-bwtree With BwTree: ./configure CC=mpicc CXX=mpicxx --prefix=$HOME/mochi --enable-bwtree
With BerkeleyDB: ./configure CC=mpicc CXX=mpicxx --prefix=$HOME/mochi --enable-berkeleydb With BerkeleyDB: ./configure CC=mpicc CXX=mpicxx --prefix=$HOME/mochi --enable-berkeleydb
With LevelDB: ./configure CC=mpicc CXX=mpicxx --prefix=$HOME/mochi --enable-leveldb With LevelDB: ./configure CC=mpicc CXX=mpicxx LDFLAGS="`pkg-config --libs leveldb`" --prefix=$HOME/mochi --enable-leveldb
On Cori, run configure like this: On Cori, run configure like this:
With BwTree: ./configure CC=cc CXX=CC LDFLAGS="-dynamic -latomic" --prefix=$HOME/mochi --enable-bwtree With BwTree: ./configure CC=cc CXX=CC LDFLAGS="-dynamic -latomic" --prefix=$HOME/mochi --enable-bwtree
......
...@@ -49,8 +49,9 @@ hg_return_t kvgroup_open(kvgroup_context_t *context, const char *db_name) ...@@ -49,8 +49,9 @@ hg_return_t kvgroup_open(kvgroup_context_t *context, const char *db_name)
context->kv_context[i] = kv_client_register(context->mid); context->kv_context[i] = kv_client_register(context->mid);
assert(context->kv_context[i] != NULL); assert(context->kv_context[i] != NULL);
hg_addr_t server_addr = ssg_get_addr(context->gid, i); hg_addr_t server_addr = ssg_get_addr(context->gid, i);
hg_size_t str_size = addr_str_sz;
// turn server_addr into string // turn server_addr into string
ret = margo_addr_to_string(context->mid, addr_str, &addr_str_sz, server_addr); ret = margo_addr_to_string(context->mid, addr_str, &str_size, server_addr);
assert(ret == HG_SUCCESS); assert(ret == HG_SUCCESS);
margo_addr_free(context->mid, server_addr); margo_addr_free(context->mid, server_addr);
std::string server_dbname = basepath + separator + std::string("kvdb.") + std::to_string(i) std::string server_dbname = basepath + separator + std::string("kvdb.") + std::to_string(i)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment