From 5a221564de2abb721f3ba5fabbdd74cc502e424e Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 20 May 2010 12:03:18 +0000
Subject: [PATCH] stuff

---
 src/fs/fs_test_lib_data.conf          |  7 ++++---
 src/fs/gnunet-service-fs.c            | 10 ++++++++--
 src/fs/test_fs_data.conf              |  1 +
 src/fs/test_fs_download_data.conf     |  1 +
 src/fs/test_fs_list_indexed_data.conf |  1 +
 src/fs/test_fs_publish_data.conf      |  1 +
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 37851242f..fca127312 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -21,7 +21,7 @@ DEFAULTSERVICES = fs
 
 [datastore]
 #DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 
 [statistics]
 PORT = 43467
@@ -43,15 +43,16 @@ HOSTNAME = localhost
 TOTAL_QUOTA_IN = 3932160
 TOTAL_QUOTA_OUT = 3932160
 #DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-core
 
 [fs]
 PORT = 43471
 HOSTNAME = localhost
 #OPTIONS = -L DEBUG
+ACTIVEMIGRATION = NO
 DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs
 #PREFIX = xterm -e gdb -x cmd --args 
 
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index a183336ee..761d9a364 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -44,7 +44,7 @@
 #include "gnunet-service-fs_indexing.h"
 #include "fs.h"
 
-#define DEBUG_FS GNUNET_YES
+#define DEBUG_FS GNUNET_NO
 
 /**
  * Maximum number of outgoing messages we queue per peer.
@@ -936,10 +936,12 @@ process_migration_content (void *cls,
 	GNUNET_DATASTORE_get_next (dsh, GNUNET_YES);
       return;
     }
+#if DEBUG_FS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 	      "Retrieved block `%s' of type %u for migration\n",
 	      GNUNET_h2s (key),
 	      type);
+#endif
   mb = GNUNET_malloc (sizeof (struct MigrationReadyBlock) + size);
   mb->query = *key;
   mb->expiration = expiration;
@@ -3469,7 +3471,11 @@ main_init (struct GNUNET_SCHEDULER_Handle *s,
     }
   /* FIXME: distinguish between sending and storing in options? */
   if (active_migration) 
-    consider_migration_gathering ();
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+		  _("Content migration is enabled, will start to gather data\n"));
+      consider_migration_gathering ();
+    }
   GNUNET_SERVER_disconnect_notify (server, 
 				   &handle_client_disconnect,
 				   NULL);
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index 1ee233c78..53fc6b500 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -37,6 +37,7 @@ HOSTNAME = localhost
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 
 [testing]
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index c5e839765..c154ba1b3 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -36,6 +36,7 @@ HOSTNAME = localhost
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 84a03a3c0..06317822a 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -36,6 +36,7 @@ HOSTNAME = localhost
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 # DEBUG = YES
 
 [testing]
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index d6952c4d4..124f925b1 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -36,6 +36,7 @@ HOSTNAME = localhost
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 
 [testing]
-- 
2.25.1