[GNUnet-SVN] r26990 - gnunet/src/regex

[gnunet]

Author: bartpolot
Date: 2013-04-26 08:55:09 +0200 (Fri, 26 Apr 2013)
New Revision: 26990

Modified:
   gnunet/src/regex/gnunet-regex-profiler.c
Log:
- add feedback for testbed setup

Modified: gnunet/src/regex/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/regex/gnunet-regex-profiler.c    2013-04-25 08:10:22 UTC (rev 
26989)
+++ gnunet/src/regex/gnunet-regex-profiler.c    2013-04-26 06:55:09 UTC (rev 
26990)
@@ -1122,7 +1122,31 @@
       GNUNET_SCHEDULER_add_delayed (search_timeout_time, &search_timeout, 
NULL);
 }
 
+/**
+ * Function that will be called whenever something in the testbed changes.
+ *
+ * @param cls closure, NULL
+ * @param event information on what is happening
+ */
+static void
+master_controller_cb (void *cls, 
+                      const struct GNUNET_TESTBED_EventInformation *event)
+{
+  switch (event->type)
+  {
+  case GNUNET_TESTBED_ET_CONNECT:
+    printf(".");
+    break;
+  case GNUNET_TESTBED_ET_PEER_START:
+    printf("#");
+    break;
+  default:
+    break;
+  }
+  fflush(stdout);
+}
 
+
 
/******************************************************************************/
 /***************************  TESTBED PEER SETUP  
*****************************/
 
/******************************************************************************/
@@ -1328,17 +1352,17 @@
   }
 
   event_mask = 0LL;
-/* For feedback about the start process activate these and pass master_cb
+/* For feedback about the start process activate these and pass master_cb */
   event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
-  event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
+//   event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
-  event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT);*/
+//   event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT);
   prof_start_time = GNUNET_TIME_absolute_get ();
   GNUNET_TESTBED_run (args[0],
                       cfg,
                       num_peers,
                       event_mask,
-                      NULL,     /* master_controller_cb, */
+                      &master_controller_cb,
                       NULL,     /* master_controller_cb cls */
                       &test_master,
                       NULL);    /* test_master cls */