extended overlay configure topology to return max connections

7 files changed, 30 insertions, 29 deletions

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 12f699975..91fb424c4 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -1062,6 +1062,8 @@ GNUNET_TESTBED_overlay_connect (void *op_cls,
  * @param op_cls closure argument to give with the operation event
  * @param num_peers number of peers in 'peers'
  * @param peers array of 'num_peers' with the peers to configure
+ * @param max_connections the maximums number of overlay connections that will
+ *          be made to achieve the given topology
  * @param topo desired underlay topology to use
  * @param va topology-specific options
  * @return handle to the operation, NULL if connecting these
@@ -1072,6 +1074,7 @@ struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
                                               unsigned int num_peers,
                                               struct GNUNET_TESTBED_Peer **peers,
+                                              unsigned int *max_connections,
                                               enum GNUNET_TESTBED_TopologyOption topo,
                                               va_list va);
 
@@ -1084,6 +1087,8 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
  * @param op_cls closure argument to give with the operation event
  * @param num_peers number of peers in 'peers'
  * @param peers array of 'num_peers' with the peers to configure
+ * @param max_connections the maximums number of overlay connections that will
+ *          be made to achieve the given topology
  * @param topo desired underlay topology to use
  * @param ... topology-specific options
  * @return handle to the operation, NULL if connecting these
@@ -1094,6 +1099,7 @@ struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_overlay_configure_topology (void *op_cls,
                                            unsigned int num_peers,
                                            struct GNUNET_TESTBED_Peer **peers,
+                                           unsigned int *max_connections,
                                            enum GNUNET_TESTBED_TopologyOption topo,
                                            ...);
 
