-minor cleanups in testing

[oweals/gnunet.git] / src / testing / test_testing_large_topology.c

diff --git a/src/testing/test_testing_large_topology.c b/src/testing/test_testing_large_topology.c
index a2715450750f704fa903f5bac672b072faeffb20..d126ab94058f2ea9179b12db5e8107514720784f 100644 (file)
--- a/src/testing/test_testing_large_topology.c
+++ b/src/testing/test_testing_large_topology.c
@@ -107,6 +107,8 @@ static char *test_directory;
 
 #define MTYPE 12345
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 struct GNUNET_TestMessage
 {
   /**
@@ -119,6 +121,7 @@ struct GNUNET_TestMessage
    */
   uint32_t uid;
 };
+GNUNET_NETWORK_STRUCT_END
 
 struct TestMessageContext
 {
@@ -189,7 +192,7 @@ gather_log_data ()
       GNUNET_OS_start_process (NULL, NULL, "./memsize.pl", "memsize.pl",
                                "totals.txt", peer_number, connect_number, NULL);
   GNUNET_OS_process_wait (mem_process);
-  GNUNET_OS_process_close (mem_process);
+  GNUNET_OS_process_destroy (mem_process);
   mem_process = NULL;
 }
 
@@ -242,8 +245,8 @@ finish_testing ()
 
   if (dotOutFile != NULL)
   {
-    fprintf (dotOutFile, "}");
-    fclose (dotOutFile);
+    FPRINTF (dotOutFile, "%s",  "}");
+    FCLOSE (dotOutFile);
   }
 
   ok = 0;
@@ -287,20 +290,20 @@ topology_cb (void *cls, const struct GNUNET_PeerIdentity *first,
   {
     if (outfile != NULL)
     {
-      fprintf (outfile, "\t\"%s\" -- ", GNUNET_i2s (first));
-      fprintf (outfile, "\"%s\";\n", GNUNET_i2s (second));
+      FPRINTF (outfile, "\t\"%s\" -- ", GNUNET_i2s (first));
+      FPRINTF (outfile, "\"%s\";\n", GNUNET_i2s (second));
     }
     topology_connections++;
   }
   else
   {
-    fprintf (stderr,
+    FPRINTF (stderr,
              "Finished iterating over topology, %d total connections!\n",
              topology_connections);
     if (outfile != NULL)
     {
-      fprintf (outfile, "}\n");
-      fclose (outfile);
+      FPRINTF (outfile, "%s",  "}\n");
+      FCLOSE (outfile);
       GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
     }
   }
@@ -323,16 +326,16 @@ process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
   if ((total_messages_received) % modnum == 0)
   {
     if (total_messages_received == 0)
-      fprintf (stdout, "0%%");
+      FPRINTF (stdout, "%s",  "0%%");
     else
-      fprintf (stdout, "%d%%",
+      FPRINTF (stdout, "%d%%",
                (int) (((float) total_messages_received / expected_messages) *
                       100));
 
   }
   else if (total_messages_received % dotnum == 0)
   {
-    fprintf (stdout, ".");
+    FPRINTF (stdout, "%s",  ".");
   }
   fflush (stdout);
 #endif
@@ -351,15 +354,15 @@ process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
   if (total_messages_received == expected_messages)
   {
 #if VERBOSE
-    fprintf (stdout, "100%%]\n");
+    FPRINTF (stdout, "%s",  "100%%]\n");
 #endif
     GNUNET_SCHEDULER_cancel (die_task);
     GNUNET_asprintf (&dotOutFileNameFinished, "%s.dot", "final_topology");
-    dotOutFileFinished = fopen (dotOutFileNameFinished, "w");
+    dotOutFileFinished = FOPEN (dotOutFileNameFinished, "w");
     GNUNET_free (dotOutFileNameFinished);
     if (dotOutFileFinished != NULL)
     {
-      fprintf (dotOutFileFinished, "strict graph G {\n");
+      FPRINTF (dotOutFileFinished, "%s",  "strict graph G {\n");
     }
     topology_connections = 0;
     GNUNET_TESTING_get_topology (pg, &topology_cb, dotOutFileFinished);
@@ -421,8 +424,8 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (dotOutFile != NULL)
   {
-    fprintf (dotOutFile, "}");
-    fclose (dotOutFile);
+    FPRINTF (dotOutFile, "%s",  "}");
+    FCLOSE (dotOutFile);
   }
 }
 
@@ -636,16 +639,16 @@ topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
     if ((total_connections) % modnum == 0)
     {
       if (total_connections == 0)
-        fprintf (stdout, "0%%");
+        FPRINTF (stdout, "%s",  "0%%");
       else
-        fprintf (stdout, "%d%%",
+        FPRINTF (stdout, "%d%%",
                  (int) (((float) total_connections / expected_connections) *
                         100));
 
     }
     else if (total_connections % dotnum == 0)
     {
-      fprintf (stdout, ".");
+      FPRINTF (stdout, "%s",  ".");
     }
     fflush (stdout);
 #endif
@@ -664,7 +667,7 @@ topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
 
     expected_messages++;
     if (dotOutFile != NULL)
-      fprintf (dotOutFile, "\tn%s -- n%s;\n", first_daemon->shortname,
+      FPRINTF (dotOutFile, "\tn%s -- n%s;\n", first_daemon->shortname,
                second_daemon->shortname);
   }
 #if VERBOSE
@@ -680,7 +683,7 @@ topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
   if (total_connections == expected_connections)
   {
 #if VERBOSE
-    fprintf (stdout, "100%%]\n");
+    FPRINTF (stdout, "%s",  "100%%]\n");
 #endif
 #if VERBOSE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -692,7 +695,7 @@ topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
     GNUNET_SCHEDULER_cancel (die_task);
     die_task = GNUNET_SCHEDULER_NO_TASK;
 #if DELAY_FOR_LOGGING
-    fprintf (stdout, "Sending test messages in 10 seconds.\n");
+    FPRINTF (stdout, "%s",  "Sending test messages in 10 seconds.\n");
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                   (GNUNET_TIME_UNIT_SECONDS, 10),
                                   &send_test_messages, test_messages);
@@ -706,7 +709,7 @@ topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
                                   test_messages);
 #endif
 #if VERBOSE
-    fprintf (stdout, "Test message progress: [");
+    FPRINTF (stdout, "%s",  "Test message progress: [");
 #endif
 
   }
@@ -781,7 +784,7 @@ connect_topology ()
   modnum = expected_connections / 4;
   dotnum = (expected_connections / 50) + 1;
 #if VERBOSE
-  fprintf (stdout, "Peer connection progress: [");
+  FPRINTF (stdout, "%s",  "Peer connection progress: [");
 #endif
 }
 
@@ -795,7 +798,7 @@ create_topology ()
 #if VERBOSE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Topology set up, now starting peers!\n");
-    fprintf (stdout, "Daemon start progress [");
+    FPRINTF (stdout, "%s",  "Daemon start progress [");
 #endif
     GNUNET_TESTING_daemons_continue_startup (pg);
   }
