- Add periodic statistic readings to output

[oweals/gnunet.git] / src / nse / test_nse_multipeer.c

diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c
index 29e5cd6cc6a6ec6a6210bc36edad89580a84f194..435cdabf46c113ca1ea3d40e92a35c99d2e06887 100644 (file)
--- a/src/nse/test_nse_multipeer.c
+++ b/src/nse/test_nse_multipeer.c
@@ -29,7 +29,7 @@
 #include "gnunet_testing_lib.h"
 #include "gnunet_nse_service.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define NUM_PEERS 4
 
@@ -51,7 +51,7 @@ struct NSEPeer *peer_tail;
 /**
  * How long do we run the test?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
 static int ok;
 
@@ -72,8 +72,8 @@ shutdown_callback (void *cls, const char *emsg)
   if (emsg != NULL)
   {
 #if VERBOSE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Shutdown of peers failed: %s!\n", emsg);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed: %s!\n",
+                emsg);
 #endif
     if (ok == 0)
       ok = 666;
@@ -117,17 +117,15 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *
  */
 static void
-handle_estimate (void *cls,
-                 struct GNUNET_TIME_Absolute timestamp,
+handle_estimate (void *cls, struct GNUNET_TIME_Absolute timestamp,
                  double estimate, double std_dev)
 {
   struct NSEPeer *peer = cls;
 
   fprintf (stderr,
            "Received network size estimate from peer %s. logSize: %f std.dev. %f (%f/%u)\n",
-           GNUNET_i2s (&peer->daemon->id),
-           estimate,
-           std_dev, GNUNET_NSE_log_estimate_to_n (estimate), num_peers);
+           GNUNET_i2s (&peer->daemon->id), estimate, std_dev,
+           GNUNET_NSE_log_estimate_to_n (estimate), num_peers);
 }
 
 
@@ -144,9 +142,9 @@ connect_nse_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   {
     current_peer = GNUNET_malloc (sizeof (struct NSEPeer));
     current_peer->daemon = GNUNET_TESTING_daemon_get (pg, i);
-    current_peer->nse_handle = GNUNET_NSE_connect (current_peer->daemon->cfg,
-                                                   &handle_estimate,
-                                                   current_peer);
+    current_peer->nse_handle =
+        GNUNET_NSE_connect (current_peer->daemon->cfg, &handle_estimate,
+                            current_peer);
     GNUNET_assert (current_peer->nse_handle != NULL);
     GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, current_peer);
   }
@@ -169,8 +167,8 @@ my_cb (void *cls, const char *emsg)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Peer Group started successfully, connecting to NSE service for each peer!\n");
 #endif
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "Have %u connections\n", total_connections);
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have %u connections\n",
+              total_connections);
 
   GNUNET_SCHEDULER_add_now (&connect_nse_service, NULL);
 }
@@ -191,10 +189,8 @@ my_cb (void *cls, const char *emsg)
  * @param emsg error message (NULL on success)
  */
 static void
-connect_cb (void *cls,
-            const struct GNUNET_PeerIdentity *first,
-            const struct GNUNET_PeerIdentity *second,
-            uint32_t distance,
+connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
+            const struct GNUNET_PeerIdentity *second, uint32_t distance,
             const struct GNUNET_CONFIGURATION_Handle *first_cfg,
             const struct GNUNET_CONFIGURATION_Handle *second_cfg,
             struct GNUNET_TESTING_Daemon *first_daemon,
@@ -210,9 +206,8 @@ connect_cb (void *cls,
 
 
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_CONFIGURATION_Handle *testing_cfg;
   unsigned long long total_peers;
@@ -223,20 +218,17 @@ run (void *cls,
 
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
-  GNUNET_CONFIGURATION_set_value_string (testing_cfg,
-                                         "testing", "use_progressbars", "YES");
+  GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
+                                         "use_progressbars", "YES");
 #endif
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg,
-                                                          "testing",
-                                                          "num_peers",
-                                                          &total_peers))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
+                                             "num_peers", &total_peers))
     total_peers = NUM_PEERS;
 
   peers_left = total_peers;
   num_peers = peers_left;
-  pg = GNUNET_TESTING_peergroup_start (testing_cfg,
-                                       peers_left,
-                                       TIMEOUT,
+  pg = GNUNET_TESTING_peergroup_start (testing_cfg, peers_left, TIMEOUT,
                                        &connect_cb, &my_cb, NULL, NULL);
   GNUNET_assert (pg != NULL);
   GNUNET_SCHEDULER_add_delayed (TIMEOUT, &shutdown_task, NULL);
@@ -257,8 +249,8 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-nse-multipeer", "nohelp", options, &run, &ok);
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                      "test-nse-multipeer", "nohelp", options, &run, &ok);
   return ok;
 }