Commit 7bbf904e authored by Shane Snyder's avatar Shane Snyder
Browse files

USE_SWIM_FD => SSG_USE_SWIM_FD

parent 15143555
...@@ -35,7 +35,7 @@ pkgconfig_DATA = maint/ssg.pc ...@@ -35,7 +35,7 @@ pkgconfig_DATA = maint/ssg.pc
include Make.rules include Make.rules
include $(top_srcdir)/src/Makefile.subdir include $(top_srcdir)/src/Makefile.subdir
if USE_SWIM_FD if SSG_USE_SWIM_FD
include $(top_srcdir)/src/swim-fd/Makefile.subdir include $(top_srcdir)/src/swim-fd/Makefile.subdir
endif endif
......
...@@ -70,12 +70,12 @@ CFLAGS="$MARGO_CFLAGS $CFLAGS" ...@@ -70,12 +70,12 @@ CFLAGS="$MARGO_CFLAGS $CFLAGS"
AC_ARG_ENABLE([swim-fd], AC_ARG_ENABLE([swim-fd],
[ --enable-swim-fd enable SWIM failure detection (default: disabled)], [ --enable-swim-fd enable SWIM failure detection (default: disabled)],
[if test "x$enable_swim_fd" = "xyes" ; then [if test "x$enable_swim_fd" = "xyes" ; then
AC_DEFINE(USE_SWIM_FD, 1, Define to 1 if the SWIM failure detector should be used) AC_DEFINE(SSG_USE_SWIM_FD, 1, Define to 1 if the SWIM failure detector should be used)
elif test "x$enableval" != "xno" ; then elif test "x$enableval" != "xno" ; then
AC_MSG_ERROR(bad value ${enable_swim_fd} for --enable-swim-fd) AC_MSG_ERROR(bad value ${enable_swim_fd} for --enable-swim-fd)
fi],) fi],)
AM_CONDITIONAL([USE_SWIM_FD], [test "x${enable_swim_fd}" = xyes]) AM_CONDITIONAL([SSG_USE_SWIM_FD], [test "x${enable_swim_fd}" = xyes])
AC_CONFIG_FILES([Makefile maint/ssg.pc]) AC_CONFIG_FILES([Makefile maint/ssg.pc])
AC_OUTPUT AC_OUTPUT
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "ssg-mpi.h" #include "ssg-mpi.h"
#endif #endif
#include "ssg-internal.h" #include "ssg-internal.h"
#if USE_SWIM_FD #ifdef SSG_USE_SWIM_FD
#include "swim-fd/swim-fd.h" #include "swim-fd/swim-fd.h"
#endif #endif
#include "uthash.h" #include "uthash.h"
...@@ -206,7 +206,7 @@ int ssg_group_create( ...@@ -206,7 +206,7 @@ int ssg_group_create(
} }
SSG_DEBUG(g, "group lookup successful (size=%d)\n", group_size); SSG_DEBUG(g, "group lookup successful (size=%d)\n", group_size);
#if USE_SWIM_FD #ifdef SSG_USE_SWIM_FD
int swim_active = 1; int swim_active = 1;
#ifdef SWIM_FORCE_FAIL #ifdef SWIM_FORCE_FAIL
if (g->self_rank == 1) if (g->self_rank == 1)
...@@ -527,7 +527,7 @@ static int ssg_group_destroy_internal(ssg_group_t *g) ...@@ -527,7 +527,7 @@ static int ssg_group_destroy_internal(ssg_group_t *g)
/* TODO: send a leave message to the group ? */ /* TODO: send a leave message to the group ? */
#if USE_SWIM_FD #ifdef SSG_USE_SWIM_FD
/* free up failure detector state */ /* free up failure detector state */
if(g->fd_ctx) if(g->fd_ctx)
swim_finalize(g->fd_ctx); swim_finalize(g->fd_ctx);
......
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