tracking forwarded operations

[oweals/gnunet.git] / src / testbed / test_testbed_api_topology.c

diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index 70a97249715f95bb6285477fef9b9c4c927b8964..8e673d29378d5e158c25e558bc533643b47de096 100644 (file)
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -31,7 +31,7 @@
 /**
  * Number of peers we want to start
  */
-#define NUM_PEERS 5
+#define NUM_PEERS 50
 
 /**
  * Array of peers
@@ -43,6 +43,11 @@ static struct GNUNET_TESTBED_Peer **peers;
  */
 static struct GNUNET_TESTBED_Operation *op;
 
+/**
+ * Shutdown task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
 /**
  * Testing result
  */
@@ -63,6 +68,7 @@ static unsigned int overlay_connects;
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  shutdown_task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != op)
   {
     GNUNET_TESTBED_operation_done (op);
@@ -85,14 +91,25 @@ controller_event_cb (void *cls,
   {
   case GNUNET_TESTBED_ET_CONNECT:
     overlay_connects++;
-    if ((NUM_PEERS - 1) == overlay_connects)
+    if ((NUM_PEERS) == overlay_connects)
     {
       result = GNUNET_OK;
       GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     }
     break;
+  case GNUNET_TESTBED_ET_OPERATION_FINISHED:
+    GNUNET_assert (NULL != event->details.operation_finished.emsg);
+    break;
   default:
-    GNUNET_assert (0);
+    GNUNET_break (0);
+    if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && 
+        (NULL != event->details.operation_finished.emsg))
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "An operation failed with error: %s\n",
+                  event->details.operation_finished.emsg);
+    result = GNUNET_SYSERR;
+    GNUNET_SCHEDULER_cancel (shutdown_task);
+    shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
   }  
 }
 
@@ -118,8 +135,12 @@ test_master (void *cls, unsigned int num_peers,
   peers = peers_;
   overlay_connects = 0;
   op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
-                                                 GNUNET_TESTBED_TOPOLOGY_LINE);
+                                                 GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
+                                                  NUM_PEERS);
   GNUNET_assert (NULL != op);
+  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                                (GNUNET_TIME_UNIT_SECONDS, 120),
+                                                do_shutdown, NULL);
 }