- 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 fd4f3885eaa6a3b935202a0a1f665683b72f2d18..04da080761f847dc8a7e46e96c38a68221d220e0 100644 (file)
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -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
 };
 
 
@@ -256,6 +262,9 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
+
+
+
 /**
  * Functions of this signature are called when a peer has been successfully
  * started or stopped.
@@ -443,8 +452,10 @@ controller_event_cb (void *cls,
       {
         LOG (GNUNET_ERROR_TYPE_WARNING,
              _("An operation has failed while linking\n"));
-        GNUNET_SCHEDULER_cancel (abort_task);
-        abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+        /* GNUNET_SCHEDULER_cancel (abort_task); */
+        /* abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); */
+       printf ("F");
+       fflush (stdout);
       }
       break;
     case GNUNET_TESTBED_ET_CONNECT:
@@ -452,12 +463,9 @@ controller_event_cb (void *cls,
         static unsigned int established_links;
 
        if (0 == established_links)
-         printf ("Establishing links\n .");
-       else
-       {
-         printf (".");
-         fflush (stdout);
-       }
+         printf ("Establishing links. Please wait\n");
+       printf (".");
+       fflush (stdout);
         if (++established_links == num_links)
         {
           prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);