[GNUnet-SVN] r11447 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-05-20 14:03:18 +0200 (Thu, 20 May 2010)
New Revision: 11447

Modified:
   gnunet/src/fs/fs_test_lib_data.conf
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/fs/test_fs_data.conf
   gnunet/src/fs/test_fs_download_data.conf
   gnunet/src/fs/test_fs_list_indexed_data.conf
   gnunet/src/fs/test_fs_publish_data.conf
Log:
stuff

Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2010-05-20 11:41:09 UTC (rev 11446)
+++ gnunet/src/fs/fs_test_lib_data.conf 2010-05-20 12:03:18 UTC (rev 11447)
@@ -21,7 +21,7 @@
 
 [datastore]
 #DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 
 [statistics]
 PORT = 43467
@@ -43,15 +43,16 @@
 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 
 

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-05-20 11:41:09 UTC (rev 11446)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-05-20 12:03:18 UTC (rev 11447)
@@ -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 @@
        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 @@
     }
   /* 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);

Modified: gnunet/src/fs/test_fs_data.conf
===================================================================
--- gnunet/src/fs/test_fs_data.conf     2010-05-20 11:41:09 UTC (rev 11446)
+++ gnunet/src/fs/test_fs_data.conf     2010-05-20 12:03:18 UTC (rev 11447)
@@ -37,6 +37,7 @@
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 
 [testing]

Modified: gnunet/src/fs/test_fs_download_data.conf
===================================================================
--- gnunet/src/fs/test_fs_download_data.conf    2010-05-20 11:41:09 UTC (rev 
11446)
+++ gnunet/src/fs/test_fs_download_data.conf    2010-05-20 12:03:18 UTC (rev 
11447)
@@ -36,6 +36,7 @@
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs

Modified: gnunet/src/fs/test_fs_list_indexed_data.conf
===================================================================
--- gnunet/src/fs/test_fs_list_indexed_data.conf        2010-05-20 11:41:09 UTC 
(rev 11446)
+++ gnunet/src/fs/test_fs_list_indexed_data.conf        2010-05-20 12:03:18 UTC 
(rev 11447)
@@ -36,6 +36,7 @@
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 # DEBUG = YES
 
 [testing]

Modified: gnunet/src/fs/test_fs_publish_data.conf
===================================================================
--- gnunet/src/fs/test_fs_publish_data.conf     2010-05-20 11:41:09 UTC (rev 
11446)
+++ gnunet/src/fs/test_fs_publish_data.conf     2010-05-20 12:03:18 UTC (rev 
11447)
@@ -36,6 +36,7 @@
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 
 [testing]