/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
+ (C) 2009-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#define INSANE_STATISTICS GNUNET_NO
/**
- * If obtaining a block via stream fails, how often do we retry it before
+ * If obtaining a block via mesh fails, how often do we retry it before
* giving up for good (and sticking to non-anonymous transfer)?
*/
-#define STREAM_RETRY_MAX 3
+#define MESH_RETRY_MAX 3
/**
struct GNUNET_DHT_GetHandle *gh;
/**
- * Stream request handle for this request (or NULL for none).
+ * Mesh request handle for this request (or NULL for none).
*/
- struct GSF_StreamRequest *stream_request;
+ struct GSF_MeshRequest *mesh_request;
/**
* Function to call upon completion of the local get
uint64_t first_uid;
/**
- * How often have we retried this request via 'stream'?
+ * How often have we retried this request via 'mesh'?
* (used to bound overall retries).
*/
- unsigned int stream_retry_count;
+ unsigned int mesh_retry_count;
/**
* Number of valid entries in the 'replies_seen' array.
{
pr->hnode =
GNUNET_CONTAINER_heap_insert (requests_by_expiration_heap, pr,
- pr->public_data.ttl.abs_value);
+ pr->public_data.ttl.abs_value_us);
/* make sure we don't track too many requests */
while (GNUNET_CONTAINER_heap_get_size (requests_by_expiration_heap) >
max_pending_requests)
pr->public_data.respect_offered += prio;
gm->priority = htonl (prio);
now = GNUNET_TIME_absolute_get ();
- ttl = (int64_t) (pr->public_data.ttl.abs_value - now.abs_value);
- gm->ttl = htonl (ttl / 1000);
+ ttl = (int64_t) (pr->public_data.ttl.abs_value_us - now.abs_value_us);
+ gm->ttl = htonl (ttl / 1000LL / 1000LL);
gm->filter_mutator = htonl (pr->mingle);
gm->hash_bitmap = htonl (bm);
gm->query = pr->public_data.query;
GNUNET_DHT_get_stop (pr->gh);
pr->gh = NULL;
}
- if (NULL != pr->stream_request)
+ if (NULL != pr->mesh_request)
{
- GSF_stream_query_cancel (pr->stream_request);
- pr->stream_request = NULL;
+ GSF_mesh_query_cancel (pr->mesh_request);
+ pr->mesh_request = NULL;
}
if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
{
GNUNET_DHT_get_stop (pr->gh);
pr->gh = NULL;
}
- if (NULL != pr->stream_request)
+ if (NULL != pr->mesh_request)
{
- GSF_stream_query_cancel (pr->stream_request);
- pr->stream_request = NULL;
+ GSF_mesh_query_cancel (pr->mesh_request);
+ pr->mesh_request = NULL;
}
if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
{
update_request_performance_data (prq, pr);
GNUNET_LOAD_update (GSF_rt_entry_lifetime,
GNUNET_TIME_absolute_get_duration (pr->
- public_data.start_time).rel_value);
+ public_data.start_time).rel_value_us);
if (GNUNET_YES !=
GSF_request_plan_reference_get_last_transmission_ (pr->public_data.pr_head,
prq->sender,
&last_transmission))
- last_transmission.abs_value = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value;
+ last_transmission.abs_value_us = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
/* pass on to other peers / local clients */
pr->rh (pr->rh_cls, prq->eval, pr, prq->anonymity_level, prq->expiration,
last_transmission, prq->type, prq->data, prq->size);
if (! GSF_request_plan_reference_get_last_transmission_ (pr->public_data.pr_head,
prq->sender,
&last_transmission))
- last_transmission.abs_value = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value;
+ last_transmission.abs_value_us = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
pr->rh (pr->rh_cls, prq->eval, pr,
prq->anonymity_level, prq->expiration,
last_transmission, prq->type, prq->data, prq->size);
if (GNUNET_SYSERR != success)
{
GNUNET_LOAD_update (datastore_put_load,
- GNUNET_TIME_absolute_get_duration (pmc->start).rel_value);
+ GNUNET_TIME_absolute_get_duration (pmc->start).rel_value_us);
}
else
{
/* on queue failure / timeout, increase the put load dramatically */
GNUNET_LOAD_update (datastore_put_load,
- GNUNET_TIME_UNIT_MINUTES.rel_value);
+ GNUNET_TIME_UNIT_MINUTES.rel_value_us);
}
}
cp = GSF_peer_get_ (&pmc->origin);
if (NULL != cp)
{
ppd = GSF_get_peer_performance_data_ (cp);
- ppd->migration_delay.rel_value /= 2;
+ ppd->migration_delay.rel_value_us /= 2;
}
GNUNET_free (pmc);
return;
(NULL != cp) )
{
ppd = GSF_get_peer_performance_data_ (cp);
- if (min_expiration.abs_value > 0)
+ if (min_expiration.abs_value_us > 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking to stop migration for %s because datastore is full\n",
ppd->migration_delay);
ppd->migration_delay = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_HOURS,
ppd->migration_delay);
- mig_pause.rel_value = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
- ppd->migration_delay.rel_value);
+ mig_pause.rel_value_us = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ ppd->migration_delay.rel_value_us);
ppd->migration_delay = GNUNET_TIME_relative_multiply (ppd->migration_delay, 2);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Replicated content already exists locally, asking to stop migration for %s\n",
/**
- * Function called with a reply from the stream.
+ * Function called with a reply from the mesh.
*
* @param cls the pending request struct
* @param type type of the block, ANY on error
* @param data reply block data, NULL on error
*/
static void
-stream_reply_proc (void *cls,
+mesh_reply_proc (void *cls,
enum GNUNET_BLOCK_Type type,
struct GNUNET_TIME_Absolute expiration,
size_t data_size,
struct ProcessReplyClosure prq;
struct GNUNET_HashCode query;
- pr->stream_request = NULL;
+ pr->mesh_request = NULL;
if (GNUNET_BLOCK_TYPE_ANY == type)
{
GNUNET_break (NULL == data);
GNUNET_break (0 == data_size);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error retrieiving block via stream\n");
- pr->stream_retry_count++;
- if (pr->stream_retry_count >= STREAM_RETRY_MAX)
- return; /* give up on stream */
+ "Error retrieiving block via mesh\n");
+ pr->mesh_retry_count++;
+ if (pr->mesh_retry_count >= MESH_RETRY_MAX)
+ return; /* give up on mesh */
/* retry -- without delay, as this is non-anonymous
- and mesh/stream connect will take some time anyway */
- pr->stream_request = GSF_stream_query (pr->public_data.target,
+ and mesh/mesh connect will take some time anyway */
+ pr->mesh_request = GSF_mesh_query (pr->public_data.target,
&pr->public_data.query,
pr->public_data.type,
- &stream_reply_proc,
+ &mesh_reply_proc,
pr);
return;
}
return;
}
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Replies received from STREAM"), 1,
+ gettext_noop ("# Replies received from MESH"), 1,
GNUNET_NO);
memset (&prq, 0, sizeof (prq));
prq.data = data;
/**
- * Consider downloading via stream (if possible)
+ * Consider downloading via mesh (if possible)
*
* @param pr the pending request to process
*/
void
-GSF_stream_lookup_ (struct GSF_PendingRequest *pr)
+GSF_mesh_lookup_ (struct GSF_PendingRequest *pr)
{
if (0 != pr->public_data.anonymity_level)
return;
if (0 == pr->public_data.target)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Cannot do stream-based download, target peer not known\n");
+ "Cannot do mesh-based download, target peer not known\n");
return;
}
- if (NULL != pr->stream_request)
+ if (NULL != pr->mesh_request)
return;
- pr->stream_request = GSF_stream_query (pr->public_data.target,
- &pr->public_data.query,
- pr->public_data.type,
- &stream_reply_proc,
- pr);
+ pr->mesh_request = GSF_mesh_query (pr->public_data.target,
+ &pr->public_data.query,
+ pr->public_data.type,
+ &mesh_reply_proc,
+ pr);
}
GSF_LocalLookupContinuation cont, void *cont_cls)
{
GNUNET_assert (NULL == pr->gh);
- GNUNET_assert (NULL == pr->stream_request);
+ GNUNET_assert (NULL == pr->mesh_request);
GNUNET_assert (NULL == pr->llc_cont);
pr->llc_cont = cont;
pr->llc_cont_cls = cont_cls;
(GNUNET_CRYPTO_QUALITY_WEAK,
(unsigned int) (60000 * putl * putl)));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking to stop migration for %llu ms because of load %f and events %d/%d\n",
- (unsigned long long) block_time.rel_value,
+ "Asking to stop migration for %s because of load %f and events %d/%d\n",
+ GNUNET_STRINGS_relative_time_to_string (block_time,
+ GNUNET_YES),
putl,
active_to_migration,
(GNUNET_NO == prq.request_found));