#include "gnunet_core_service.h"
#include "gnunet_os_lib.h"
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
#define DELAY_FOR_LOGGING GNUNET_NO
/**
* How long until we fail the whole testcase?
*/
-#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
+#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 240)
/**
* How long until we give up on starting the peers?
*/
#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
-#define MAX_OUTSTANDING_CONNECTIONS 300
+#define MAX_OUTSTANDING_CONNECTIONS 100
static float fail_percentage = 0.05;
static unsigned long long num_peers;
+static unsigned int topology_connections;
+
static unsigned int total_connections;
static unsigned int failed_connections;
static char *dotOutFileName;
+static struct GNUNET_TIME_Relative settle_time;
+
static FILE *dotOutFile;
static char *topology_string;
}
#endif
+
static void
finish_testing ()
{
"Called finish testing, stopping daemons.\n");
#endif
- int count;
- count = 0;
pos = test_messages;
while (pos != NULL)
{
GNUNET_free(free_pos);
}
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmit_ready's scheduled %d, failed %d, transmit_ready's called %d\n", transmit_ready_scheduled, transmit_ready_failed, transmit_ready_called);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmit_ready's scheduled %d, failed %d, transmit_ready's called %d\n", transmit_ready_scheduled, transmit_ready_failed, transmit_ready_called);
#endif
#if VERBOSE
total_server_connections -= 2;
}
+static void stats_finished (void *cls, int result)
+{
+ GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
+}
+
+/**
+ * Callback function to process statistic values.
+ *
+ * @param cls closure
+ * @param peer the peer the statistics belong to
+ * @param subsystem name of subsystem that created the statistic
+ * @param name the name of the datum
+ * @param value the current value
+ * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
+ * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ */
+static int stats_print (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const char *subsystem,
+ const char *name,
+ uint64_t value,
+ int is_persistent)
+{
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s:%s:%s -- %llu\n", GNUNET_i2s(peer), subsystem, name, value);
+ return GNUNET_OK;
+}
+
+static void topology_cb (void *cls,
+ const struct GNUNET_PeerIdentity *first,
+ const struct GNUNET_PeerIdentity *second,
+ struct GNUNET_TIME_Relative latency,
+ uint32_t distance,
+ const char *emsg)
+{
+ FILE *outfile;
+ outfile = cls;
+ if (first != NULL)
+ {
+ if (outfile != NULL)
+ {
+ fprintf(outfile, "\t\"%s\" -- ", GNUNET_i2s(first));
+ fprintf(outfile, "\"%s\";\n", GNUNET_i2s(second));
+ }
+ topology_connections++;
+ }
+ else
+ {
+ fprintf(stderr, "Finished iterating over topology, %d total connections!\n", topology_connections);
+ if (outfile != NULL)
+ {
+ fprintf(outfile, "}\n");
+ fclose(outfile);
+ GNUNET_TESTING_get_statistics(pg, &stats_finished, &stats_print, NULL);
+ //GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
+ }
+ }
+}
+
static int
process_mtype (void *cls,
const struct GNUNET_PeerIdentity *peer,
struct GNUNET_TIME_Relative latency,
uint32_t distance)
{
+ char *dotOutFileNameFinished;
+ FILE *dotOutFileFinished;
struct TestMessageContext *pos = cls;
struct GNUNET_TestMessage *msg = (struct GNUNET_TestMessage *)message;
if (pos->uid != ntohl(msg->uid))
fprintf(stdout, "100%%]\n");
#endif
GNUNET_SCHEDULER_cancel (sched, die_task);
- GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
+ GNUNET_asprintf(&dotOutFileNameFinished, "%s.dot", "final_topology");
+ dotOutFileFinished = fopen (dotOutFileNameFinished, "w");
+ GNUNET_free(dotOutFileNameFinished);
+ if (dotOutFileFinished != NULL)
+ {
+ fprintf(dotOutFileFinished, "strict graph G {\n");
+ }
+ topology_connections = 0;
+ GNUNET_TESTING_get_topology (pg, &topology_cb, dotOutFileFinished);
+ //GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
}
else
{
GNUNET_free(free_pos);
}
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmit_ready's scheduled %d, failed %d, transmit_ready's called %d\n", transmit_ready_scheduled, transmit_ready_failed, transmit_ready_called);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Total messages received %d, expected %d.\n", total_messages_received, expected_messages);
+#endif
+
if (pg != NULL)
{
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
* Connect to the receiving peer
*/
pos->peer2handle = GNUNET_CORE_connect (sched,
- pos->peer2->cfg,
- TIMEOUT,
- pos,
- &init_notify_peer2,
- NULL,
- NULL,
- NULL,
- GNUNET_YES, NULL, GNUNET_YES, handlers);
+ pos->peer2->cfg,
+ TIMEOUT,
+ pos,
+ &init_notify_peer2,
+ NULL,
+ NULL,
+ NULL, NULL,
+ GNUNET_YES, NULL, GNUNET_YES, handlers);
}
{
struct TestMessageContext *pos = cls;
+ if ((pos == test_messages) && (settle_time.value > 0))
+ {
+ topology_connections = 0;
+ GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
+ }
if ((tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) || (cls == NULL))
return;
{
die_task = GNUNET_SCHEDULER_add_delayed (sched,
TEST_TIMEOUT,
- &end_badly, "from create topology (timeout)");
+ &end_badly, "from send test messages (timeout)");
}
if (total_server_connections >= MAX_OUTSTANDING_CONNECTIONS)
TIMEOUT,
pos,
&init_notify_peer1,
- NULL,
+ NULL, NULL,
NULL,
NULL,
GNUNET_NO, NULL, GNUNET_NO, no_handlers);
&send_test_messages, test_messages);
gather_log_data();
#else
- GNUNET_SCHEDULER_add_now (sched, &send_test_messages, test_messages);
+ if (settle_time.value > 0)
+ {
+ GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
+ }
+ GNUNET_SCHEDULER_add_delayed (sched, settle_time, &send_test_messages, test_messages);
#endif
#if VERBOSE
fprintf(stdout, "Test message progress: [");
char * blacklist_topology_str;
char * connect_topology_option_str;
char * connect_topology_option_modifier_string;
+ unsigned long long temp_settle;
sched = s;
ok = 1;
GNUNET_free_non_null(topology_str);
GNUNET_free_non_null(blacklist_topology_str);
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time",
+ &temp_settle))
+ settle_time = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, temp_settle);
+
if (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
&num_peers))
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers),
&end_badly, "didn't generate all hostkeys within a reasonable amount of time!!!");
+ GNUNET_assert(num_peers > 0 && num_peers < (unsigned int)-1);
pg = GNUNET_TESTING_daemons_start (sched, cfg,
peers_left, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers), &hostkey_callback, NULL, &peers_started_callback, NULL,
&topology_callback, NULL, NULL);
char *our_binary_name;
binary_start_pos = rindex(argv[0], '/');
+ GNUNET_assert(binary_start_pos != NULL);
topology_string = strstr (binary_start_pos,
"_topology");
GNUNET_assert (topology_string != NULL);
projects / oweals / gnunet.git / blobdiff