diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-18 05:34:34 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-18 05:34:34 +0000 |
commit | 45a6c8033e511e2d3dc3f20cb62248c77ee90725 (patch) | |
tree | c6ee2c18875b6bd4f950e463f04dcee3db8d2937 /src/dht/test_dht_topo.c | |
parent | 04630c5e40fc4de16393894d0b5ff2ca9055f4e2 (diff) | |
download | gnunet-45a6c8033e511e2d3dc3f20cb62248c77ee90725.tar.gz gnunet-45a6c8033e511e2d3dc3f20cb62248c77ee90725.zip |
-code cleanup
Diffstat (limited to 'src/dht/test_dht_topo.c')
-rw-r--r-- | src/dht/test_dht_topo.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c index cb0399da9..ed746a583 100644 --- a/src/dht/test_dht_topo.c +++ b/src/dht/test_dht_topo.c | |||
@@ -30,8 +30,6 @@ | |||
30 | #include "gnunet_testing_lib.h" | 30 | #include "gnunet_testing_lib.h" |
31 | #include "gnunet_dht_service.h" | 31 | #include "gnunet_dht_service.h" |
32 | 32 | ||
33 | #define VERBOSE GNUNET_NO | ||
34 | |||
35 | #define REMOVE_DIR GNUNET_YES | 33 | #define REMOVE_DIR GNUNET_YES |
36 | 34 | ||
37 | /** | 35 | /** |
@@ -401,15 +399,9 @@ peergroup_ready (void *cls, const char *emsg) | |||
401 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); | 399 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); |
402 | return; | 400 | return; |
403 | } | 401 | } |
404 | #if VERBOSE | ||
405 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
406 | "************************************************************\n"); | ||
407 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 402 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
408 | "Peer Group started successfully!\n"); | 403 | "Peer Group started successfully with %u connections\n", |
409 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Have %u connections\n", | ||
410 | total_connections); | 404 | total_connections); |
411 | #endif | ||
412 | |||
413 | if (data_file != NULL) | 405 | if (data_file != NULL) |
414 | { | 406 | { |
415 | buf = NULL; | 407 | buf = NULL; |
@@ -493,19 +485,11 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
493 | testing_cfg = GNUNET_CONFIGURATION_dup (cfg); | 485 | testing_cfg = GNUNET_CONFIGURATION_dup (cfg); |
494 | 486 | ||
495 | GNUNET_log_setup ("test_dht_topo", | 487 | GNUNET_log_setup ("test_dht_topo", |
496 | #if VERBOSE | ||
497 | "DEBUG", | ||
498 | #else | ||
499 | "WARNING", | 488 | "WARNING", |
500 | #endif | ||
501 | NULL); | 489 | NULL); |
502 | |||
503 | #if VERBOSE | ||
504 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n"); | 490 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n"); |
505 | GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing", | 491 | GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing", |
506 | "use_progressbars", "YES"); | 492 | "use_progressbars", "YES"); |
507 | #endif | ||
508 | |||
509 | if (GNUNET_OK != | 493 | if (GNUNET_OK != |
510 | GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing", | 494 | GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing", |
511 | "num_peers", &num_peers)) | 495 | "num_peers", &num_peers)) |
@@ -593,17 +577,11 @@ main (int xargc, char *xargv[]) | |||
593 | char *const argv_torus[] = { "test-dht-2dtorus", | 577 | char *const argv_torus[] = { "test-dht-2dtorus", |
594 | "-c", | 578 | "-c", |
595 | "test_dht_2dtorus.conf", | 579 | "test_dht_2dtorus.conf", |
596 | #if VERBOSE | ||
597 | "-L", "DEBUG", | ||
598 | #endif | ||
599 | NULL | 580 | NULL |
600 | }; | 581 | }; |
601 | char *const argv_line[] = { "test-dht-line", | 582 | char *const argv_line[] = { "test-dht-line", |
602 | "-c", | 583 | "-c", |
603 | "test_dht_line.conf", | 584 | "test_dht_line.conf", |
604 | #if VERBOSE | ||
605 | "-L", "DEBUG", | ||
606 | #endif | ||
607 | NULL | 585 | NULL |
608 | }; | 586 | }; |
609 | char *const *argv; | 587 | char *const *argv; |