[GNUnet-SVN] r24009 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-09-26 11:37:52 +0200 (Wed, 26 Sep 2012)
New Revision: 24009

Modified:
   gnunet/src/mesh/test_mesh_small.c
   gnunet/src/mesh/test_mesh_small.conf
Log:
- timeout sooner on stall

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2012-09-26 08:58:59 UTC (rev 24008)
+++ gnunet/src/mesh/test_mesh_small.c   2012-09-26 09:37:52 UTC (rev 24009)
@@ -47,12 +47,12 @@
 /**
  * How long until we give up on connecting the peers?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
 
 /**
  * Time to wait for stuff that should be rather fast
  */
-#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 
300)
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
 /**
  * DIFFERENT TESTS TO RUN
@@ -126,7 +126,7 @@
 static struct GNUNET_DISK_FileHandle *data_file;
 
 /**
- * How many data points to capture before triggering next round?
+ * Wait time
  */
 static struct GNUNET_TIME_Relative wait_time;
 
@@ -637,7 +637,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n");
   GNUNET_MESH_peer_request_connect_add (t, &d2->id);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "schedule timeout in 90s\n");
+              "schedule timeout in SHORT_TIME\n");
   if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
   {
     GNUNET_SCHEDULER_cancel (disconnect_task);

Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf        2012-09-26 08:58:59 UTC (rev 
24008)
+++ gnunet/src/mesh/test_mesh_small.conf        2012-09-26 09:37:52 UTC (rev 
24009)
@@ -2,6 +2,21 @@
 SERVICEHOME = /tmp/test_mesh_small/
 DEFAULTCONFIG = test_mesh_small.conf
 
+[mesh]
+PORT = 10005
+DEBUG = YES
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+REFRESH_PATH_TIME = 5 s
+APP_ANNOUNCE_TIME = 2 s
+ID_ANNOUNCE_TIME = 2 s
+UNACKNOWLEDGED_WAIT = 2 s
+CONNECT_TIMEOUT = 30 s
+DEFAULT_TTL = 64
+DHT_REPLICAITON_LEVEL = 10
+PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
+# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
+
 [arm]
 PORT = 10010
 DEFAULTSERVICES = core dht mesh
@@ -58,21 +73,6 @@
 AUTOSTART = YES
 PORT = 10004
 
-[mesh]
-PORT = 10005
-DEBUG = YES
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-REFRESH_PATH_TIME = 5 s
-APP_ANNOUNCE_TIME = 5 s
-ID_ANNOUNCE_TIME = 5 s
-UNACKNOWLEDGED_WAIT = 2 s
-CONNECT_TIMEOUT = 30 s
-DEFAULT_TTL = 64
-DHT_REPLICAITON_LEVEL = 10
-# PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
-# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
 [testing]
 WEAKRANDOM = YES
 
@@ -105,6 +105,6 @@
 DELETE_FILES = YES
 
 [test_mesh_small]
-WAIT_TIME = 300 s
+WAIT_TIME = 30 s
 CONNECTION_LIMIT = 16
 #DATA_OUTPUT_FILE=data_output