/*
This file is part of GNUnet.
- Copyright (C) 2012, 2013, 2014, 2017 GNUnet e.V.
+ Copyright (C) 2012, 2013, 2014, 2017, 2018 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_dht_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_statistics_service.h"
-#include "gnunet_namestore_plugin.h"
-#include "gnunet_signatures.h"
#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+/**
+ * How often should we (re)publish each record before
+ * it expires?
+ */
+#define PUBLISH_OPS_PER_EXPIRATION 4
+
/**
* How often do we measure the delta between desired zone
* iteration speed and actual speed, and tell statistics
#define DELTA_INTERVAL 100
/**
- * How many records do we fetch
- * in one shot from the namestore?
+ * How many records do we fetch in one shot from the namestore?
*/
-#define NS_BLOCK_SIZE 100
+#define NS_BLOCK_SIZE 1000
/**
* How many pending DHT operations do we allow at most?
*/
-#define DHT_QUEUE_LIMIT 1000
+#define DHT_QUEUE_LIMIT 2000
/**
- * The initial interval in milliseconds btween puts in
- * a zone iteration
+ * How many events may the namestore give us before it has to wait
+ * for us to keep up?
*/
-#define INITIAL_PUT_INTERVAL GNUNET_TIME_UNIT_MILLISECONDS
+#define NAMESTORE_QUEUE_LIMIT 50
/**
- * The lower bound for the zone iteration interval
+ * The initial interval in milliseconds btween puts in
+ * a zone iteration
*/
-#define MINIMUM_ZONE_ITERATION_INTERVAL GNUNET_TIME_UNIT_SECONDS
+#define INITIAL_ZONE_ITERATION_INTERVAL GNUNET_TIME_UNIT_MILLISECONDS
/**
* The upper bound for the zone iteration interval
+ * (per record).
*/
#define MAXIMUM_ZONE_ITERATION_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
*/
#define LATE_ITERATION_SPEEDUP_FACTOR 2
-/**
- * How long until a DHT PUT attempt should time out?
- */
-#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-
/**
* What replication level do we use for DHT PUT operations?
*/
*/
static struct GNUNET_DHT_Handle *dht_handle;
-/**
- * Active DHT put operation (or NULL)
- */
-static struct GNUNET_DHT_PutHandle *active_put;
-
/**
* Our handle to the namestore service
*/
*/
static struct GNUNET_NAMESTORE_ZoneIterator *namestore_iter;
-/**
- * Handle to monitor namestore changes to instant propagation.
- */
-static struct GNUNET_NAMESTORE_ZoneMonitor *zmon;
-
-/**
- * Head of monitor activities; kept in a DLL.
- */
-static struct DhtPutActivity *ma_head;
-
-/**
- * Tail of monitor activities; kept in a DLL.
- */
-static struct DhtPutActivity *ma_tail;
-
/**
* Head of iteration put activities; kept in a DLL.
*/
static struct DhtPutActivity *it_tail;
/**
- * Number of entries in the DHT queue.
+ * Number of entries in the DHT queue #it_head.
*/
static unsigned int dht_queue_length;
/**
* Number of successful put operations performed in the current
- * measurement cycle (as measured in #check_zone_dht_next()).
+ * measurement cycle (as measured in #check_zone_namestore_next()).
*/
static unsigned long long put_cnt;
* and the total number of record sets we have (so far)
* observed in the zone.
*/
-static struct GNUNET_TIME_Relative next_put_interval;
+static struct GNUNET_TIME_Relative target_iteration_velocity_per_record;
/**
* Minimum relative expiration time of records seem during the current
static struct GNUNET_TIME_Relative min_relative_record_time;
/**
- * Zone iteration PUT interval.
+ * Minimum relative expiration time of records seem during the last
+ * zone iteration.
*/
-static struct GNUNET_TIME_Relative put_interval;
+static struct GNUNET_TIME_Relative last_min_relative_record_time;
/**
* Default time window for zone iteration
{
struct DhtPutActivity *ma;
+ (void) cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Shutting down!\n");
- while (NULL != (ma = ma_head))
- {
- GNUNET_DHT_put_cancel (ma->ph);
- GNUNET_CONTAINER_DLL_remove (ma_head,
- ma_tail,
- ma);
- GNUNET_free (ma);
- }
while (NULL != (ma = it_head))
{
GNUNET_DHT_put_cancel (ma->ph);
+ dht_queue_length--;
GNUNET_CONTAINER_DLL_remove (it_head,
it_tail,
ma);
GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
namestore_iter = NULL;
}
- if (NULL != zmon)
- {
- GNUNET_NAMESTORE_zone_monitor_stop (zmon);
- zmon = NULL;
- }
if (NULL != namestore_handle)
{
GNUNET_NAMESTORE_disconnect (namestore_handle);
namestore_handle = NULL;
}
- if (NULL != active_put)
- {
- GNUNET_DHT_put_cancel (active_put);
- active_put = NULL;
- }
if (NULL != dht_handle)
{
GNUNET_DHT_disconnect (dht_handle);
/**
* Method called periodically that triggers iteration over authoritative records
*
- * @param cls closure
+ * @param cls NULL
*/
static void
-publish_zone_dht_next (void *cls)
+publish_zone_namestore_next (void *cls)
{
+ (void) cls;
zone_publish_task = NULL;
GNUNET_assert (NULL != namestore_iter);
GNUNET_assert (0 == ns_iteration_left);
/**
- * Continuation called from DHT once the PUT operation triggered
- * by a monitor is done.
- *
- * @param cls a `struct DhtPutActivity`
- * @param success #GNUNET_OK on success
- */
-static void
-dht_put_monitor_continuation (void *cls,
- int success)
-{
- struct DhtPutActivity *ma = cls;
-
- num_public_records++;
- GNUNET_CONTAINER_DLL_remove (ma_head,
- ma_tail,
- ma);
- GNUNET_free (ma);
-}
-
-
-/**
- * Check if the current zone iteration needs to be continued
- * by calling #publish_zone_dht_next(), and if so with what delay.
+ * Calculate #target_iteration_velocity_per_record.
*/
static void
-check_zone_dht_next ()
+calculate_put_interval ()
{
- struct GNUNET_TIME_Relative delay;
-
- if (0 != ns_iteration_left)
- return; /* current NAMESTORE iteration not yet done */
- delay = GNUNET_TIME_relative_subtract (next_put_interval,
- sub_delta);
- /* We delay *once* per #NS_BLOCK_SIZE, so we need to multiply the
- per-record delay calculated so far with the #NS_BLOCK_SIZE */
- delay = GNUNET_TIME_relative_multiply (delay,
- NS_BLOCK_SIZE);
- GNUNET_assert (NULL == zone_publish_task);
- zone_publish_task = GNUNET_SCHEDULER_add_delayed (delay,
- &publish_zone_dht_next,
- NULL);
+ 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
+ */
+ target_iteration_velocity_per_record = zone_publish_time_window;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+ "No records in namestore database.\n");
+ }
+ else
+ {
+ last_min_relative_record_time
+ = GNUNET_TIME_relative_min (last_min_relative_record_time,
+ min_relative_record_time);
+ zone_publish_time_window
+ = GNUNET_TIME_relative_min (GNUNET_TIME_relative_divide (last_min_relative_record_time,
+ PUBLISH_OPS_PER_EXPIRATION),
+ zone_publish_time_window_default);
+ target_iteration_velocity_per_record
+ = GNUNET_TIME_relative_divide (zone_publish_time_window,
+ last_num_public_records);
+ }
+ target_iteration_velocity_per_record
+ = GNUNET_TIME_relative_min (target_iteration_velocity_per_record,
+ MAXIMUM_ZONE_ITERATION_INTERVAL);
+ GNUNET_STATISTICS_set (statistics,
+ "Minimum relative record expiration (in μs)",
+ last_min_relative_record_time.rel_value_us,
+ GNUNET_NO);
+ GNUNET_STATISTICS_set (statistics,
+ "Zone publication time window (in μs)",
+ zone_publish_time_window.rel_value_us,
+ GNUNET_NO);
+ GNUNET_STATISTICS_set (statistics,
+ "Target zone iteration velocity (μs)",
+ target_iteration_velocity_per_record.rel_value_us,
+ GNUNET_NO);
}
* Re-calculate our velocity and the desired velocity.
* We have succeeded in making #DELTA_INTERVAL puts, so
* now calculate the new desired delay between puts.
+ *
+ * @param cnt how many records were processed since the last call?
*/
static void
-update_velocity ()
+update_velocity (unsigned int cnt)
{
struct GNUNET_TIME_Relative delta;
unsigned long long pct = 0;
+ if (0 == cnt)
+ return;
/* How fast were we really? */
delta = GNUNET_TIME_absolute_get_duration (last_put_100);
- delta.rel_value_us /= DELTA_INTERVAL;
+ delta.rel_value_us /= cnt;
last_put_100 = GNUNET_TIME_absolute_get ();
/* calculate expected frequency */
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Last record count was lower than current record count. Reducing interval.\n");
- put_interval = GNUNET_TIME_relative_divide (zone_publish_time_window,
- num_public_records);
- next_put_interval = GNUNET_TIME_relative_divide (put_interval,
- LATE_ITERATION_SPEEDUP_FACTOR);
+ last_num_public_records = num_public_records * LATE_ITERATION_SPEEDUP_FACTOR;
+ calculate_put_interval ();
}
- else
- {
- next_put_interval = put_interval;
- }
-
- next_put_interval = GNUNET_TIME_relative_min (next_put_interval,
- MAXIMUM_ZONE_ITERATION_INTERVAL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Desired global zone iteration interval is %s/record!\n",
- GNUNET_STRINGS_relative_time_to_string (next_put_interval,
+ GNUNET_STRINGS_relative_time_to_string (target_iteration_velocity_per_record,
GNUNET_YES));
/* Tell statistics actual vs. desired speed */
GNUNET_STATISTICS_set (statistics,
- "Target zone iteration velocity (μs)",
- next_put_interval.rel_value_us,
- GNUNET_NO);
- GNUNET_STATISTICS_set (statistics,
- "Current zone iteration velocity (μs)",
+ "Current zone iteration velocity (μs/record)",
delta.rel_value_us,
GNUNET_NO);
/* update "sub_delta" based on difference, taking
previous sub_delta into account! */
- if (next_put_interval.rel_value_us > delta.rel_value_us)
+ if (target_iteration_velocity_per_record.rel_value_us > delta.rel_value_us)
{
/* We were too fast, reduce sub_delta! */
struct GNUNET_TIME_Relative corr;
- corr = GNUNET_TIME_relative_subtract (next_put_interval,
+ corr = GNUNET_TIME_relative_subtract (target_iteration_velocity_per_record,
delta);
if (sub_delta.rel_value_us > delta.rel_value_us)
{
sub_delta = GNUNET_TIME_UNIT_ZERO;
}
}
- else if (next_put_interval.rel_value_us < delta.rel_value_us)
+ else if (target_iteration_velocity_per_record.rel_value_us < delta.rel_value_us)
{
/* We were too slow, increase sub_delta! */
struct GNUNET_TIME_Relative corr;
corr = GNUNET_TIME_relative_subtract (delta,
- next_put_interval);
+ target_iteration_velocity_per_record);
sub_delta = GNUNET_TIME_relative_add (sub_delta,
corr);
- if (sub_delta.rel_value_us > next_put_interval.rel_value_us)
+ if (sub_delta.rel_value_us > target_iteration_velocity_per_record.rel_value_us)
{
/* CPU overload detected, we cannot go at desired speed,
as this would mean using a negative delay. */
/* compute how much faster we would want to be for
the desired velocity */
- if (0 == next_put_interval.rel_value_us)
+ if (0 == target_iteration_velocity_per_record.rel_value_us)
pct = UINT64_MAX; /* desired speed is infinity ... */
else
- pct = (sub_delta.rel_value_us - next_put_interval.rel_value_us) * 100LLU
- / next_put_interval.rel_value_us;
- sub_delta = next_put_interval;
+ pct = (sub_delta.rel_value_us -
+ target_iteration_velocity_per_record.rel_value_us) * 100LLU
+ / target_iteration_velocity_per_record.rel_value_us;
+ sub_delta = target_iteration_velocity_per_record;
}
}
GNUNET_STATISTICS_set (statistics,
- "# size of the DHT queue",
+ "# size of the DHT queue (it)",
dht_queue_length,
GNUNET_NO);
GNUNET_STATISTICS_set (statistics,
}
+/**
+ * Check if the current zone iteration needs to be continued
+ * by calling #publish_zone_namestore_next(), and if so with what delay.
+ */
+static void
+check_zone_namestore_next ()
+{
+ struct GNUNET_TIME_Relative delay;
+
+ if (0 != ns_iteration_left)
+ return; /* current NAMESTORE iteration not yet done */
+ update_velocity (put_cnt);
+ put_cnt = 0;
+ delay = GNUNET_TIME_relative_subtract (target_iteration_velocity_per_record,
+ sub_delta);
+ /* We delay *once* per #NS_BLOCK_SIZE, so we need to multiply the
+ per-record delay calculated so far with the #NS_BLOCK_SIZE */
+ GNUNET_STATISTICS_set (statistics,
+ "Current artificial NAMESTORE delay (μs/record)",
+ delay.rel_value_us,
+ GNUNET_NO);
+ delay = GNUNET_TIME_relative_multiply (delay,
+ NS_BLOCK_SIZE);
+ /* make sure we do not overshoot because of the #NS_BLOCK_SIZE factor */
+ delay = GNUNET_TIME_relative_min (MAXIMUM_ZONE_ITERATION_INTERVAL,
+ delay);
+ /* no delays on first iteration */
+ if (GNUNET_YES == first_zone_iteration)
+ delay = GNUNET_TIME_UNIT_ZERO;
+ GNUNET_assert (NULL == zone_publish_task);
+ zone_publish_task = GNUNET_SCHEDULER_add_delayed (delay,
+ &publish_zone_namestore_next,
+ NULL);
+}
+
+
/**
* Continuation called from DHT once the PUT operation is done.
*
* @param cls a `struct DhtPutActivity`
- * @param success #GNUNET_OK on success
*/
static void
-dht_put_continuation (void *cls,
- int success)
+dht_put_continuation (void *cls)
{
struct DhtPutActivity *ma = cls;
- num_public_records++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "PUT complete (%s)\n",
- (GNUNET_OK == success) ? "success" : "failure");
+ "PUT complete\n");
dht_queue_length--;
GNUNET_CONTAINER_DLL_remove (it_head,
it_tail,
ma);
GNUNET_free (ma);
- if (GNUNET_OK == success)
- {
- put_cnt++;
- if (0 == put_cnt % DELTA_INTERVAL)
- update_velocity ();
- }
}
-
/**
* Convert namestore records from the internal format to that
* suitable for publication (removes private records, converts
* @param label label to store under
* @param rd_public public record data
* @param rd_public_count number of records in @a rd_public
- * @param cont function to call with PUT result
- * @param cont_cls closure for @a cont
+ * @param ma handle for the put operation
* @return DHT PUT handle, NULL on error
*/
static struct GNUNET_DHT_PutHandle *
const char *label,
const struct GNUNET_GNSRECORD_Data *rd_public,
unsigned int rd_public_count,
- GNUNET_DHT_PutContinuation cont,
- void *cont_cls)
+ struct DhtPutActivity *ma)
{
struct GNUNET_GNSRECORD_Block *block;
struct GNUNET_HashCode query;
label,
GNUNET_STRINGS_absolute_time_to_string (expire),
GNUNET_h2s (&query));
+ num_public_records++;
ret = GNUNET_DHT_put (dht_handle,
&query,
DHT_GNS_REPLICATION_LEVEL,
block_size,
block,
expire,
- cont,
- cont_cls);
+ &dht_put_continuation,
+ ma);
GNUNET_free (block);
return ret;
}
GNUNET_SCHEDULER_cancel (zone_publish_task);
zone_publish_task = NULL;
}
- if (NULL != active_put)
- {
- GNUNET_DHT_put_cancel (active_put);
- active_put = NULL;
- }
zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
NULL);
}
namestore_iter = NULL;
last_num_public_records = num_public_records;
first_zone_iteration = GNUNET_NO;
- 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
- */
- put_interval = zone_publish_time_window;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "No records in namestore database.\n");
- }
- else
- {
- /* If records are present, next publication is based on the minimum
- * relative expiration time of the records published divided by 4
- */
- zone_publish_time_window
- = GNUNET_TIME_relative_min (GNUNET_TIME_relative_divide (min_relative_record_time, 4),
- zone_publish_time_window_default);
- put_interval = GNUNET_TIME_relative_divide (zone_publish_time_window,
- num_public_records);
- }
+ last_min_relative_record_time = min_relative_record_time;
+ calculate_put_interval ();
/* reset for next iteration */
- min_relative_record_time = GNUNET_TIME_UNIT_FOREVER_REL;
- put_interval = GNUNET_TIME_relative_max (MINIMUM_ZONE_ITERATION_INTERVAL,
- put_interval);
- put_interval = GNUNET_TIME_relative_min (put_interval,
- MAXIMUM_ZONE_ITERATION_INTERVAL);
+ min_relative_record_time
+ = GNUNET_TIME_relative_multiply (GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY,
+ PUBLISH_OPS_PER_EXPIRATION);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Zone iteration finished. Adjusted zone iteration interval to %s\n",
- GNUNET_STRINGS_relative_time_to_string (put_interval,
+ GNUNET_STRINGS_relative_time_to_string (target_iteration_velocity_per_record,
GNUNET_YES));
GNUNET_STATISTICS_set (statistics,
- "Current zone iteration interval (in ms)",
- put_interval.rel_value_us / 1000LL,
+ "Target zone iteration velocity (μs)",
+ target_iteration_velocity_per_record.rel_value_us,
GNUNET_NO);
- GNUNET_STATISTICS_update (statistics,
- "Number of zone iterations",
- 1,
- GNUNET_NO);
GNUNET_STATISTICS_set (statistics,
"Number of public records in DHT",
last_num_public_records,
GNUNET_NO);
GNUNET_assert (NULL == zone_publish_task);
- if (0 == num_public_records)
- zone_publish_task = GNUNET_SCHEDULER_add_delayed (put_interval,
+ if (0 == last_num_public_records)
+ {
+ zone_publish_task = GNUNET_SCHEDULER_add_delayed (target_iteration_velocity_per_record,
&publish_zone_dht_start,
NULL);
+ }
else
+ {
zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
NULL);
+ }
}
rd_public);
if (0 == rd_public_count)
{
- GNUNET_assert (NULL == zone_publish_task);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Record set empty, moving to next record set\n");
- check_zone_dht_next ();
+ check_zone_namestore_next ();
return;
}
/* We got a set of records to publish */
label,
rd_public,
rd_public_count,
- &dht_put_continuation,
ma);
+ put_cnt++;
+ if (0 == put_cnt % DELTA_INTERVAL)
+ update_velocity (DELTA_INTERVAL);
+ check_zone_namestore_next ();
if (NULL == ma->ph)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Could not perform DHT PUT, is the DHT running?\n");
GNUNET_free (ma);
- check_zone_dht_next ();
return;
}
dht_queue_length++;
}
-/**
- * Process a record that was stored in the namestore
- * (invoked by the monitor).
- *
- * @param cls closure, NULL
- * @param zone private key of the zone; NULL on disconnect
- * @param label label of the records; NULL on disconnect
- * @param rd_count number of entries in @a rd array, 0 if label was deleted
- * @param rd array of records with data to store
- */
-static void
-handle_monitor_event (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
- const char *label,
- unsigned int rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
-{
- struct GNUNET_GNSRECORD_Data rd_public[rd_count];
- unsigned int rd_public_count;
- struct DhtPutActivity *ma;
-
- GNUNET_STATISTICS_update (statistics,
- "Namestore monitor events received",
- 1,
- GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received %u records for label `%s' via namestore monitor\n",
- rd_count,
- label);
- /* filter out records that are not public, and convert to
- absolute expiration time. */
- rd_public_count = convert_records_for_export (rd,
- rd_count,
- rd_public);
- if (0 == rd_public_count)
- return; /* nothing to do */
- ma = GNUNET_new (struct DhtPutActivity);
- ma->start_date = GNUNET_TIME_absolute_get ();
- ma->ph = perform_dht_put (zone,
- label,
- rd,
- rd_count,
- &dht_put_monitor_continuation,
- ma);
- if (NULL == ma->ph)
- {
- /* PUT failed, do not remember operation */
- GNUNET_free (ma);
- return;
- }
- GNUNET_CONTAINER_DLL_insert (ma_head,
- ma_tail,
- ma);
-}
-
-
-/**
- * The zone monitor is now in SYNC with the current state of the
- * name store. Start to perform periodic iterations.
- *
- * @param cls NULL
- */
-static void
-monitor_sync_event (void *cls)
-{
- (void) cls;
- if ( (NULL == zone_publish_task) &&
- (NULL == namestore_iter) )
- zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
- NULL);
-}
-
-
-/**
- * The zone monitor encountered an IPC error trying to to get in
- * sync. Restart from the beginning.
- *
- * @param cls NULL
- */
-static void
-handle_monitor_error (void *cls)
-{
- (void) cls;
- GNUNET_STATISTICS_update (statistics,
- "Namestore monitor errors encountered",
- 1,
- GNUNET_NO);
- if (NULL != zone_publish_task)
- {
- GNUNET_SCHEDULER_cancel (zone_publish_task);
- zone_publish_task = NULL;
- }
- if (NULL != namestore_iter)
- {
- GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
- namestore_iter = NULL;
- }
- if (NULL != active_put)
- {
- GNUNET_DHT_put_cancel (active_put);
- active_put = NULL;
- }
- zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
- NULL);
-}
-
-
/**
* Performe zonemaster duties: watch namestore, publish records.
*
unsigned long long max_parallel_bg_queries = 128;
(void) cls;
+ (void) service;
last_put_100 = GNUNET_TIME_absolute_get (); /* first time! */
- min_relative_record_time = GNUNET_TIME_UNIT_FOREVER_REL;
+ min_relative_record_time
+ = GNUNET_TIME_relative_multiply (GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY,
+ PUBLISH_OPS_PER_EXPIRATION);
+ target_iteration_velocity_per_record = INITIAL_ZONE_ITERATION_INTERVAL;
namestore_handle = GNUNET_NAMESTORE_connect (c);
if (NULL == namestore_handle)
{
cache_keys = GNUNET_CONFIGURATION_get_value_yesno (c,
"namestore",
"CACHE_KEYS");
- put_interval = INITIAL_PUT_INTERVAL;
zone_publish_time_window_default = DEFAULT_ZONE_PUBLISH_TIME_WINDOW;
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_time (c,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not connect to DHT!\n"));
- GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_now (&shutdown_task,
+ NULL);
return;
}
/* Schedule periodic put for our records. */
- first_zone_iteration = GNUNET_YES;\
+ first_zone_iteration = GNUNET_YES;
statistics = GNUNET_STATISTICS_create ("zonemaster",
c);
- zmon = GNUNET_NAMESTORE_zone_monitor_start (c,
- NULL,
- GNUNET_NO,
- &handle_monitor_error,
- NULL,
- &handle_monitor_event,
- NULL,
- &monitor_sync_event,
- NULL);
- GNUNET_break (NULL != zmon);
- GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
+ GNUNET_STATISTICS_set (statistics,
+ "Target zone iteration velocity (μs)",
+ target_iteration_velocity_per_record.rel_value_us,
+ GNUNET_NO);
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
}
projects / oweals / gnunet.git / blobdiff