/*
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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
#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)
*/
#define DHT_QUEUE_LIMIT 2000
+/**
+ * How many events may the namestore give us before it has to wait
+ * for us to keep up?
+ */
+#define NAMESTORE_QUEUE_LIMIT 50
+
/**
* The initial interval in milliseconds btween puts in
* a zone iteration
*/
-#define INITIAL_PUT_INTERVAL GNUNET_TIME_UNIT_MILLISECONDS
+#define INITIAL_ZONE_ITERATION_INTERVAL GNUNET_TIME_UNIT_MILLISECONDS
/**
* The upper bound for the zone iteration interval
*/
#define MAXIMUM_ZONE_ITERATION_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
-/**
- * The default put interval for the zone iteration. In case
- * no option is found
- */
-#define DEFAULT_ZONE_PUBLISH_TIME_WINDOW GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
-
/**
* The factor the current zone iteration interval is divided by for each
* additional new record
*/
#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 unsigned int dht_queue_length;
-/**
- * Number of entries in the DHT queue #ma_head.
- */
-static unsigned int ma_queue_length;
-
/**
* Useful for zone update for DHT put
*/
* 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
(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);
/**
- * Continuation called from DHT once the PUT operation triggered
- * by a monitor is done.
- *
- * @param cls a `struct DhtPutActivity`
- */
-static void
-dht_put_monitor_continuation (void *cls)
-{
- struct DhtPutActivity *ma = cls;
-
- ma_queue_length--;
- GNUNET_CONTAINER_DLL_remove (ma_head,
- ma_tail,
- ma);
- GNUNET_free (ma);
-}
-
-
-/**
- * Calculate #next_put_interval.
+ * Calculate #target_iteration_velocity_per_record.
*/
static void
calculate_put_interval ()
* we can safely set the interval to the value for a single
* record
*/
- next_put_interval = zone_publish_time_window;
+ 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");
}
= GNUNET_TIME_relative_min (GNUNET_TIME_relative_divide (last_min_relative_record_time,
PUBLISH_OPS_PER_EXPIRATION),
zone_publish_time_window_default);
- next_put_interval
+ target_iteration_velocity_per_record
= GNUNET_TIME_relative_divide (zone_publish_time_window,
last_num_public_records);
}
- next_put_interval
- = GNUNET_TIME_relative_min (next_put_interval,
+ 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 ms)",
- last_min_relative_record_time.rel_value_us / 1000LL,
- GNUNET_NO);
+ "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 ms)",
- zone_publish_time_window.rel_value_us / 1000LL,
+ "Zone publication time window (in μs)",
+ zone_publish_time_window.rel_value_us,
GNUNET_NO);
GNUNET_STATISTICS_set (statistics,
"Target zone iteration velocity (μs)",
- next_put_interval.rel_value_us,
+ target_iteration_velocity_per_record.rel_value_us,
GNUNET_NO);
}
}
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_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;
+ 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 (it)",
dht_queue_length,
GNUNET_NO);
- GNUNET_STATISTICS_set (statistics,
- "# size of the DHT queue (mon)",
- ma_queue_length,
- GNUNET_NO);
GNUNET_STATISTICS_set (statistics,
"% speed increase needed for target velocity",
pct,
return; /* current NAMESTORE iteration not yet done */
update_velocity (put_cnt);
put_cnt = 0;
- delay = GNUNET_TIME_relative_subtract (next_put_interval,
+ 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_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,
rd_public_count = 0;
now = GNUNET_TIME_absolute_get ();
for (unsigned int i=0;i<rd_count;i++)
- if (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE))
+ {
+ if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE))
+ continue;
+ if ( (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)) &&
+ (rd[i].expiration_time < now.abs_value_us) )
+ continue; /* record already expired, skip it */
+ if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
{
- rd_public[rd_public_count] = rd[i];
- if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
- {
- /* GNUNET_GNSRECORD_block_create will convert to absolute time;
- we just need to adjust our iteration frequency */
- min_relative_record_time.rel_value_us =
- GNUNET_MIN (rd_public[rd_public_count].expiration_time,
- min_relative_record_time.rel_value_us);
- }
- else if (rd_public[rd_public_count].expiration_time < now.abs_value_us)
- {
- /* record already expired, skip it */
- continue;
- }
- rd_public_count++;
+ /* GNUNET_GNSRECORD_block_create will convert to absolute time;
+ we just need to adjust our iteration frequency */
+ min_relative_record_time.rel_value_us =
+ GNUNET_MIN (rd[i].expiration_time,
+ min_relative_record_time.rel_value_us);
}
+ rd_public[rd_public_count++] = rd[i];
+ }
return rd_public_count;
}
* @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_SCHEDULER_TaskCallback cont,
- void *cont_cls)
+ struct DhtPutActivity *ma)
{
struct GNUNET_GNSRECORD_Block *block;
struct GNUNET_HashCode query;
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);
}
calculate_put_interval ();
/* reset for next iteration */
min_relative_record_time
- = GNUNET_TIME_relative_multiply (GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY,
- PUBLISH_OPS_PER_EXPIRATION);
+ = GNUNET_TIME_UNIT_FOREVER_REL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Zone iteration finished. Adjusted zone iteration interval to %s\n",
- GNUNET_STRINGS_relative_time_to_string (next_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)",
- next_put_interval.rel_value_us / 1000LL,
+ "Target zone iteration velocity (μs)",
+ target_iteration_velocity_per_record.rel_value_us,
GNUNET_NO);
GNUNET_STATISTICS_set (statistics,
"Number of public records in DHT",
GNUNET_NO);
GNUNET_assert (NULL == zone_publish_task);
if (0 == last_num_public_records)
- zone_publish_task = GNUNET_SCHEDULER_add_delayed (next_put_interval,
+ {
+ 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);
+ }
}
label,
rd_public,
rd_public_count,
- &dht_put_continuation,
ma);
put_cnt++;
if (0 == put_cnt % DELTA_INTERVAL)
}
-/**
- * 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;
-
- (void) cls;
- 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 */
- num_public_records++;
- 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_tail (ma_head,
- ma_tail,
- ma);
- ma_queue_length++;
- if (ma_queue_length > DHT_QUEUE_LIMIT)
- {
- ma = it_head;
- GNUNET_CONTAINER_DLL_remove (ma_head,
- ma_tail,
- ma);
- GNUNET_DHT_put_cancel (ma->ph);
- ma_queue_length--;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "DHT PUT unconfirmed after %s, aborting PUT\n",
- GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (ma->start_date),
- GNUNET_YES));
- GNUNET_free (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.
*
(void) service;
last_put_100 = GNUNET_TIME_absolute_get (); /* first time! */
min_relative_record_time
- = GNUNET_TIME_relative_multiply (GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY,
- PUBLISH_OPS_PER_EXPIRATION);
- next_put_interval = INITIAL_PUT_INTERVAL;
+ = GNUNET_TIME_UNIT_FOREVER_REL;
+ 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");
- zone_publish_time_window_default = DEFAULT_ZONE_PUBLISH_TIME_WINDOW;
+ zone_publish_time_window_default = GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY;
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_time (c,
"zonemaster",
}
/* Schedule periodic put for our records. */
- first_zone_iteration = GNUNET_YES;\
+ first_zone_iteration = GNUNET_YES;
statistics = GNUNET_STATISTICS_create ("zonemaster",
c);
GNUNET_STATISTICS_set (statistics,
"Target zone iteration velocity (μs)",
- next_put_interval.rel_value_us,
+ target_iteration_velocity_per_record.rel_value_us,
GNUNET_NO);
- 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);
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
+ NULL);
GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
NULL);
}
projects / oweals / gnunet.git / blobdiff