#include "gnunet-service-fs_push.h"
-#define DEBUG_FS_MIGRATION GNUNET_NO
+/**
+ * Maximum number of blocks we keep in memory for migration.
+ */
+#define MAX_MIGRATION_QUEUE 8
+
+/**
+ * Blocks are at most migrated to this number of peers
+ * plus one, each time they are fetched from the database.
+ */
+#define MIGRATION_LIST_SIZE 2
/**
- * How long must content remain valid for us to consider it for migration?
+ * How long must content remain valid for us to consider it for migration?
* If content will expire too soon, there is clearly no point in pushing
* it to other peers. This value gives the threshold for migration. Note
* that if this value is increased, the migration testcase may need to be
/**
* Query for the block.
*/
- GNUNET_HashCode query;
+ struct GNUNET_HashCode query;
/**
- * When does this block expire?
+ * When does this block expire?
*/
struct GNUNET_TIME_Absolute expiration;
/**
* Find content for migration to this peer.
*/
-static void find_content (struct MigrationReadyPeer *mrp);
+static void
+find_content (struct MigrationReadyPeer *mrp);
/**
peer->msg = NULL;
if (buf == NULL)
{
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to migrate content to another peer (disconnect)\n");
-#endif
GNUNET_free (msg);
return 0;
}
GNUNET_assert (msize <= buf_size);
memcpy (buf, msg, msize);
GNUNET_free (msg);
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Pushing %u bytes to another peer\n",
msize);
-#endif
find_content (peer);
return msize;
}
{
ret = GNUNET_NO;
}
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking for transmission of %u bytes for migration\n", msize);
-#endif
peer->th = GSF_peer_transmit_ (peer->peer, GNUNET_NO, 0 /* priority */ ,
GNUNET_TIME_UNIT_FOREVER_REL, msize,
&transmit_message, peer);
/**
* Check if sending this block to this peer would
- * be a good idea.
+ * be a good idea.
*
* @param peer target peer
* @param block the block
unsigned int i;
struct GSF_PeerPerformanceData *ppd;
struct GNUNET_PeerIdentity id;
+ struct GNUNET_HashCode hc;
uint32_t dist;
ppd = GSF_get_peer_performance_data_ (peer->peer);
return -1;
GNUNET_assert (0 != ppd->pid);
GNUNET_PEER_resolve (ppd->pid, &id);
- dist = GNUNET_CRYPTO_hash_distance_u32 (&block->query, &id.hashPubKey);
+ GNUNET_CRYPTO_hash (&id, sizeof (struct GNUNET_PeerIdentity), &hc);
+ dist = GNUNET_CRYPTO_hash_distance_u32 (&block->query, &hc);
/* closer distance, higher score: */
return UINT32_MAX - dist;
}
* If the migration task is not currently running, consider
* (re)scheduling it with the appropriate delay.
*/
-static void consider_gathering (void);
+static void
+consider_gathering (void);
/**
{
if (mig_size < MAX_MIGRATION_QUEUE)
{
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"No content found for pushing, waiting for queue to fill\n");
-#endif
return; /* will fill up eventually... */
}
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"No suitable content found, purging content from full queue\n");
-#endif
/* failed to find migration target AND
* queue is full, purge most-forwarded
* block from queue to make room for more */
consider_gathering ();
return;
}
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Preparing to push best content to peer\n");
-#endif
transmit_content (mrp, best);
}
/**
* Task that is run periodically to obtain blocks for content
* migration
- *
+ *
* @param cls unused
* @param tc scheduler context (also unused)
*/
-static void gather_migration_blocks (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext
- *tc);
+static void
+gather_migration_blocks (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, mig_size);
delay = GNUNET_TIME_relative_divide (delay, MAX_MIGRATION_QUEUE);
delay = GNUNET_TIME_relative_max (delay, min_migration_delay);
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Scheduling gathering task (queue size: %u)\n", mig_size);
-#endif
mig_task =
GNUNET_SCHEDULER_add_delayed (delay, &gather_migration_blocks, NULL);
}
* maybe 0 if no unique identifier is available
*/
static void
-process_migration_content (void *cls, const GNUNET_HashCode * key, size_t size,
+process_migration_content (void *cls, const struct GNUNET_HashCode * key, size_t size,
const void *data, enum GNUNET_BLOCK_Type type,
uint32_t priority, uint32_t anonymity,
struct GNUNET_TIME_Absolute expiration, uint64_t uid)
mig_qe = NULL;
if (key == NULL)
{
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No content found for migration...\n");
-#endif
consider_gathering ();
return;
}
- if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value <
- MIN_MIGRATION_CONTENT_LIFETIME.rel_value)
+ if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us <
+ MIN_MIGRATION_CONTENT_LIFETIME.rel_value_us)
{
/* content will expire soon, don't bother */
consider_gathering ();
consider_gathering ();
return;
}
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Retrieved block `%s' of type %u for migration (queue size: %u/%u)\n",
GNUNET_h2s (key), type, mig_size + 1, MAX_MIGRATION_QUEUE);
-#endif
mb = GNUNET_malloc (sizeof (struct MigrationReadyBlock) + size);
mb->query = *key;
mb->expiration = expiration;
{
if (NULL == pos->th)
{
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Preparing to push best content to peer\n");
-#endif
if (GNUNET_YES == transmit_content (pos, mb))
break; /* 'mb' was freed! */
}
/**
* Task that is run periodically to obtain blocks for content
* migration
- *
+ *
* @param cls unused
* @param tc scheduler context (also unused)
*/
return;
if (GSF_dsh != NULL)
{
-#if DEBUG_FS_MIGRATION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking datastore for content for replication (queue size: %u)\n",
mig_size);
-#endif
mig_qe =
GNUNET_DATASTORE_get_for_replication (GSF_dsh, 0, UINT_MAX,
GNUNET_TIME_UNIT_FOREVER_REL,
if (GNUNET_YES != enabled)
return;
- mrp = GNUNET_malloc (sizeof (struct MigrationReadyPeer));
+ mrp = GNUNET_new (struct MigrationReadyPeer);
mrp->peer = peer;
find_content (mrp);
GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, mrp);
GNUNET_CONFIGURATION_get_value_time (GSF_cfg, "fs", "MIN_MIGRATION_DELAY",
&min_migration_delay))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Invalid value specified for option `%s' in section `%s', content pushing disabled\n"),
- "MIN_MIGRATION_DELAY", "fs");
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
+ "fs", "MIN_MIGRATION_DELAY",
+ _("time required, content pushing disabled"));
return;
}
consider_gathering ();
projects / oweals / gnunet.git / blobdiff