diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-02-20 14:44:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-02-20 14:44:23 +0000 |
commit | 8d12570d50b9d9181cdf7ef5b84696597227dcb1 (patch) | |
tree | f9516a332f442c4d5440d9f0fc418a282c2fa436 /src | |
parent | f06ca9dcef0d602baa3a7c6462baff0dd70b2e4a (diff) | |
download | gnunet-8d12570d50b9d9181cdf7ef5b84696597227dcb1.tar.gz gnunet-8d12570d50b9d9181cdf7ef5b84696597227dcb1.zip |
fix
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/gnunet-service-fs.c | 8 | ||||
-rw-r--r-- | src/fs/test_fs_lib_data.conf | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index da7d6fb0a..b76542767 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -1665,6 +1665,11 @@ process_reply (void *cls, | |||
1665 | /* only possible reply, stop requesting! */ | 1665 | /* only possible reply, stop requesting! */ |
1666 | while (NULL != pr->pending_head) | 1666 | while (NULL != pr->pending_head) |
1667 | destroy_pending_message_list_entry (pr->pending_head); | 1667 | destroy_pending_message_list_entry (pr->pending_head); |
1668 | if (pr->drq != NULL) | ||
1669 | { | ||
1670 | GNUNET_FS_drq_get_cancel (pr->drq); | ||
1671 | pr->drq = NULL; | ||
1672 | } | ||
1668 | GNUNET_break (GNUNET_YES == | 1673 | GNUNET_break (GNUNET_YES == |
1669 | GNUNET_CONTAINER_multihashmap_remove (query_request_map, | 1674 | GNUNET_CONTAINER_multihashmap_remove (query_request_map, |
1670 | key, | 1675 | key, |
@@ -1985,7 +1990,8 @@ process_local_reply (void *cls, | |||
1985 | process_reply (&prq, key, pr); | 1990 | process_reply (&prq, key, pr); |
1986 | 1991 | ||
1987 | if ( (GNUNET_YES == test_load_too_high()) || | 1992 | if ( (GNUNET_YES == test_load_too_high()) || |
1988 | (pr->results_found > 5 + 2 * pr->priority) ) | 1993 | (pr->results_found > 5 + 2 * pr->priority) || |
1994 | (type == GNUNET_DATASTORE_BLOCKTYPE_DBLOCK) ) | ||
1989 | { | 1995 | { |
1990 | GNUNET_FS_drq_get_next (GNUNET_NO); | 1996 | GNUNET_FS_drq_get_next (GNUNET_NO); |
1991 | return; | 1997 | return; |
diff --git a/src/fs/test_fs_lib_data.conf b/src/fs/test_fs_lib_data.conf index 43fea398e..693342be0 100644 --- a/src/fs/test_fs_lib_data.conf +++ b/src/fs/test_fs_lib_data.conf | |||
@@ -44,8 +44,9 @@ HOSTNAME = localhost | |||
44 | PORT = 43471 | 44 | PORT = 43471 |
45 | HOSTNAME = localhost | 45 | HOSTNAME = localhost |
46 | DEBUG = YES | 46 | DEBUG = YES |
47 | PREFIX = valgrind --tool=memcheck --leak-check=yes | 47 | #PREFIX = valgrind --tool=memcheck --leak-check=yes |
48 | #BINARY = /home/grothoff/bin/gnunet-service-fs | 48 | #BINARY = /home/grothoff/bin/gnunet-service-fs |
49 | #PREFIX = xterm -e gdb -x cmd --args | ||
49 | 50 | ||
50 | [testing] | 51 | [testing] |
51 | WEAKRANDOM = YES | 52 | WEAKRANDOM = YES |