-code cleanup

[oweals/gnunet.git] / src / core / test_core_quota_compliance.c

diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 856ed13fd304cf601c4a92a8aab080f0b4adb352..7c16531d82b1e80c386c8dd058d63b6d1884c618 100644 (file)
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -33,8 +33,7 @@
 #include "gnunet_transport_service.h"
 #include "gnunet_statistics_service.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define DEBUG_TRANSMISSION GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
 
 #define SYMMETRIC 0
 #define ASYMMETRIC_SEND_LIMITED 1
@@ -52,12 +51,12 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
 /**
  * What delay do we request from the core service for transmission?
  */
-#define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150)
 
 #define MTYPE 12345
 #define MESSAGESIZE 1024
@@ -227,7 +226,7 @@ measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   enum GNUNET_ErrorType kind = GNUNET_ERROR_TYPE_DEBUG;
 
   measure_task = GNUNET_SCHEDULER_NO_TASK;
-  fprintf (stdout, "\n");
+  FPRINTF (stdout, "%s",  "\n");
   running = GNUNET_NO;
 
   delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
@@ -333,11 +332,9 @@ transmit_ready (void *cls, size_t size, void *buf)
   cbuf = buf;
   do
   {
-#if DEBUG_TRANSMISSION
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending message %u of size %u at offset %u\n", tr_n,
                 MESSAGESIZE, ret);
-#endif
     hdr.header.size = htons (MESSAGESIZE);
     hdr.header.type = htons (MTYPE);
     hdr.num = htonl (tr_n);
@@ -373,14 +370,12 @@ connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
   pc->connect_status = 1;
   if (pc == &p1)
   {
-#if DEBUG_TRANSMISSION
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Encrypted connection established to peer `%4s'\n",
                 GNUNET_i2s (peer));
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Asking core (1) for transmission to peer `%4s'\n",
                 GNUNET_i2s (&p2.id));
-#endif
     if (err_task != GNUNET_SCHEDULER_NO_TASK)
       GNUNET_SCHEDULER_cancel (err_task);
     err_task =
@@ -421,10 +416,8 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
     GNUNET_CORE_notify_transmit_ready_cancel (pc->nth);
     pc->nth = NULL;
   }
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted connection to `%4s' cut\n",
               GNUNET_i2s (peer));
-#endif
 }
 
 
@@ -434,11 +427,9 @@ inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_ATS_Information *atsi,
                 unsigned int atsi_count)
 {
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core provides inbound data from `%4s' %llu.\n",
               GNUNET_i2s (other), ntohs (message->size));
-#endif
   total_bytes_recv += ntohs (message->size);
   return GNUNET_OK;
 }
@@ -450,11 +441,9 @@ outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                  const struct GNUNET_ATS_Information *atsi,
                  unsigned int atsi_count)
 {
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core notifies about outbound data for `%4s'.\n",
               GNUNET_i2s (other));
-#endif
   return GNUNET_OK;
 }
 
@@ -492,13 +481,11 @@ process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
     err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
     return GNUNET_SYSERR;
   }
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n",
               ntohl (hdr->num), ntohs (message->size));
-#endif
   n++;
   if (0 == (n % 10))
-    fprintf (stderr, ".");
+    FPRINTF (stderr, "%s",  ".");
 
 
   if (running == GNUNET_YES)
@@ -545,11 +532,9 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server,
     GNUNET_assert (ok == 3);
     OKPP;
     GNUNET_assert (cls == &p2);
-#if DEBUG_TRANSMISSION
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Asking core (1) to connect to peer `%4s'\n",
                 GNUNET_i2s (&p2.id));
-#endif
     connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL);
   }
 }
@@ -560,11 +545,8 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *p = cls;
 
-
-#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received (my) `%s' from transport service\n", "HELLO");
-#endif
   GNUNET_assert (message != NULL);
   p->hello = GNUNET_malloc (ntohs (message->size));
   memcpy (p->hello, message, ntohs (message->size));
@@ -587,7 +569,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
   p->cfg = GNUNET_CONFIGURATION_create ();
 #if START_ARM
   p->arm_proc =
-      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+    GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
                                "gnunet-service-arm",
 #if VERBOSE
                                "-L", "DEBUG",
@@ -629,21 +611,21 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   GNUNET_assert (test != -1);
   GNUNET_assert (GNUNET_SYSERR !=
-                 GNUNET_CONFIGURATION_get_value_number (p1.cfg, "CORE",
-                                                        "TOTAL_QUOTA_IN",
-                                                        &current_quota_p1_in));
+                 GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+                                                      "WAN_QUOTA_IN",
+                                                      &current_quota_p1_in));
   GNUNET_assert (GNUNET_SYSERR !=
-                 GNUNET_CONFIGURATION_get_value_number (p2.cfg, "CORE",
-                                                        "TOTAL_QUOTA_IN",
-                                                        &current_quota_p2_in));
+                 GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+                                                      "WAN_QUOTA_IN",
+                                                      &current_quota_p2_in));
   GNUNET_assert (GNUNET_SYSERR !=
-                 GNUNET_CONFIGURATION_get_value_number (p1.cfg, "CORE",
-                                                        "TOTAL_QUOTA_OUT",
-                                                        &current_quota_p1_out));
+                 GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+                                                      "WAN_QUOTA_OUT",
+                                                      &current_quota_p1_out));
   GNUNET_assert (GNUNET_SYSERR !=
-                 GNUNET_CONFIGURATION_get_value_number (p2.cfg, "CORE",
-                                                        "TOTAL_QUOTA_OUT",
-                                                        &current_quota_p2_out));
+                 GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+                                                      "WAN_QUOTA_OUT",
+                                                      &current_quota_p2_out));
 
   p1.ch =
       GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify,