[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20927 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20927 - gnunet/src/gns |
Date: |
Tue, 10 Apr 2012 17:46:01 +0200 |
Author: schanzen
Date: 2012-04-10 17:46:01 +0200 (Tue, 10 Apr 2012)
New Revision: 20927
Modified:
gnunet/src/gns/gns.conf.in
gnunet/src/gns/gnunet-service-gns.c
gnunet/src/gns/test_gns_simple_lookup.conf
Log:
-renamed config options, tuned periodic puts
Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in 2012-04-10 14:38:33 UTC (rev 20926)
+++ gnunet/src/gns/gns.conf.in 2012-04-10 15:46:01 UTC (rev 20927)
@@ -11,6 +11,8 @@
AUTO_IMPORT_CONFIRMATION_REQ = NO
MAX_PARALLEL_BACKGROUND_QUERIES = 25
DEFAULT_LOOKUP_TIMEOUT = 10
+RECORD_PUT_INTERVAL = 60
+ZONE_PUT_INTERVAL = 900
[fcfsd]
HTTPPORT = 18080
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-04-10 14:38:33 UTC (rev 20926)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-04-10 15:46:01 UTC (rev 20927)
@@ -140,15 +140,17 @@
/**
* Useful for zone update for DHT put
*/
-static int num_public_records = 3600;
+static int num_public_records = 0;
/**
* update interval in seconds
*/
+static unsigned long long int max_record_put_interval;
+
static unsigned long long int dht_max_update_interval;
/* dht update interval FIXME define? */
-static struct GNUNET_TIME_Relative dht_update_interval;
+static struct GNUNET_TIME_Relative record_put_interval;
/* zone update task */
GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
@@ -349,7 +351,7 @@
/**
* Reschedule periodic put
*/
- zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_update_interval,
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (record_put_interval,
&update_zone_dht_next,
NULL);
@@ -367,24 +369,32 @@
update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling DHT zone update!\n");
+
+ unsigned long long int interval = 0;
+
if (0 == num_public_records)
{
- dht_update_interval = GNUNET_TIME_relative_multiply(
+ /**
+ * If no records are known (startup) or none present
+ * we can safely set the interval to 1s
+ */
+ record_put_interval = GNUNET_TIME_relative_multiply(
GNUNET_TIME_UNIT_SECONDS,
- dht_max_update_interval);
+ 1);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No records in db. Adjusted DHT update interval to %ds\n",
- dht_max_update_interval);
+ "No records in db. Adjusted record put interval to 1s\n");
}
else
{
-
- dht_update_interval = GNUNET_TIME_relative_multiply(
+ interval = max_record_put_interval/num_public_records;
+ if (interval == 0)
+ interval = 1;
+ record_put_interval = GNUNET_TIME_relative_multiply(
GNUNET_TIME_UNIT_SECONDS,
-
(dht_max_update_interval/num_public_records));
+ interval);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Adjusted DHT update interval to %ds!\n",
- (dht_max_update_interval/num_public_records));
+ interval);
}
/* start counting again */
@@ -859,16 +869,28 @@
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_number (c, "gns",
- "DHT_MAX_UPDATE_INTERVAL",
+ "ZONE_PUT_INTERVAL",
&dht_max_update_interval))
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
"DHT zone update interval: %d\n",
dht_max_update_interval);
}
+
+ max_record_put_interval = 1;
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ "RECORD_PUT_INTERVAL",
+ &max_record_put_interval))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Record put interval: %d\n",
+ max_record_put_interval);
+ }
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (c, "gns",
"MAX_PARALLEL_BACKGROUND_QUERIES",
&max_parallel_bg_queries))
{
@@ -939,7 +961,7 @@
* for our records
* We have roughly an hour for all records;
*/
- dht_update_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
+ record_put_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
1);
zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf 2012-04-10 14:38:33 UTC (rev
20926)
+++ gnunet/src/gns/test_gns_simple_lookup.conf 2012-04-10 15:46:01 UTC (rev
20927)
@@ -84,6 +84,8 @@
AUTO_IMPORT_PKEY = YES
MAX_PARALLEL_BACKGROUND_QUERIES = 10
DEFAULT_LOOKUP_TIMEOUT = 5
+RECORD_PUT_INTERVAL = 1
+ZONE_PUT_INTERVAL = 5
[nse]
AUTOSTART = NO
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20927 - gnunet/src/gns,
gnunet <=