[GNUnet-SVN] r12767 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2010-08-30 21:33:29 +0200 (Mon, 30 Aug 2010)
New Revision: 12767

Modified:
   gnunet/src/dht/gnunet-dht-driver.c
Log:
always stagger everything

Modified: gnunet/src/dht/gnunet-dht-driver.c
===================================================================
--- gnunet/src/dht/gnunet-dht-driver.c  2010-08-30 18:42:37 UTC (rev 12766)
+++ gnunet/src/dht/gnunet-dht-driver.c  2010-08-30 19:33:29 UTC (rev 12767)
@@ -63,8 +63,10 @@
 
 #define DEFAULT_MAX_OUTSTANDING_PUTS 10
 
-#define DEFAULT_MAX_OUTSTANDING_FIND_PEERS 1
+#define DEFAULT_MAX_OUTSTANDING_FIND_PEERS 10
 
+#define DEFAULT_FIND_PEER_OFFSET GNUNET_TIME_relative_divide 
(DEFAULT_SECONDS_PER_PEER_START, DEFAULT_MAX_OUTSTANDING_FIND_PEERS)
+
 #define DEFAULT_MAX_OUTSTANDING_GETS 10
 
 #define DEFAULT_CONNECT_TIMEOUT 60
@@ -1168,7 +1170,7 @@
 
   if (test_find_peer->find_peer_context->outstanding > 
max_outstanding_find_peers)
   {
-    GNUNET_SCHEDULER_add_delayed(sched, 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 300), 
&send_find_peer_request, test_find_peer);
+    GNUNET_SCHEDULER_add_delayed(sched, DEFAULT_FIND_PEER_OFFSET, 
&send_find_peer_request, test_find_peer);
     return;
   }
 
@@ -1206,7 +1208,7 @@
       test_find_peer->daemon  = GNUNET_TESTING_daemon_get(pg, random);
       test_find_peer->find_peer_context = find_peer_ctx;
       find_peer_ctx->total++;
-      GNUNET_SCHEDULER_add_now(sched, &send_find_peer_request, test_find_peer);
+      GNUNET_SCHEDULER_add_delayed(sched, 
GNUNET_TIME_relative_multiply(DEFAULT_FIND_PEER_OFFSET, i), 
&send_find_peer_request, test_find_peer);
     }
 }