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

[gnunet]

Author: wachs
Date: 2011-04-18 15:46:37 +0200 (Mon, 18 Apr 2011)
New Revision: 15015

Modified:
   gnunet/src/transport/test_transport_ats.c
Log:


Modified: gnunet/src/transport/test_transport_ats.c
===================================================================
--- gnunet/src/transport/test_transport_ats.c   2011-04-18 10:52:49 UTC (rev 
15014)
+++ gnunet/src/transport/test_transport_ats.c   2011-04-18 13:46:37 UTC (rev 
15015)
@@ -53,9 +53,9 @@
 
 static struct GNUNET_TESTING_PeerGroup *pg;
 
-static  GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
-static  GNUNET_SCHEDULER_TaskIdentifier stats_task;
-static  GNUNET_SCHEDULER_TaskIdentifier send_task;
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static GNUNET_SCHEDULER_TaskIdentifier stats_task;
+static GNUNET_SCHEDULER_TaskIdentifier send_task;
 struct GNUNET_TESTING_Daemon * master_deamon;
 struct GNUNET_TESTING_Daemon * ping_deamon;
 
@@ -384,7 +384,7 @@
                                count ++;
 
                                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "(new: %i 
/ modified: %i / unmodified: %i) of %i \n", c_new, c_modified, c_unmodified , 
MEASUREMENTS);
-                               if ((count > MEASUREMENTS * 10) || ((c_modified 
>= MEASUREMENTS) && (c_new >= MEASUREMENTS) && (c_unmodified >= MEASUREMENTS)))
+                               if ((c_modified >= MEASUREMENTS) && (c_new >= 
MEASUREMENTS) && (c_unmodified >= MEASUREMENTS))
                                {
 #if !VERBOSE
                                        if (!machine_parsable) fprintf(stdout, 
"\n");
@@ -467,7 +467,7 @@
        s_invalid = GNUNET_STATISTICS_get (stats, "transport", "ATS invalid 
solutions", TIMEOUT, NULL, &stats_cb, NULL);
        s_state = GNUNET_STATISTICS_get (stats, "transport", "ATS state", 
TIMEOUT, NULL, &stats_cb, NULL);
 
-       stats_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 250), &stats_get_task, NULL);
+       stats_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 100), &stats_get_task, NULL);
 }
 
 void
@@ -686,7 +686,7 @@
 
   machine_parsable = GNUNET_NO;
   peers = NUM_PEERS;
-  config_file = "test_transport_ats_1addr.conf";
+  config_file = "test_transport_ats_4addr.conf";
 
   int c = 0;
   if (argc >= 2)