clique topology optimization, progress meter for connecting

[oweals/gnunet.git] / src / testing / test_testing_topology.c

diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c
index f9d5fb9af07cf939bac4e3a03e20377a4fd92914..b328873f23d90393c4267a31e302164cca867c19 100644 (file)
--- a/src/testing/test_testing_topology.c
+++ b/src/testing/test_testing_topology.c
@@ -28,6 +28,8 @@
 
 #define VERBOSE GNUNET_NO
 
+#define PROGRESS_BARS GNUNET_YES
+
 #define DELAY_FOR_LOGGING GNUNET_NO
 
 /**
@@ -52,6 +54,10 @@ static int ok;
 
 static unsigned long long num_peers;
 
+struct GNUNET_TIME_Relative connect_timeout;
+
+static unsigned long long connect_attempts;
+
 static unsigned int topology_connections;
 
 static unsigned int total_connections;
@@ -279,6 +285,7 @@ disconnect_cores (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   total_server_connections -= 2;
 }
 
+#if DO_STATS
 static void
 stats_finished (void *cls, int result)
 {
@@ -306,6 +313,7 @@ stats_print (void *cls,
               GNUNET_i2s (peer), subsystem, name, value);
   return GNUNET_OK;
 }
+#endif
 
 static void
 topology_cb (void *cls,
@@ -331,9 +339,11 @@ topology_cb (void *cls,
         {
           fprintf (outfile, "}\n");
           fclose (outfile);
+#if DO_STATS
           GNUNET_TESTING_get_statistics (pg, &stats_finished, &stats_print,
                                          NULL);
-          //GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
+#endif
+          GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
         }
     }
 }
@@ -351,7 +361,7 @@ process_mtype (void *cls,
   if (pos->uid != ntohl (msg->uid))
     return GNUNET_OK;
 
-#if VERBOSE
+#if PROGRESS_BARS
   if ((total_messages_received) % modnum == 0)
     {
       if (total_messages_received == 0)
@@ -382,7 +392,7 @@ process_mtype (void *cls,
 
   if (total_messages_received == expected_messages)
     {
-#if VERBOSE
+#if PROGRESS_BARS
       fprintf (stdout, "100%%]\n");
 #endif
       GNUNET_SCHEDULER_cancel (die_task);
@@ -683,7 +693,7 @@ topology_callback (void *cls,
   struct TestMessageContext *temp_context;
   if (emsg == NULL)
     {
-#if VERBOSE
+#if PROGRESS_BARS
       if ((total_connections) % modnum == 0)
         {
           if (total_connections == 0)
@@ -730,7 +740,7 @@ topology_callback (void *cls,
 
   if (total_connections == expected_connections)
     {
-#if VERBOSE
+#if PROGRESS_BARS
       fprintf (stdout, "100%%]\n");
 #endif
 #if VERBOSE
@@ -740,6 +750,10 @@ topology_callback (void *cls,
 #endif
       modnum = expected_messages / 4;
       dotnum = (expected_messages / 50) + 1;
+      if (modnum == 0)
+        modnum = 1;
+      if (dotnum == 0)
+        dotnum = 1;
       GNUNET_SCHEDULER_cancel (die_task);
       die_task = GNUNET_SCHEDULER_NO_TASK;
 #if DELAY_FOR_LOGGING
@@ -756,7 +770,7 @@ topology_callback (void *cls,
       GNUNET_SCHEDULER_add_delayed (settle_time, &send_test_messages,
                                     test_messages);
 #endif
-#if VERBOSE
+#if PROGRESS_BARS
       fprintf (stdout, "Test message progress: [");
 #endif
 
@@ -810,27 +824,36 @@ connect_topology ()
         GNUNET_TESTING_connect_topology (pg, connection_topology,
                                          connect_topology_option,
                                          connect_topology_option_modifier,
+                                         connect_timeout,
+                                         connect_attempts,
                                          &topology_creation_finished, NULL);
-#if VERBOSE > 1
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+#if PROGRESS_BARS
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Have %d expected connections\n", expected_connections);
 #endif
     }
 
   GNUNET_SCHEDULER_cancel (die_task);
-  if (expected_connections == GNUNET_SYSERR)
+  if (expected_connections < 1)
     {
       die_task =
         GNUNET_SCHEDULER_add_now (&end_badly,
                                   "from connect topology (bad return)");
+      return;
     }
 
-  die_task = GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT,
+  die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                           (GNUNET_TIME_UNIT_SECONDS,
+                                            SECONDS_PER_PEER_START * num_peers),
                                            &end_badly,
                                            "from connect topology (timeout)");
   modnum = expected_connections / 4;
   dotnum = (expected_connections / 50) + 1;
-#if VERBOSE
+  if (modnum == 0)
+    modnum = 1;
+  if (dotnum == 0)
+    dotnum = 1;
+#if PROGRESS_BARS
   fprintf (stdout, "Peer connection progress: [");
 #endif
 }
@@ -843,7 +866,7 @@ create_topology ()
       (pg, topology, blacklist_topology,
        blacklist_transports) != GNUNET_SYSERR)
     {
-#if VERBOSE
+#if PROGRESS_BARS
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Topology set up, now starting peers!\n");
       fprintf (stdout, "Daemon start progress [");
@@ -858,7 +881,9 @@ create_topology ()
                                   "from create topology (bad return)");
     }
   GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT,
+  die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                           (GNUNET_TIME_UNIT_SECONDS,
+                                            SECONDS_PER_PEER_START * num_peers),
                                            &end_badly,
                                            "from continue startup (timeout)");
 }
@@ -881,7 +906,7 @@ peers_started_callback (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Started daemon %llu out of %llu\n",
               (num_peers - peers_left) + 1, num_peers);
 #endif
-#if VERBOSE
+#if PROGRESS_BARS
   if ((num_peers - peers_left) % modnum == 0)
     {
       if (num_peers - peers_left == 0)
@@ -901,7 +926,7 @@ peers_started_callback (void *cls,
   peers_left--;
   if (peers_left == 0)
     {
-#if VERBOSE
+#if PROGRESS_BARS
       fprintf (stdout, "100%%]\n");
 #endif
 #if VERBOSE
@@ -954,7 +979,7 @@ hostkey_callback (void *cls,
               num_peers - peers_left, num_peers, GNUNET_i2s (id));
 #endif
 
-#if VERBOSE
+#if PROGRESS_BARS
   if ((num_peers - peers_left) % modnum == 0)
     {
       if (num_peers - peers_left == 0)
@@ -974,7 +999,7 @@ hostkey_callback (void *cls,
   peers_left--;
   if (peers_left == 0)
     {
-#if VERBOSE
+#if PROGRESS_BARS
       fprintf (stdout, "100%%]\n");
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "All %d hostkeys created, now creating topology!\n",
@@ -1002,6 +1027,7 @@ run (void *cls,
   char *connect_topology_option_str;
   char *connect_topology_option_modifier_string;
   unsigned long long temp_settle;
+  unsigned long long max_outstanding_connections;
   ok = 1;
 
   dotOutFile = fopen (dotOutFileName, "w");
@@ -1107,6 +1133,34 @@ run (void *cls,
     settle_time =
       GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
 
+  if (GNUNET_OK ==
+      GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout",
+                                             &temp_settle))
+    connect_timeout =
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
+  else
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", "testing", "connect_timeout");
+      return;
+    }
+
+
+  if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_attempts",
+                                               &connect_attempts))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", "testing", "connect_attempts");
+      return;
+    }
+
+  if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "max_outstanding_connections",
+                                               &max_outstanding_connections))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", "testing", "max_outstanding_connections");
+      return;
+    }
+
   if (GNUNET_SYSERR ==
       GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
                                              &num_peers))
@@ -1117,7 +1171,11 @@ run (void *cls,
   peers_left = num_peers;
   modnum = num_peers / 4;
   dotnum = (num_peers / 50) + 1;
-#if VERBOSE
+  if (modnum == 0)
+    modnum = 1;
+  if (dotnum == 0)
+    dotnum = 1;
+#if PROGRESS_BARS
   fprintf (stdout, "Hostkey generation progress: [");
 #endif
   /* Set up a task to end testing if peer start fails */
@@ -1130,6 +1188,8 @@ run (void *cls,
 
   GNUNET_assert (num_peers > 0 && num_peers < (unsigned int) -1);
   pg = GNUNET_TESTING_daemons_start (cfg,
+                                     peers_left,
+                                     max_outstanding_connections,
                                      peers_left,
                                      GNUNET_TIME_relative_multiply
                                      (GNUNET_TIME_UNIT_SECONDS,
@@ -1180,7 +1240,7 @@ main (int argc, char *argv[])
   char *binary_start_pos;
   char *our_binary_name;
 
-  binary_start_pos = rindex (argv[0], '/');
+  binary_start_pos = strchr (argv[0], '/');
   GNUNET_assert (binary_start_pos != NULL);
   topology_string = strstr (binary_start_pos, "_topology");
   GNUNET_assert (topology_string != NULL);