#include "platform.h"
#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#include "gnunet_testbed_service.h"
#include "testbed_api_hosts.h"
if (NULL != reg_handle)
GNUNET_TESTBED_cancel_registration (reg_handle);
if (NULL != topology_op)
- GNUNET_TESTBED_operation_cancel (topology_op);
+ GNUNET_TESTBED_operation_done (topology_op);
for (nhost = 0; nhost < num_hosts; nhost++)
if (NULL != hosts[nhost])
GNUNET_TESTBED_host_destroy (hosts[nhost]);
GNUNET_free_non_null (hosts);
while (NULL != (dll_op = dll_op_head))
{
- GNUNET_TESTBED_operation_cancel (dll_op->op);
+ GNUNET_TESTBED_operation_done (dll_op->op);
GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
GNUNET_free (dll_op);
}
num_peers, ((double) prof_time.rel_value) / 1000.00);
fflush (stdout);
result = GNUNET_OK;
- if (0 == num_links)
+ if ((0 == num_links) && (topology == GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI))
{
shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
topology,
GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY,
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
+ num_links = num_peers * (num_peers - 1);
break;
default:
GNUNET_assert (0);
}
break;
case STATE_PEERS_LINKING:
- switch (event->type)
+ switch (event->type)
{
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
/* Control reaches here when a peer linking operation fails */
print_overlay_links_summary ();
GNUNET_SCHEDULER_cancel (abort_task);
abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return;
}
}
break;
printf (".");
fflush (stdout);
established_links++;
- if ((established_links + failed_links) ==
- (GNUNET_TESTBED_TOPOLOGY_CLIQUE == topology ?
- num_peers * (num_peers -1) : num_links))
- {
- print_overlay_links_summary ();
- result = GNUNET_OK;
- shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
- }
}
break;
default:
GNUNET_assert (0);
}
+ if ((established_links + failed_links) == num_links)
+ {
+ print_overlay_links_summary ();
+ result = GNUNET_OK;
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
break;
default:
GNUNET_assert (0);
}
for (nhost = 0; nhost < num_hosts; nhost++)
{
- if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost]))
+ if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost], config))
{
fprintf (stderr, _("Host %s cannot start testbed\n"),
GNUNET_TESTBED_host_get_hostname_ (hosts[nhost]));
*val = GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI;
return GNUNET_OK;
}
- FPRINTF (stderr, _("Only `CLIQUE' and `RANDOM' are permitted"));
+ FPRINTF (stderr, "%s", _("Only `CLIQUE' and `RANDOM' are permitted.\n"));
return GNUNET_SYSERR;
}
gettext_noop ("Try to acheive TOPOLOGY. This options takes either CLIQUE "
"or RANDOM. For CLIQUE the parameter -n is ignored. The "
"default is to acheive a random graph topology."),
- GNUNET_YES, &GNUNET_GETOPT_set_string, &topology },
+ GNUNET_YES, &set_topology, &topology },
GNUNET_GETOPT_OPTION_END
};
int ret;
GNUNET_PROGRAM_run (argc, argv, "gnunet-testbed-profiler [OPTIONS] hosts-file",
_("Profiler for testbed"),
options, &run, NULL);
+ GNUNET_free ((void*) argv);
if (GNUNET_OK != ret)
return ret;
if (GNUNET_OK != result)