- relaxed to accommodate overlay linking timeouts

[oweals/gnunet.git] / src / testbed / gnunet-testbed-profiler.c

diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 675912e137f6afdcc714fa8132fab57b9c6b6ee2..04da080761f847dc8a7e46e96c38a68221d220e0 100644 (file)
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -33,7 +33,7 @@
  * Generic loggins shorthand
  */
 #define LOG(kind,...)                                           \
-  GNUNET_log_from (kind, "testbed-api-testbed", __VA_ARGS__)
+  GNUNET_log (kind, __VA_ARGS__)
 
 /**
  * DLL of operations
@@ -90,7 +90,13 @@ enum State
   /**
    * Linking peers
    */
-  STATE_PEERS_LINKING
+  STATE_PEERS_LINKING,
+
+  /**
+   * Destroying peers; we can do this as the controller takes care of stopping a
+   * peer if it is running
+   */
+  STATE_PEERS_DESTROYING
 };
 
 
@@ -249,13 +255,16 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
+  LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
   abort_task = GNUNET_SCHEDULER_NO_TASK;
   result = GNUNET_SYSERR;
   GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
 }
 
 
+
+
+
 /**
  * Functions of this signature are called when a peer has been successfully
  * started or stopped.
@@ -442,22 +451,27 @@ controller_event_cb (void *cls,
       if (NULL != event->details.operation_finished.emsg)
       {
         LOG (GNUNET_ERROR_TYPE_WARNING,
-             _("An operation has failed while starting slaves\n"));
-        GNUNET_SCHEDULER_cancel (abort_task);
-        abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+             _("An operation has failed while linking\n"));
+        /* GNUNET_SCHEDULER_cancel (abort_task); */
+        /* abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); */
+       printf ("F");
+       fflush (stdout);
       }
       break;
     case GNUNET_TESTBED_ET_CONNECT:
       {
         static unsigned int established_links;
 
+       if (0 == established_links)
+         printf ("Establishing links. Please wait\n");
+       printf (".");
+       fflush (stdout);
         if (++established_links == num_links)
         {
           prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
-          printf ("%u links established in %.2f seconds\n",
+          printf ("\n%u links established in %.2f seconds\n",
                   num_links, ((double) prof_time.rel_value) / 1000.00);
-          GNUNET_TESTBED_operation_done (topology_op);
-          topology_op = NULL;
+         result = GNUNET_OK;
           GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
         }
       }