#include "gnunet_core_service.h"
#include "gnunet_os_lib.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define DELAY_FOR_LOGGING GNUNET_NO
*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 500)
-#define SECONDS_PER_PEER_START 45
+#define SECONDS_PER_PEER_START 120
#define DEFAULT_NUM_PEERS 4
{
char *peer_number;
char *connect_number;
- pid_t mem_process;
+ struct GNUNET_OS_Process *mem_process;
GNUNET_asprintf(&peer_number, "%llu", num_peers);
GNUNET_asprintf(&connect_number, "%llu", expected_connections);
mem_process = GNUNET_OS_start_process (NULL, NULL, "./memsize.pl",
"memsize.pl", "totals.txt", peer_number, connect_number, NULL);
- GNUNET_OS_process_wait(mem_process);
+ GNUNET_OS_process_wait (mem_process);
+ GNUNET_OS_process_close (mem_process);
+ mem_process = NULL;
}
#endif
static void stats_finished (void *cls, int result)
{
- fprintf(stderr, "Finished getting all peers statistics!\n");
GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
}
uint64_t value,
int is_persistent)
{
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s:%s:%s -- %llu\n", GNUNET_i2s(peer), subsystem, name, value);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s:%s:%s -- %llu\n", GNUNET_i2s(peer), subsystem, name, value);
return GNUNET_OK;
}
{
struct TestMessageContext *pos = cls;
- if ((pos == test_messages) && (settle_time.value > 0))
+ if ((pos == test_messages) && (settle_time.rel_value > 0))
{
topology_connections = 0;
GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
&send_test_messages, test_messages);
gather_log_data();
#else
- if (settle_time.value > 0)
+ if (settle_time.rel_value > 0)
{
GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
}
}
}
+static void topology_creation_finished (void *cls,
+ const char *emsg)
+{
+#if VERBOSE
+ if (emsg == NULL)
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "All topology connections created successfully!\n");
+#endif
+}
+
static void
connect_topology ()
{
expected_connections = -1;
if ((pg != NULL) && (peers_left == 0))
{
- expected_connections = GNUNET_TESTING_connect_topology (pg, connection_topology, connect_topology_option, connect_topology_option_modifier);
+ expected_connections = GNUNET_TESTING_connect_topology (pg, connection_topology, connect_topology_option, connect_topology_option_modifier, &topology_creation_finished, NULL);
#if VERBOSE > 1
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Have %d expected connections\n", expected_connections);
modnum = num_peers / 4;
dotnum = (num_peers / 50) + 1;
#if VERBOSE
- fprintf (stdout, "Hostkey generation progress: \[");
+ fprintf (stdout, "Hostkey generation progress: [");
#endif
/* Set up a task to end testing if peer start fails */
die_task = GNUNET_SCHEDULER_add_delayed (sched,