[GNUnet-SVN] r26223 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-02-27 18:23:31 +0100 (Wed, 27 Feb 2013)
New Revision: 26223

Modified:
   gnunet/src/testbed/gnunet-testbed-profiler.c
   gnunet/src/testbed/testbed_api_testbed.c
Log:
get hosts from loadleveler instead of reading them from hostlist


Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c        2013-02-27 17:05:47 UTC 
(rev 26222)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c        2013-02-27 17:23:31 UTC 
(rev 26223)
@@ -226,11 +226,17 @@
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *config)
 {
+  char *hostfile;
+
+  hostfile = NULL;
+#ifndef WITH_LL
   if (NULL == args[0])
   {
     fprintf (stderr, _("No hosts-file specified on command line\n"));
     return;
   }
+  hostfile = args[0];
+#endif
   if (0 == num_peers)
   {
     result = GNUNET_OK;
@@ -240,7 +246,7 @@
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_TESTBED_run (args[0], cfg, num_peers, event_mask, controller_event_cb,
+  GNUNET_TESTBED_run (hostfile, cfg, num_peers, event_mask, 
controller_event_cb,
                       NULL, &test_run, NULL);
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &do_abort,
@@ -265,15 +271,20 @@
      GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails},
     GNUNET_GETOPT_OPTION_END
   };
+#ifdef WITH_LL
+  const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS]";
+#else
+  const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS] hosts-file";
+#endif
+
   int ret;
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
   result = GNUNET_SYSERR;
   ret =
-      GNUNET_PROGRAM_run (argc, argv,
-                          "gnunet-testbed-profiler [OPTIONS] hosts-file",
-                          _("Profiler for testbed"), options, &run, NULL);
+      GNUNET_PROGRAM_run (argc, argv, binaryHelp, _("Profiler for testbed"),
+                          options, &run, NULL);
   GNUNET_free ((void *) argv);
   if (GNUNET_OK != ret)
     return ret;

Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c    2013-02-27 17:05:47 UTC (rev 
26222)
+++ gnunet/src/testbed/testbed_api_testbed.c    2013-02-27 17:23:31 UTC (rev 
26223)
@@ -1050,6 +1050,16 @@
   GNUNET_assert (num_peers > 0);
   rc = GNUNET_malloc (sizeof (struct RunContext));
   rc->cfg = GNUNET_CONFIGURATION_dup (cfg);
+#ifdef WITH_LL
+  rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg,
+                                                              &rc->hosts);
+  if (0 == rc->num_hosts)
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+           _("No hosts loaded from LoadLeveler. Need at least one host\n"));
+    goto error_cleanup;
+  }
+#else
   if (NULL != host_filename)
   {
     rc->num_hosts =
@@ -1064,6 +1074,7 @@
   }
   else
     rc->h = GNUNET_TESTBED_host_create (NULL, NULL, rc->cfg, 0);
+#endif
   rc->num_peers = num_peers;
   rc->event_mask = event_mask;
   rc->cc = cc;