diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-03-31 15:35:00 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-03-31 15:35:00 +0000 |
commit | dfe8a19d9d0aebc8711992a99628732dbe674621 (patch) | |
tree | 12f188f126d79ac73f8d46f112b53e34c7e5e677 /src/fs/gnunet-service-fs_push.c | |
parent | b6f0365dd1cf3fbd6af64500cf9547583989e68b (diff) | |
download | gnunet-dfe8a19d9d0aebc8711992a99628732dbe674621.tar.gz gnunet-dfe8a19d9d0aebc8711992a99628732dbe674621.zip |
fix migration support
Diffstat (limited to 'src/fs/gnunet-service-fs_push.c')
-rw-r--r-- | src/fs/gnunet-service-fs_push.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c index b96ee3d1c..38d916832 100644 --- a/src/fs/gnunet-service-fs_push.c +++ b/src/fs/gnunet-service-fs_push.c | |||
@@ -525,9 +525,11 @@ process_migration_content (void *cls, | |||
525 | } | 525 | } |
526 | #if DEBUG_FS | 526 | #if DEBUG_FS |
527 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 527 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
528 | "Retrieved block `%s' of type %u for migration\n", | 528 | "Retrieved block `%s' of type %u for migration (queue size: %u/%u)\n", |
529 | GNUNET_h2s (key), | 529 | GNUNET_h2s (key), |
530 | type); | 530 | type, |
531 | mig_size + 1, | ||
532 | MIGRATION_LIST_SIZE); | ||
531 | #endif | 533 | #endif |
532 | mb = GNUNET_malloc (sizeof (struct MigrationReadyBlock) + size); | 534 | mb = GNUNET_malloc (sizeof (struct MigrationReadyBlock) + size); |
533 | mb->query = *key; | 535 | mb->query = *key; |
@@ -570,6 +572,8 @@ gather_migration_blocks (void *cls, | |||
570 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 572 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
571 | { | 573 | { |
572 | mig_task = GNUNET_SCHEDULER_NO_TASK; | 574 | mig_task = GNUNET_SCHEDULER_NO_TASK; |
575 | if (mig_size >= MAX_MIGRATION_QUEUE) | ||
576 | return; | ||
573 | if (GSF_dsh != NULL) | 577 | if (GSF_dsh != NULL) |
574 | { | 578 | { |
575 | mig_qe = GNUNET_DATASTORE_get_random (GSF_dsh, | 579 | mig_qe = GNUNET_DATASTORE_get_random (GSF_dsh, |