diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-05-20 12:03:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-05-20 12:03:18 +0000 |
commit | 5a221564de2abb721f3ba5fabbdd74cc502e424e (patch) | |
tree | 21c916bb7efd61805ae39e9957d14832051d80f8 /src | |
parent | 1595c455274f5e0998a154201853f7d61336d1c2 (diff) | |
download | gnunet-5a221564de2abb721f3ba5fabbdd74cc502e424e.tar.gz gnunet-5a221564de2abb721f3ba5fabbdd74cc502e424e.zip |
stuff
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/fs_test_lib_data.conf | 7 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs.c | 10 | ||||
-rw-r--r-- | src/fs/test_fs_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_download_data.conf | 1 | ||||
-rw-r--r-- | src/fs/test_fs_list_indexed_data.conf | 1 | ||||
-rw-r--r-- | 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 | |||
21 | 21 | ||
22 | [datastore] | 22 | [datastore] |
23 | #DEBUG = YES | 23 | #DEBUG = YES |
24 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | 24 | PREFIX = valgrind --tool=memcheck --leak-check=yes |
25 | 25 | ||
26 | [statistics] | 26 | [statistics] |
27 | PORT = 43467 | 27 | PORT = 43467 |
@@ -43,15 +43,16 @@ HOSTNAME = localhost | |||
43 | TOTAL_QUOTA_IN = 3932160 | 43 | TOTAL_QUOTA_IN = 3932160 |
44 | TOTAL_QUOTA_OUT = 3932160 | 44 | TOTAL_QUOTA_OUT = 3932160 |
45 | #DEBUG = YES | 45 | #DEBUG = YES |
46 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | 46 | PREFIX = valgrind --tool=memcheck --leak-check=yes |
47 | #BINARY = /home/grothoff/bin/gnunet-service-core | 47 | #BINARY = /home/grothoff/bin/gnunet-service-core |
48 | 48 | ||
49 | [fs] | 49 | [fs] |
50 | PORT = 43471 | 50 | PORT = 43471 |
51 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
52 | #OPTIONS = -L DEBUG | 52 | #OPTIONS = -L DEBUG |
53 | ACTIVEMIGRATION = NO | ||
53 | DEBUG = YES | 54 | DEBUG = YES |
54 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | 55 | PREFIX = valgrind --tool=memcheck --leak-check=yes |
55 | #BINARY = /home/grothoff/bin/gnunet-service-fs | 56 | #BINARY = /home/grothoff/bin/gnunet-service-fs |
56 | #PREFIX = xterm -e gdb -x cmd --args | 57 | #PREFIX = xterm -e gdb -x cmd --args |
57 | 58 | ||
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 @@ | |||
44 | #include "gnunet-service-fs_indexing.h" | 44 | #include "gnunet-service-fs_indexing.h" |
45 | #include "fs.h" | 45 | #include "fs.h" |
46 | 46 | ||
47 | #define DEBUG_FS GNUNET_YES | 47 | #define DEBUG_FS GNUNET_NO |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * Maximum number of outgoing messages we queue per peer. | 50 | * Maximum number of outgoing messages we queue per peer. |
@@ -936,10 +936,12 @@ process_migration_content (void *cls, | |||
936 | GNUNET_DATASTORE_get_next (dsh, GNUNET_YES); | 936 | GNUNET_DATASTORE_get_next (dsh, GNUNET_YES); |
937 | return; | 937 | return; |
938 | } | 938 | } |
939 | #if DEBUG_FS | ||
939 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 940 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
940 | "Retrieved block `%s' of type %u for migration\n", | 941 | "Retrieved block `%s' of type %u for migration\n", |
941 | GNUNET_h2s (key), | 942 | GNUNET_h2s (key), |
942 | type); | 943 | type); |
944 | #endif | ||
943 | mb = GNUNET_malloc (sizeof (struct MigrationReadyBlock) + size); | 945 | mb = GNUNET_malloc (sizeof (struct MigrationReadyBlock) + size); |
944 | mb->query = *key; | 946 | mb->query = *key; |
945 | mb->expiration = expiration; | 947 | mb->expiration = expiration; |
@@ -3469,7 +3471,11 @@ main_init (struct GNUNET_SCHEDULER_Handle *s, | |||
3469 | } | 3471 | } |
3470 | /* FIXME: distinguish between sending and storing in options? */ | 3472 | /* FIXME: distinguish between sending and storing in options? */ |
3471 | if (active_migration) | 3473 | if (active_migration) |
3472 | consider_migration_gathering (); | 3474 | { |
3475 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | ||
3476 | _("Content migration is enabled, will start to gather data\n")); | ||
3477 | consider_migration_gathering (); | ||
3478 | } | ||
3473 | GNUNET_SERVER_disconnect_notify (server, | 3479 | GNUNET_SERVER_disconnect_notify (server, |
3474 | &handle_client_disconnect, | 3480 | &handle_client_disconnect, |
3475 | NULL); | 3481 | 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 | |||
37 | [fs] | 37 | [fs] |
38 | PORT = 42471 | 38 | PORT = 42471 |
39 | HOSTNAME = localhost | 39 | HOSTNAME = localhost |
40 | ACTIVEMIGRATION = NO | ||
40 | #DEBUG = YES | 41 | #DEBUG = YES |
41 | 42 | ||
42 | [testing] | 43 | [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 | |||
36 | [fs] | 36 | [fs] |
37 | PORT = 42471 | 37 | PORT = 42471 |
38 | HOSTNAME = localhost | 38 | HOSTNAME = localhost |
39 | ACTIVEMIGRATION = NO | ||
39 | #DEBUG = YES | 40 | #DEBUG = YES |
40 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | 41 | #PREFIX = valgrind --tool=memcheck --leak-check=yes |
41 | #BINARY = /home/grothoff/bin/gnunet-service-fs | 42 | #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 | |||
36 | [fs] | 36 | [fs] |
37 | PORT = 42471 | 37 | PORT = 42471 |
38 | HOSTNAME = localhost | 38 | HOSTNAME = localhost |
39 | ACTIVEMIGRATION = NO | ||
39 | # DEBUG = YES | 40 | # DEBUG = YES |
40 | 41 | ||
41 | [testing] | 42 | [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 | |||
36 | [fs] | 36 | [fs] |
37 | PORT = 42471 | 37 | PORT = 42471 |
38 | HOSTNAME = localhost | 38 | HOSTNAME = localhost |
39 | ACTIVEMIGRATION = NO | ||
39 | #DEBUG = YES | 40 | #DEBUG = YES |
40 | 41 | ||
41 | [testing] | 42 | [testing] |