diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-10-12 13:45:56 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-10-12 13:45:56 +0000 |
commit | 00ac4d1d91a2aa5383a7c795704bc6ce8a2e0efb (patch) | |
tree | 31180846d97b06c175337aed776c7d8139163346 /src | |
parent | 463f45e3337c0a5d4613ecc0e2ee998564a00551 (diff) | |
download | gnunet-00ac4d1d91a2aa5383a7c795704bc6ce8a2e0efb.tar.gz gnunet-00ac4d1d91a2aa5383a7c795704bc6ce8a2e0efb.zip |
remove debugging stuff, fix for very small values of small world options
Diffstat (limited to 'src')
-rw-r--r-- | src/testing/test_testing_topology.c | 4 | ||||
-rw-r--r-- | src/testing/test_testing_topology_blacklist.c | 2 | ||||
-rw-r--r-- | src/testing/testing_group.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index 83c96a451..dd8a16419 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "gnunet_core_service.h" | 26 | #include "gnunet_core_service.h" |
27 | #include "gnunet_os_lib.h" | 27 | #include "gnunet_os_lib.h" |
28 | 28 | ||
29 | #define VERBOSE GNUNET_YES | 29 | #define VERBOSE GNUNET_NO |
30 | 30 | ||
31 | #define DELAY_FOR_LOGGING GNUNET_NO | 31 | #define DELAY_FOR_LOGGING GNUNET_NO |
32 | 32 | ||
@@ -709,8 +709,10 @@ topology_callback (void *cls, | |||
709 | static void topology_creation_finished (void *cls, | 709 | static void topology_creation_finished (void *cls, |
710 | const char *emsg) | 710 | const char *emsg) |
711 | { | 711 | { |
712 | #if VERBOSE | ||
712 | if (emsg == NULL) | 713 | if (emsg == NULL) |
713 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "All topology connections created successfully!\n"); | 714 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "All topology connections created successfully!\n"); |
715 | #endif | ||
714 | } | 716 | } |
715 | 717 | ||
716 | static void | 718 | static void |
diff --git a/src/testing/test_testing_topology_blacklist.c b/src/testing/test_testing_topology_blacklist.c index 448531921..8f9a469e5 100644 --- a/src/testing/test_testing_topology_blacklist.c +++ b/src/testing/test_testing_topology_blacklist.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "gnunet_testing_lib.h" | 25 | #include "gnunet_testing_lib.h" |
26 | #include "gnunet_core_service.h" | 26 | #include "gnunet_core_service.h" |
27 | 27 | ||
28 | #define VERBOSE GNUNET_YES | 28 | #define VERBOSE GNUNET_NO |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * How long until we fail the whole testcase? | 31 | * How long until we fail the whole testcase? |
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index abaeaaf11..23ab2f9fe 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -1554,6 +1554,8 @@ create_small_world (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_Connecti | |||
1554 | #endif | 1554 | #endif |
1555 | smallWorldConnections = 0; | 1555 | smallWorldConnections = 0; |
1556 | small_world_it = (unsigned int)(natLog * percentage); | 1556 | small_world_it = (unsigned int)(natLog * percentage); |
1557 | if (small_world_it < 1) | ||
1558 | small_world_it = 1; | ||
1557 | GNUNET_assert(small_world_it > 0 && small_world_it < (unsigned int)-1); | 1559 | GNUNET_assert(small_world_it > 0 && small_world_it < (unsigned int)-1); |
1558 | for (i = 0; i < small_world_it; i++) | 1560 | for (i = 0; i < small_world_it; i++) |
1559 | { | 1561 | { |