[GNUnet-SVN] r16181 - in gnunet/src: fs nse

[gnunet]

Author: grothoff
Date: 2011-07-25 17:20:48 +0200 (Mon, 25 Jul 2011)
New Revision: 16181

Modified:
   gnunet/src/fs/gnunet-service-fs_pe.c
   gnunet/src/fs/gnunet-service-fs_pr.c
   gnunet/src/nse/test_nse.conf
   gnunet/src/nse/test_nse_multipeer.c
Log:
exponential back-off

Modified: gnunet/src/fs/gnunet-service-fs_pe.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pe.c        2011-07-25 14:34:51 UTC (rev 
16180)
+++ gnunet/src/fs/gnunet-service-fs_pe.c        2011-07-25 15:20:48 UTC (rev 
16181)
@@ -159,10 +159,13 @@
                         total_delay * 1000LL / plan_count,
                         GNUNET_NO);
   prd = GSF_pending_request_get_data_ (rp->pr);
-  // FIXME: calculate 'rp->earliest_transmission'!
-  // FIXME: claculate 'rp->priority'!  
-  delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
-                                        rp->transmission_counter);
+  // FIXME: calculate 'rp->priority'!  
+  if (rp->transmission_counter < 32)
+    delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+                                          1LL << rp->transmission_counter);
+  else
+    delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+                                          UINT_MAX);
   rp->earliest_transmission 
     = GNUNET_TIME_relative_to_absolute (delay);
 #if DEBUG_FS

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2011-07-25 14:34:51 UTC (rev 
16180)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2011-07-25 15:20:48 UTC (rev 
16181)
@@ -305,6 +305,10 @@
              GNUNET_h2s (query),
              type);
 #endif 
+  GNUNET_STATISTICS_update (GSF_stats,
+                           gettext_noop ("# Pending requests created"),
+                           1,
+                           GNUNET_NO);
   pr = GNUNET_malloc (sizeof (struct GSF_PendingRequest));
   pr->local_result_offset = GNUNET_CRYPTO_random_u64 
(GNUNET_CRYPTO_QUALITY_WEAK,
                                                      UINT64_MAX);              
                                         

Modified: gnunet/src/nse/test_nse.conf
===================================================================
--- gnunet/src/nse/test_nse.conf        2011-07-25 14:34:51 UTC (rev 16180)
+++ gnunet/src/nse/test_nse.conf        2011-07-25 15:20:48 UTC (rev 16181)
@@ -15,8 +15,8 @@
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 1
-INTERVAL = 15000
-WORKBITS = 8
+INTERVAL = 120000
+WORKBITS = 1
 
 HISTOGRAM = $SERVICEHOME/nse-histogram
 
@@ -58,7 +58,7 @@
 AUTOSTART = NO
 
 [testing]
-NUM_PEERS = 50
+NUM_PEERS = 100
 WEAKRANDOM = YES
 TOPOLOGY = NONE
 CONNECT_TOPOLOGY = SMALL_WORLD_RING

Modified: gnunet/src/nse/test_nse_multipeer.c
===================================================================
--- gnunet/src/nse/test_nse_multipeer.c 2011-07-25 14:34:51 UTC (rev 16180)
+++ gnunet/src/nse/test_nse_multipeer.c 2011-07-25 15:20:48 UTC (rev 16181)
@@ -51,7 +51,7 @@
 /**
  * How long do we run the test?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 60)
 
 static int ok;
 
@@ -270,6 +270,7 @@
   return ok;
 }
 
+
 int
 main (int argc, char *argv[])
 {