diff --git a/src/mesh/gnunet-regex-profiler.c b/src/mesh/gnunet-regex-profiler.c
index 1e785b888..0733e267f 100644
--- a/src/mesh/gnunet-regex-profiler.c
+++ b/src/mesh/gnunet-regex-profiler.c
@@ -1109,6 +1109,7 @@ do_configure_topology (void *cls,
   prof_start_time = GNUNET_TIME_absolute_get ();
   topology_op =
     GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peer_handles,
+                                               NULL,
                                                GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
                                                num_links,
                                                GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY,
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 9bfeaddd2..083926cbf 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -345,7 +345,7 @@ peer_churn_cb (void *cls, const char *emsg)
     {
     case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI:
       topology_op =
-          GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers,
+          GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers, NULL,
                                                      topology,
                                                      num_links,
                                                      GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY,
@@ -353,7 +353,7 @@ peer_churn_cb (void *cls, const char *emsg)
       break;
     case GNUNET_TESTBED_TOPOLOGY_CLIQUE:
       topology_op =
-          GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers,
+          GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers, NULL,
                                                      topology,
                                                      GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY,
                                                      GNUNET_TESTBED_TOPOLOGY_OPTION_END);
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index 7166bf266..5efaf8137 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -134,7 +134,7 @@ test_master (void *cls, unsigned int num_peers,
     GNUNET_assert (NULL != peers_[peer]);
   peers = peers_;
   overlay_connects = 0;
-  op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
+  op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL,
                                                   GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
                                                   NUM_PEERS, GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   GNUNET_assert (NULL != op);
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c
index 83687f337..2fbf48729 100644
--- a/src/testbed/test_testbed_api_topology_clique.c
+++ b/src/testbed/test_testbed_api_topology_clique.c
@@ -130,6 +130,7 @@ test_master (void *cls, unsigned int num_peers,
   peers = peers_;
   overlay_connects = 0;
   op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
+                                                  NULL,
                                                   GNUNET_TESTBED_TOPOLOGY_CLIQUE,
                                                   /* GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, */
                                                   /* NUM_PEERS, */ 
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 20633378d..f195baa1c 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -217,6 +217,11 @@ struct RunContext
    * Expected overlay connects. Should be zero if no topology is relavant
    */
   unsigned int num_oc;
+
+  /**
+   * Number of random links to established
+   */
+  unsigned int random_links;
   
 };
 
@@ -444,29 +449,13 @@ call_cc:
          || (GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING == rc->topology)
          || (GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD == rc->topology))
     {
-      unsigned int rand_links;
-      
-      switch (rc->topology)
-      {
-      case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI:
-        rand_links = rc->num_oc;
-        break;
-      case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING:
-        rand_links = rc->num_oc - rc->num_peers;
-        break;
-      case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD:
-        rand_links = GNUNET_TESTBED_2dtorus_calc_links (rc->num_peers, NULL, NULL);
-        break;
-      default:
-        GNUNET_break (0);
-        rand_links = 0;
-      }
       rc->topology_operation =
           GNUNET_TESTBED_overlay_configure_topology (NULL,
                                                      rc->num_peers,
                                                      rc->peers,
+                                                     &rc->num_oc,
                                                      rc->topology,
-                                                     rand_links,
+                                                     rc->random_links,
                                                      GNUNET_TESTBED_TOPOLOGY_OPTION_END);
     }
     else
@@ -474,6 +463,7 @@ call_cc:
           GNUNET_TESTBED_overlay_configure_topology (NULL,
                                                      rc->num_peers,
                                                      rc->peers,
+                                                     &rc->num_oc,
                                                      rc->topology,
                                                      GNUNET_TESTBED_TOPOLOGY_OPTION_END);
     if (NULL == rc->topology_operation)
@@ -672,32 +662,26 @@ GNUNET_TESTBED_run (const char *host_filename,
     else if (0 == strcasecmp (topology, "SMALL_WORLD_RING"))
     {
       rc->topology = GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING;
-      rc->num_oc = num_peers;
     }
     else if (0 == strcasecmp (topology, "SMALL_WORLD"))
     {
       rc->topology = GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD;
-      rc->num_oc = GNUNET_TESTBED_2dtorus_calc_links (num_peers, NULL, NULL);
     }
     else if (0 == strcasecmp (topology, "CLIQUE"))
     {
       rc->topology = GNUNET_TESTBED_TOPOLOGY_CLIQUE;
-      rc->num_oc = num_peers * (num_peers - 1);
     }
     else if (0 == strcasecmp (topology, "LINE"))
     {
       rc->topology = GNUNET_TESTBED_TOPOLOGY_LINE;
-      rc->num_oc = num_peers - 1;
     }
     else if (0 == strcasecmp (topology, "RING"))
     {
       rc->topology = GNUNET_TESTBED_TOPOLOGY_RING;
-      rc->num_oc = num_peers;
     }
     else if (0 == strcasecmp (topology, "2D_TORUS"))
     {
       rc->topology = GNUNET_TESTBED_TOPOLOGY_2D_TORUS;
-      rc->num_oc = GNUNET_TESTBED_2dtorus_calc_links (num_peers, NULL, NULL);
     }
     else
       LOG (GNUNET_ERROR_TYPE_WARNING,
@@ -724,7 +708,7 @@ GNUNET_TESTBED_run (const char *host_filename,
       GNUNET_free (rc);
       return;
     }
-    rc->num_oc += (unsigned int) random_links;
+    rc->random_links = (unsigned int) random_links;
   }
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &shutdown_run_task, rc);
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 17fb7070a..2c1e7b1bc 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -527,6 +527,8 @@ GNUNET_TESTBED_underlay_configure_topology (void *op_cls,
  * @param op_cls closure argument to give with the operation event
  * @param num_peers number of peers in 'peers'
  * @param peers array of 'num_peers' with the peers to configure
+ * @param max_connections the maximums number of overlay connections that will
+ *          be made to achieve the given topology
  * @param topo desired underlay topology to use
  * @param va topology-specific options
  * @return handle to the operation, NULL if connecting these
@@ -537,6 +539,7 @@ struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
                                               unsigned int num_peers,
                                               struct GNUNET_TESTBED_Peer **peers,
+                                              unsigned int *max_connections,
                                               enum GNUNET_TESTBED_TopologyOption
                                               topo, va_list va)
 {
@@ -637,6 +640,8 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
   GNUNET_TESTBED_operation_queue_insert_
       (c->opq_parallel_topology_config_operations, op);
   GNUNET_TESTBED_operation_begin_wait_ (op);
+  if (NULL != max_connections)
+    *max_connections = tc->link_array_size;
   return op;
 }
 
@@ -649,6 +654,8 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
  * @param op_cls closure argument to give with the operation event
  * @param num_peers number of peers in 'peers'
  * @param peers array of 'num_peers' with the peers to configure
+ * @param max_connections the maximums number of overlay connections that will
+ *          be made to achieve the given topology
  * @param topo desired underlay topology to use
  * @param ... topology-specific options
  * @return handle to the operation, NULL if connecting these
@@ -658,6 +665,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_overlay_configure_topology (void *op_cls, unsigned int num_peers,
                                            struct GNUNET_TESTBED_Peer **peers,
+                                           unsigned int *max_connections,
                                            enum GNUNET_TESTBED_TopologyOption
                                            topo, ...)
 {
@@ -667,7 +675,8 @@ GNUNET_TESTBED_overlay_configure_topology (void *op_cls, unsigned int num_peers,
   GNUNET_assert (topo < GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   va_start (vargs, topo);
   op = GNUNET_TESTBED_overlay_configure_topology_va (op_cls, num_peers, peers,
-                                                     topo, vargs);
+                                                     max_connections,
+                                                     topo, vargs);
   va_end (vargs);
   return op;
 }