diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-03-07 10:58:50 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-03-07 10:58:50 +0000 |
commit | b40d8947f8d40a611b4f5224b935f3fd4a3aa848 (patch) | |
tree | dafa4d629f7a95d1c479839565b154c81215ce14 | |
parent | 04362fdc4f2829da73b5829e49f262e6401a9b9c (diff) | |
download | gnunet-b40d8947f8d40a611b4f5224b935f3fd4a3aa848.tar.gz gnunet-b40d8947f8d40a611b4f5224b935f3fd4a3aa848.zip |
- remove unused code
-rw-r--r-- | configure.ac | 55 | ||||
-rw-r--r-- | contrib/testbed_infiniband.conf | 2 | ||||
-rw-r--r-- | src/testbed/Makefile.am | 2 | ||||
-rw-r--r-- | src/testbed/gnunet-testbed-profiler.c | 4 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 2 |
6 files changed, 20 insertions, 47 deletions
diff --git a/configure.ac b/configure.ac index 738e204ac..db0b7fa12 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -965,48 +965,21 @@ AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls]) | |||
965 | 965 | ||
966 | 966 | ||
967 | # Test if we are building for superMUC | 967 | # Test if we are building for superMUC |
968 | llapi=0 | ||
969 | AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC) | 968 | AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC) |
970 | AC_ARG_WITH([ll], | 969 | AC_ARG_ENABLE([ll], |
971 | [AS_HELP_STRING([--with-ll=PFX], | 970 | [AS_HELP_STRING([--enable-ll], |
972 | [use IBM LoadLeveler (installed at PFX) for running testbed on SuperMUC]. Default is no)], | 971 | [build GNUnet testbed for use with IBM LoadLeveler for running testbed on |
973 | [AC_MSG_RESULT([$with_ll]) | 972 | SuperMUC (default is NO)])], |
974 | case $with_ll in | 973 | [if `test "x$enable_ll" = "xno"` |
975 | no) | 974 | then |
976 | ;; | 975 | ll=false |
977 | yes) | 976 | else |
978 | AC_CHECK_HEADERS([llapi.h], | 977 | ll=true |
979 | AC_CHECK_LIB([llapi], [llsubmit], | 978 | fi], |
980 | llapi=true, | 979 | [ll=false]) |
981 | AC_MSG_ERROR(libllapi not found but --with-llapi given)), | 980 | AC_MSG_RESULT($enable_ll) |
982 | AC_MSG_ERROR(llapi.h not found but --with-llapi given)) | 981 | AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "xtrue"]) |
983 | ;; | 982 | AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support]) |
984 | *) | ||
985 | LDFLAGS="-L$with_ll/lib $LDFLAGS" | ||
986 | CPPFLAGS="-I$with_ll/include $CPPFLAGS" | ||
987 | AC_CHECK_HEADERS([llapi.h], | ||
988 | AC_CHECK_LIB([llapi], [llsubmit], | ||
989 | llapi=true, | ||
990 | AC_MSG_ERROR(libllapi not found but --with-llapi given)), | ||
991 | AC_MSG_ERROR(llapi.h not found but --with-llapi given)) | ||
992 | ;; | ||
993 | esac | ||
994 | ], | ||
995 | [AC_MSG_RESULT(--with-ll not specified)]) | ||
996 | AM_CONDITIONAL([WITH_LL], [test "x$llapi" = "xtrue"]) | ||
997 | if test "x$llapi" = "xtrue" | ||
998 | then | ||
999 | AC_DEFINE_UNQUOTED([WITH_LL], [$llapi], [Do we have to use IBM LoadLeveler]) | ||
1000 | AC_CHECK_HEADERS([pwd.h], | ||
1001 | AC_CHECK_LIB([c],[getpwuid],, | ||
1002 | AC_MSG_ERROR(getpwid function not available in libc but is required)), | ||
1003 | AC_MSG_ERROR(pwd.h not found but is required), | ||
1004 | [[ | ||
1005 | #ifdef HAVE_SYS_TYPES_H | ||
1006 | #include <sys/types.h> | ||
1007 | #endif | ||
1008 | ]]) | ||
1009 | fi | ||
1010 | 983 | ||
1011 | # should 'make check' run tests? | 984 | # should 'make check' run tests? |
1012 | AC_MSG_CHECKING(whether to run tests) | 985 | AC_MSG_CHECKING(whether to run tests) |
diff --git a/contrib/testbed_infiniband.conf b/contrib/testbed_infiniband.conf index 1c166d1f4..a0566b371 100644 --- a/contrib/testbed_infiniband.conf +++ b/contrib/testbed_infiniband.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | [testbed] | 1 | [testbed] |
2 | AUTOSTART = NO | 2 | AUTOSTART = NO |
3 | PORT = 12113 | 3 | PORT = 12113 |
4 | ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; | 4 | ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 | 6 | MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 |
7 | OVERLAY_TOPOLOGY = RANDOM | 7 | OVERLAY_TOPOLOGY = RANDOM |
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 27970cdf0..bd7eca3ae 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am | |||
@@ -9,7 +9,7 @@ if USE_COVERAGE | |||
9 | XLIB = -lgcov | 9 | XLIB = -lgcov |
10 | endif | 10 | endif |
11 | 11 | ||
12 | if WITH_LL | 12 | if ENABLE_LL |
13 | ll_binaries = \ | 13 | ll_binaries = \ |
14 | gnunet-testbed-mpi-spawn | 14 | gnunet-testbed-mpi-spawn |
15 | endif | 15 | endif |
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index 5cca55b4b..686679e98 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c | |||
@@ -229,7 +229,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
229 | char *hostfile; | 229 | char *hostfile; |
230 | 230 | ||
231 | hostfile = NULL; | 231 | hostfile = NULL; |
232 | #ifndef WITH_LL | 232 | #if !ENABLE_LL |
233 | if (NULL == args[0]) | 233 | if (NULL == args[0]) |
234 | { | 234 | { |
235 | fprintf (stderr, _("No hosts-file specified on command line\n")); | 235 | fprintf (stderr, _("No hosts-file specified on command line\n")); |
@@ -271,7 +271,7 @@ main (int argc, char *const *argv) | |||
271 | GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails}, | 271 | GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails}, |
272 | GNUNET_GETOPT_OPTION_END | 272 | GNUNET_GETOPT_OPTION_END |
273 | }; | 273 | }; |
274 | #ifdef WITH_LL | 274 | #if ENABLE_LL |
275 | const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS]"; | 275 | const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS]"; |
276 | #else | 276 | #else |
277 | const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS] hosts-file"; | 277 | const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS] hosts-file"; |
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 6cac5eeb6..f1f9003ee 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -588,7 +588,7 @@ GNUNET_TESTBED_hosts_load_from_loadleveler (const struct | |||
588 | GNUNET_CONFIGURATION_Handle *cfg, | 588 | GNUNET_CONFIGURATION_Handle *cfg, |
589 | struct GNUNET_TESTBED_Host ***hosts) | 589 | struct GNUNET_TESTBED_Host ***hosts) |
590 | { | 590 | { |
591 | #ifndef WITH_LL | 591 | #if !ENABLE_LL |
592 | LOG (GNUNET_ERROR_TYPE_ERROR, | 592 | LOG (GNUNET_ERROR_TYPE_ERROR, |
593 | _("The function %s is only available when compiled with (--with-ll)\n"), | 593 | _("The function %s is only available when compiled with (--with-ll)\n"), |
594 | __func__); | 594 | __func__); |
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index 1297bfc23..282e4af88 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -1050,7 +1050,7 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
1050 | GNUNET_assert (num_peers > 0); | 1050 | GNUNET_assert (num_peers > 0); |
1051 | rc = GNUNET_malloc (sizeof (struct RunContext)); | 1051 | rc = GNUNET_malloc (sizeof (struct RunContext)); |
1052 | rc->cfg = GNUNET_CONFIGURATION_dup (cfg); | 1052 | rc->cfg = GNUNET_CONFIGURATION_dup (cfg); |
1053 | #ifdef WITH_LL | 1053 | #if ENABLE_LL |
1054 | rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg, | 1054 | rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg, |
1055 | &rc->hosts); | 1055 | &rc->hosts); |
1056 | if (0 == rc->num_hosts) | 1056 | if (0 == rc->num_hosts) |