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

[gnunet]

Author: grothoff
Date: 2012-07-02 14:58:17 +0200 (Mon, 02 Jul 2012)
New Revision: 22433

Modified:
   gnunet/src/gns/gns.conf.in
   gnunet/src/gns/gnunet-service-gns.c
Log:
-use proper time API

Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in  2012-07-02 12:57:49 UTC (rev 22432)
+++ gnunet/src/gns/gns.conf.in  2012-07-02 12:58:17 UTC (rev 22433)
@@ -14,7 +14,7 @@
 MAX_PARALLEL_BACKGROUND_QUERIES = 25
 DEFAULT_LOOKUP_TIMEOUT = 10
 RECORD_PUT_INTERVAL = 60
-ZONE_PUT_INTERVAL = 900
+ZONE_PUT_INTERVAL = 15 min
 
 [gns-proxy]
 PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem

Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-07-02 12:57:49 UTC (rev 22432)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-07-02 12:58:17 UTC (rev 22433)
@@ -182,7 +182,7 @@
  */
 static unsigned long long max_record_put_interval;
 
-static unsigned long long dht_max_update_interval;
+static struct GNUNET_TIME_Relative dht_max_update_interval;
 
 /* dht update interval FIXME define? */
 static struct GNUNET_TIME_Relative record_put_interval;
@@ -329,14 +329,10 @@
   if (NULL == name)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-               "Zone iteration finished. Rescheduling put in %ds\n",
-               dht_max_update_interval);
+               "Zone iteration finished. Rescheduling put in %llus\n",
+               (unsigned long long) dht_max_update_interval.rel_value / 
1000LL);
     namestore_iter = NULL;
-    zone_update_taskid = GNUNET_SCHEDULER_add_delayed (
-                                        GNUNET_TIME_relative_multiply(
-                                            GNUNET_TIME_UNIT_SECONDS,
-                                            dht_max_update_interval
-                                            ),
+    zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_max_update_interval,
                                             &update_zone_dht_start,
                                             NULL);
     return;
@@ -1226,16 +1222,16 @@
 
   }
 
-  dht_max_update_interval = GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL;
+  dht_max_update_interval.rel_value = GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL; // 
yuck
 
   if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number (c, "gns",
-                                             "ZONE_PUT_INTERVAL",
-                                             &dht_max_update_interval))
+      GNUNET_CONFIGURATION_get_value_time (c, "gns",
+                                          "ZONE_PUT_INTERVAL",
+                                          &dht_max_update_interval))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                "DHT zone update interval: %llu\n",
-               dht_max_update_interval);
+               (unsigned long long) dht_max_update_interval.rel_value);
   }
   
   max_record_put_interval = 1;