[GNUnet-SVN] r15976 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2011-07-15 10:14:45 +0200 (Fri, 15 Jul 2011)
New Revision: 15976

Modified:
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/test_transport_api_reliability.c
   gnunet/src/transport/test_transport_api_unreliability.c
Log:
reduce size of benchmarks

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2011-07-15 08:14:21 UTC (rev 
15975)
+++ gnunet/src/transport/plugin_transport_udp.c 2011-07-15 08:14:45 UTC (rev 
15976)
@@ -1336,7 +1336,7 @@
                                             "transport-udp",
                                             "MAX_BPS",
                                             &udp_max_bps))
-    udp_max_bps = 1024 * 1024 * 100; /* 100 MB/s == infinity for practical 
purposes */
+    udp_max_bps = 1024 * 1024 * 50; /* 50 MB/s == infinity for practical 
purposes */
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (env->cfg,
                                             "transport-udp",

Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c       2011-07-15 
08:14:21 UTC (rev 15975)
+++ gnunet/src/transport/test_transport_api_reliability.c       2011-07-15 
08:14:45 UTC (rev 15976)
@@ -49,7 +49,7 @@
  * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
  * messages may be dropped even for a reliable transport.
  */
-#define TOTAL_MSGS (10000 * 2)
+#define TOTAL_MSGS (1024 * 2)
 
 /**
  * How long until we give up on transmitting the message?
@@ -206,8 +206,6 @@
 {
   unsigned int ret;
 
-  if (iter < 60000)
-    return iter + sizeof (struct TestMessage);
   ret = (iter * iter * iter);
   return sizeof (struct TestMessage) + (ret % 60000);
 }

Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c     2011-07-15 
08:14:21 UTC (rev 15975)
+++ gnunet/src/transport/test_transport_api_unreliability.c     2011-07-15 
08:14:45 UTC (rev 15976)
@@ -50,7 +50,7 @@
  * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
  * messages may be dropped even for a reliable transport.
  */
-#define TOTAL_MSGS (80000 * 3) /* Total messages should be divisible by 8, so 
we can make a nice bitmap */
+#define TOTAL_MSGS (1024 * 3) /* Total messages should be divisible by 8, so 
we can make a nice bitmap */
 
 /**
  * How long until we give up on transmitting the message?
@@ -351,8 +351,6 @@
 {
   unsigned int ret;
 
-  if (iter < 60000)
-    return iter + sizeof (struct TestMessage);
   ret = (iter * iter * iter);
   return sizeof (struct TestMessage) + (ret % 60000);
 }
@@ -417,7 +415,7 @@
 #endif
   n++;
   set_bit(ntohl(hdr->num));
-  if (0 == (n % (5000)))
+  if (0 == (n % (TOTAL_MSGS / 100)))
     {
       fprintf (stderr, ".");
       if (GNUNET_SCHEDULER_NO_TASK != die_task)