Commit 4f2aa8ac authored by Shane Snyder's avatar Shane Snyder

integrate swim

parent aebd6c47
......@@ -102,6 +102,9 @@ check_swim_fd_status=fail
if test "x${check_swim_fd}" = xauto -o "x${check_swim_fd}" = xyes ; then
PKG_CHECK_MODULES([SWIM_FD],[swim-fd],
[AC_DEFINE([HAVE_SWIM_FD], [1], [Defined to 1 if compiled with SWIM failure detection support])
LIBS="$SWIM_FD_LIBS $LIBS"
CPPFLAGS="$SWIM_FD_CFLAGS $CPPFLAGS"
CFLAGS="$SWIM_FD_CFLAGS $CFLAGS"
check_swim_fd_status=success], [check_swim_fd_status=fail])
fi
......
......@@ -27,6 +27,10 @@
#include <ssg-margo.h>
#endif
#ifdef HAVE_SWIM_FD
#include <swim.h>
#endif
#define DO_DEBUG 0
#define DEBUG(...) \
do { \
......@@ -501,8 +505,6 @@ hg_return_t ssg_lookup_margo(ssg_t s)
// set the hg class up front - need for destructing addrs
hgctx = margo_get_context(s->mid);
if (hgctx == NULL) return HG_INVALID_PARAM;
s->hgcl = margo_get_class(s->mid);
if (s->hgcl == NULL) return HG_INVALID_PARAM;
// perform search for my rank if not already set
if (s->rank == SSG_RANK_UNKNOWN) {
......@@ -564,6 +566,14 @@ hg_return_t ssg_lookup_margo(ssg_t s)
}
}
#ifdef HAVE_SWIM_FD
// TODO: SWIM INITIALIZATION
// if(s->rank == 0)
// swim_init(s->mid, s, 1);
// else
swim_init(s->mid, s, 0);
#endif
fin:
// cleanup
if (ults != NULL) {
......
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