From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 2 Jul 2012 12:58:17 +0000 (+0000)
Subject: -use proper time API
X-Git-Tag: initial-import-from-subversion-38251~12699
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d1e3ef8bf421f69e2c32f4f5d014b1c9fc8cee1b;p=oweals%2Fgnunet.git

-use proper time API
---

diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 4e13e4778..f01ed2291 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -14,7 +14,7 @@ AUTO_IMPORT_CONFIRMATION_REQ = NO
 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
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index bbf7c4ce5..48067c95e 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -182,7 +182,7 @@ static int num_public_records;
  */
 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 @@ put_gns_record(void *cls,
   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 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
 
   }
 
-  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;