aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_testbed.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-02-27 17:23:31 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-02-27 17:23:31 +0000
commitf7f6d5a8ea75b488a84b5ed1e550c6ac7ef82724 (patch)
tree400dd097a717b867c1799f3c72836307c458d0fc /src/testbed/testbed_api_testbed.c
parente0561f734723672019c1612b202ae2705dadedc9 (diff)
downloadgnunet-f7f6d5a8ea75b488a84b5ed1e550c6ac7ef82724.tar.gz
gnunet-f7f6d5a8ea75b488a84b5ed1e550c6ac7ef82724.zip
get hosts from loadleveler instead of reading them from hostlist
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r--src/testbed/testbed_api_testbed.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index d57c3bf4c..bbc89f43f 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -1050,6 +1050,16 @@ 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
1054 rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg,
1055 &rc->hosts);
1056 if (0 == rc->num_hosts)
1057 {
1058 LOG (GNUNET_ERROR_TYPE_WARNING,
1059 _("No hosts loaded from LoadLeveler. Need at least one host\n"));
1060 goto error_cleanup;
1061 }
1062#else
1053 if (NULL != host_filename) 1063 if (NULL != host_filename)
1054 { 1064 {
1055 rc->num_hosts = 1065 rc->num_hosts =
@@ -1064,6 +1074,7 @@ GNUNET_TESTBED_run (const char *host_filename,
1064 } 1074 }
1065 else 1075 else
1066 rc->h = GNUNET_TESTBED_host_create (NULL, NULL, rc->cfg, 0); 1076 rc->h = GNUNET_TESTBED_host_create (NULL, NULL, rc->cfg, 0);
1077#endif
1067 rc->num_peers = num_peers; 1078 rc->num_peers = num_peers;
1068 rc->event_mask = event_mask; 1079 rc->event_mask = event_mask;
1069 rc->cc = cc; 1080 rc->cc = cc;