diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-02 09:59:08 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-02 09:59:08 +0000 |
commit | 8b2d60904c7a968179505e89c3b362758ad7aaea (patch) | |
tree | 3cdddc428d5049b925402fe3df768b12111a539b | |
parent | bdef044d942a5f75f698bef989a1e768e79d2976 (diff) | |
download | gnunet-8b2d60904c7a968179505e89c3b362758ad7aaea.tar.gz gnunet-8b2d60904c7a968179505e89c3b362758ad7aaea.zip |
fix DHT start, be less verbose
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_learning.c | 14 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_peer1.conf | 3 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_peer2.conf | 3 | ||||
-rw-r--r-- | src/hostlist/test_learning_adv_peer.conf | 3 | ||||
-rw-r--r-- | src/hostlist/test_learning_learn_peer.conf | 3 |
5 files changed, 24 insertions, 2 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 43199bd91..7fd291375 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c | |||
@@ -30,30 +30,37 @@ | |||
30 | #include "gnunet_resolver_service.h" | 30 | #include "gnunet_resolver_service.h" |
31 | #include "gnunet_statistics_service.h" | 31 | #include "gnunet_statistics_service.h" |
32 | 32 | ||
33 | #define VERBOSE GNUNET_YES | 33 | #define VERBOSE GNUNET_NO |
34 | 34 | ||
35 | #define START_ARM GNUNET_YES | 35 | #define START_ARM GNUNET_YES |
36 | |||
36 | #define MAX_URL_LEN 1000 | 37 | #define MAX_URL_LEN 1000 |
37 | 38 | ||
38 | /** | 39 | /** |
39 | * How long until wait until testcases fails | 40 | * How long until wait until testcases fails |
40 | */ | 41 | */ |
41 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180) | 42 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180) |
43 | |||
42 | #define CHECK_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) | 44 | #define CHECK_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) |
43 | 45 | ||
44 | static int timeout; | 46 | static int timeout; |
47 | |||
45 | static int adv_sent; | 48 | static int adv_sent; |
49 | |||
46 | static int adv_arrived; | 50 | static int adv_arrived; |
47 | 51 | ||
48 | static int learned_hostlist_saved; | 52 | static int learned_hostlist_saved; |
53 | |||
49 | static int learned_hostlist_downloaded; | 54 | static int learned_hostlist_downloaded; |
50 | 55 | ||
51 | static char * current_adv_uri; | 56 | static char * current_adv_uri; |
52 | 57 | ||
53 | static const struct GNUNET_CONFIGURATION_Handle *cfg; | 58 | static const struct GNUNET_CONFIGURATION_Handle *cfg; |
59 | |||
54 | static struct GNUNET_SCHEDULER_Handle *sched; | 60 | static struct GNUNET_SCHEDULER_Handle *sched; |
55 | 61 | ||
56 | static GNUNET_SCHEDULER_TaskIdentifier timeout_task; | 62 | static GNUNET_SCHEDULER_TaskIdentifier timeout_task; |
63 | |||
57 | static GNUNET_SCHEDULER_TaskIdentifier check_task; | 64 | static GNUNET_SCHEDULER_TaskIdentifier check_task; |
58 | 65 | ||
59 | struct PeerContext | 66 | struct PeerContext |
@@ -73,9 +80,12 @@ static struct PeerContext adv_peer; | |||
73 | static struct PeerContext learn_peer; | 80 | static struct PeerContext learn_peer; |
74 | 81 | ||
75 | static struct GNUNET_STATISTICS_GetHandle * download_stats; | 82 | static struct GNUNET_STATISTICS_GetHandle * download_stats; |
83 | |||
76 | static struct GNUNET_STATISTICS_GetHandle * urisrecv_stat; | 84 | static struct GNUNET_STATISTICS_GetHandle * urisrecv_stat; |
85 | |||
77 | static struct GNUNET_STATISTICS_GetHandle * advsent_stat; | 86 | static struct GNUNET_STATISTICS_GetHandle * advsent_stat; |
78 | 87 | ||
88 | |||
79 | static void shutdown_testcase() | 89 | static void shutdown_testcase() |
80 | { | 90 | { |
81 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown testcase....\n"); | 91 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown testcase....\n"); |
@@ -517,4 +527,4 @@ main (int argc, char *argv[]) | |||
517 | return ret; | 527 | return ret; |
518 | } | 528 | } |
519 | 529 | ||
520 | /* end of test_gnunet_daemon_hostlist.c */ | 530 | /* end of test_gnunet_daemon_hostlist_learning.c */ |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf index be5db7582..4d7d32859 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf | |||
@@ -61,3 +61,6 @@ AUTOSTART = NO | |||
61 | [datastore] | 61 | [datastore] |
62 | AUTOSTART = NO | 62 | AUTOSTART = NO |
63 | 63 | ||
64 | [dht] | ||
65 | AUTOSTART = NO | ||
66 | |||
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf index dd47a27e6..49ccdccfa 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf | |||
@@ -59,3 +59,6 @@ AUTOSTART = NO | |||
59 | 59 | ||
60 | [datastore] | 60 | [datastore] |
61 | AUTOSTART = NO | 61 | AUTOSTART = NO |
62 | |||
63 | [dht] | ||
64 | AUTOSTART = NO \ No newline at end of file | ||
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf index d15fe0bae..b1d263244 100644 --- a/src/hostlist/test_learning_adv_peer.conf +++ b/src/hostlist/test_learning_adv_peer.conf | |||
@@ -58,3 +58,6 @@ AUTOSTART = NO | |||
58 | 58 | ||
59 | [datastore] | 59 | [datastore] |
60 | AUTOSTART = NO | 60 | AUTOSTART = NO |
61 | |||
62 | [dht] | ||
63 | AUTOSTART = NO | ||
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf index e6e6771e0..e871c609c 100644 --- a/src/hostlist/test_learning_learn_peer.conf +++ b/src/hostlist/test_learning_learn_peer.conf | |||
@@ -60,3 +60,6 @@ AUTOSTART = NO | |||
60 | 60 | ||
61 | [datastore] | 61 | [datastore] |
62 | AUTOSTART = NO | 62 | AUTOSTART = NO |
63 | |||
64 | [dht] | ||
65 | AUTOSTART = NO | ||