-indentation

[oweals/gnunet.git] / src / transport / test_quota_compliance.c

diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 7f0247e50558071d13f12ee494a03450380ae69c..ac43b8d05c53e97a248d26f4a3a8f0960829c474 100644 (file)
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -39,7 +39,7 @@
  */
 #define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
 
-#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
 static char *test_source;
 
@@ -90,7 +90,6 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 #define MTYPE 12345
 
 GNUNET_NETWORK_STRUCT_BEGIN
-
 struct TestMessage
 {
   struct GNUNET_MessageHeader header;
@@ -100,8 +99,6 @@ GNUNET_NETWORK_STRUCT_END
 
 static int msg_scheduled;
 static int msg_sent;
-static int msg_recv_expected;
-static int msg_recv;
 
 static int test_failed;
 static int test_connected;
@@ -129,8 +126,8 @@ end ()
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
 
-  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
-  datarate = (total_bytes_sent * 1000) / delta;
+  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
+  datarate = (total_bytes_sent * 1000 * 1000) / delta;
 
   FPRINTF (stderr, "Throughput was %llu b/s\n", datarate);
 
@@ -213,68 +210,22 @@ get_size (unsigned int iter)
 
 static void
 notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+                const struct GNUNET_MessageHeader *message)
 {
-  static int n;
-  unsigned int s;
-  char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
   const struct TestMessage *hdr;
 
   hdr = (const struct TestMessage *) message;
-  s = get_size (n);
   if (MTYPE != ntohs (message->type))
     return;
-  msg_recv_expected = n;
-  msg_recv = ntohl (hdr->num);
-  if (ntohs (message->size) != (s))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Expected message %u of size %u, got %u bytes of message %u\n",
-                n, s, ntohs (message->size), ntohl (hdr->num));
-    if (die_task != GNUNET_SCHEDULER_NO_TASK)
-      GNUNET_SCHEDULER_cancel (die_task);
-    test_failed = GNUNET_YES;
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-    return;
-  }
-  if (ntohl (hdr->num) != n)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Expected message %u of size %u, got %u bytes of message %u\n",
-                n, s, ntohs (message->size), ntohl (hdr->num));
-    if (die_task != GNUNET_SCHEDULER_NO_TASK)
-      GNUNET_SCHEDULER_cancel (die_task);
-    test_failed = GNUNET_YES;
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-    return;
-  }
-  memset (cbuf, n, s - sizeof (struct TestMessage));
-  if (0 != memcmp (cbuf, &hdr[1], s - sizeof (struct TestMessage)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Expected message %u with bits %u, but body did not match\n", n,
-                (unsigned char) n);
-    if (die_task != GNUNET_SCHEDULER_NO_TASK)
-      GNUNET_SCHEDULER_cancel (die_task);
-    test_failed = GNUNET_YES;
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-    return;
-  }
-#if VERBOSE
-  if (ntohl (hdr->num) % 5000 == 0)
-  {
-    struct PeerContext *p = cls;
-    char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
 
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
-                p->no, ps, ntohl (hdr->num), ntohs (message->size),
-                GNUNET_i2s (peer));
-    GNUNET_free (ps);
-  }
-#endif
-  n++;
+  struct PeerContext *p = cls;
+  char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
+              p->no, ps, ntohl (hdr->num), ntohs (message->size),
+              GNUNET_i2s (peer));
+  GNUNET_free (ps);
 }
 
 
@@ -318,14 +269,15 @@ notify_ready (void *cls, size_t size, void *buf)
 #if VERBOSE
     if (n % 5000 == 0)
     {
-
+#endif
       char *receiver_s = GNUNET_strdup (GNUNET_i2s (&receiver->id));
 
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Sending message of size %u from peer %u (`%4s') -> peer %u (`%s') !\n",
-                  n, sender->no, GNUNET_i2s (&sender->id), receiver->no,
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Sending message %u of size %u from peer %u (`%4s') -> peer %u (`%s') !\n",
+                  n, s, sender->no, GNUNET_i2s (&sender->id), receiver->no,
                   receiver_s);
       GNUNET_free (receiver_s);
+#if 0
     }
 #endif
     n++;
@@ -337,7 +289,7 @@ notify_ready (void *cls, size_t size, void *buf)
   if (n < TOTAL_MSGS)
   {
     if (th == NULL)
-      th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0,
+      th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s,
                                                    TIMEOUT_TRANSMIT,
                                                    &notify_ready, NULL);
     msg_scheduled = n;
@@ -358,8 +310,7 @@ notify_ready (void *cls, size_t size, void *buf)
 
 
 static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
 
   struct PeerContext *p = cls;
@@ -386,7 +337,7 @@ static void
 sendtask ()
 {
   start_time = GNUNET_TIME_absolute_get ();
-  th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0), 0,
+  th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0),
                                                TIMEOUT_TRANSMIT, &notify_ready,
                                                NULL);
 }
@@ -400,7 +351,7 @@ measure (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   measure_task = GNUNET_SCHEDULER_NO_TASK;
 
   counter++;
-  if ((DURATION.rel_value / 1000) < counter)
+  if ((DURATION.rel_value_us / 1000 / 1000LL) < counter)
   {
     FPRINTF (stderr, "%s",  ".\n");
     GNUNET_SCHEDULER_add_now (&end, NULL);