[GNUnet-SVN] r22484 - gnunet/src/gns

[gnunet]

Author: schanzen
Date: 2012-07-04 20:14:01 +0200 (Wed, 04 Jul 2012)
New Revision: 22484

Modified:
   gnunet/src/gns/gnunet-service-gns.c
Log:
-fix 0 record zone iteration

Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-07-04 17:44:14 UTC (rev 22483)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-07-04 18:14:01 UTC (rev 22484)
@@ -344,7 +344,37 @@
   /* we're done */
   if (NULL == name)
   {
+    if (0 == num_public_records)
+    {
+      /**
+       * If no records are known (startup) or none present
+       * we can safely set the interval to the value for a single
+       * record
+       */
+      zone_iteration_interval = GNUNET_TIME_relative_divide 
(record_put_interval,
+                                                             1);
+
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "No records in db.\n");
+    }
+    else
+    {
+      zone_iteration_interval = GNUNET_TIME_relative_divide 
(record_put_interval,
+                                                             
num_public_records);
+    }
+
+    zone_iteration_interval = GNUNET_TIME_relative_max 
(MINIMUM_ZONE_ITERATION_INTERVAL,
+                                                        
zone_iteration_interval);
+
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+               "Adjusted zone iteration interval to %llus!\n",
+               zone_iteration_interval.rel_value);
+    GNUNET_STATISTICS_set (statistics,
+                           "Current zone iteration interval [msec]",
+                           zone_iteration_interval.rel_value,
+                           GNUNET_NO);
+    
+    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
                "Zone iteration finished. Rescheduling zone iteration\n");
 
     namestore_iter = NULL;
@@ -497,37 +527,6 @@
 
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling DHT zone update!\n");
   
-  if (0 == last_num_public_records)
-  {
-    /**
-     * If no records are known (startup) or none present
-     * we can safely set the interval to 1s
-     */
-    zone_iteration_interval = INITIAL_ZONE_ITERATION_INTERVAL;
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-               "No records in db. Adjusted zone iteration interval to 
%llums\n",
-               zone_iteration_interval.rel_value);
-    GNUNET_STATISTICS_set (statistics,
-                           "Current zone iteration interval [msec]",
-                           zone_iteration_interval.rel_value,
-                           GNUNET_NO);
-  }
-  else
-  {
-    zone_iteration_interval = GNUNET_TIME_relative_divide (record_put_interval,
-                                                           
last_num_public_records);
-    zone_iteration_interval = GNUNET_TIME_relative_max 
(MINIMUM_ZONE_ITERATION_INTERVAL,
-                                                        
zone_iteration_interval);
-    
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-               "Adjusted zone iteration interval to %llus!\n",
-               zone_iteration_interval.rel_value);
-    GNUNET_STATISTICS_set (statistics,
-                           "Current zone iteration interval [msec]",
-                           zone_iteration_interval.rel_value,
-                           GNUNET_NO);
-  }
-
   /* start counting again */
   num_public_records = 0;
   namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
@@ -1309,7 +1308,7 @@
 
   }
 
-  zone_iteration_interval = INITIAL_ZONE_ITERATION_INTERVAL; // yuck
+  zone_iteration_interval = INITIAL_ZONE_ITERATION_INTERVAL;
 
   record_put_interval = DEFAULT_RECORD_PUT_INTERVAL;