@@ -833,15 +836,15 @@ peers_started_callback (void *cls, const struct GNUNET_PeerIdentity *id,
   if ((num_peers - peers_left) % modnum == 0)
   {
     if (num_peers - peers_left == 0)
-      fprintf (stdout, "0%%");
+      FPRINTF (stdout, "%s",  "0%%");
     else
-      fprintf (stdout, "%d%%",
+      FPRINTF (stdout, "%d%%",
                (int) (((float) (num_peers - peers_left) / num_peers) * 100));
 
   }
   else if ((num_peers - peers_left) % dotnum == 0)
   {
-    fprintf (stdout, ".");
+    FPRINTF (stdout, "%s",  ".");
   }
   fflush (stdout);
 #endif
@@ -849,7 +852,7 @@ peers_started_callback (void *cls, const struct GNUNET_PeerIdentity *id,
   if (peers_left == 0)
   {
 #if VERBOSE
-    fprintf (stdout, "100%%]\n");
+    FPRINTF (stdout, "%s",  "100%%]\n");
 #endif
 #if VERBOSE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -862,7 +865,7 @@ peers_started_callback (void *cls, const struct GNUNET_PeerIdentity *id,
         GNUNET_SCHEDULER_add_delayed (timeout, &end_badly,
                                       "from peers_started_callback");
 #if DELAY_FOR_LOGGING
-    fprintf (stdout, "Connecting topology in 10 seconds\n");
+    FPRINTF (stdout, "%s",  "Connecting topology in 10 seconds\n");
     gather_log_data ();
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                   (GNUNET_TIME_UNIT_SECONDS, 10),
@@ -902,15 +905,15 @@ hostkey_callback (void *cls, const struct GNUNET_PeerIdentity *id,
   if ((num_peers - peers_left) % modnum == 0)
   {
     if (num_peers - peers_left == 0)
-      fprintf (stdout, "0%%");
+      FPRINTF (stdout, "%s",  "0%%");
     else
-      fprintf (stdout, "%d%%",
+      FPRINTF (stdout, "%d%%",
                (int) (((float) (num_peers - peers_left) / num_peers) * 100));
 
   }
   else if ((num_peers - peers_left) % dotnum == 0)
   {
-    fprintf (stdout, ".");
+    FPRINTF (stdout, "%s",  ".");
   }
   fflush (stdout);
 #endif
@@ -918,7 +921,7 @@ hostkey_callback (void *cls, const struct GNUNET_PeerIdentity *id,
   if (peers_left == 0)
   {
 #if VERBOSE
-    fprintf (stdout, "100%%]\n");
+    FPRINTF (stdout, "%s",  "100%%]\n");
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "All %d hostkeys created, now creating topology!\n", num_peers);
 #endif
@@ -946,10 +949,10 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   ok = 1;
 
-  dotOutFile = fopen (dotOutFileName, "w");
+  dotOutFile = FOPEN (dotOutFileName, "w");
   if (dotOutFile != NULL)
   {
-    fprintf (dotOutFile, "strict graph G {\n");
+    FPRINTF (dotOutFile, "%s",  "strict graph G {\n");
   }
 
 #if VERBOSE
@@ -1009,7 +1012,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                              "connect_topology_option_modifier",
                                              &connect_topology_option_modifier_string))
   {
-    if (sscanf
+    if (SSCANF
         (connect_topology_option_modifier_string, "%lf",
          &connect_topology_option_modifier) != 1)
     {
@@ -1045,7 +1048,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SETTLE_TIME",
-                                          &settle_time))
+                                           &settle_time))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
                 "testing", "SETTLE_TIME");
@@ -1098,7 +1101,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   modnum = num_peers / 4;
   dotnum = (num_peers / 50) + 1;
 #if VERBOSE
-  fprintf (stdout, "Hostkey generation progress: [");
+  FPRINTF (stdout, "%s",  "Hostkey generation progress: [");
 #endif
   /* Set up a task to end testing if peer start fails */
   die_task =