diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-05-12 15:49:45 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-05-12 15:49:45 +0000 |
commit | 6d6c4ed2d4dc7b598715cfceb73e3fa84a6b4426 (patch) | |
tree | dd3809f21ecf58650c383b38c9e9157aa5109b57 /src/testing | |
parent | dfe5fd29a357766ad681d7c95c47e06717367aa4 (diff) | |
download | gnunet-6d6c4ed2d4dc7b598715cfceb73e3fa84a6b4426.tar.gz gnunet-6d6c4ed2d4dc7b598715cfceb73e3fa84a6b4426.zip |
add now instead of add delayed
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/test_testing_topology.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index 1e9a20e2c..50ee0086a 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c | |||
@@ -174,7 +174,7 @@ finish_testing () | |||
174 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 174 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
175 | "transmit_ready's scheduled %d, failed %d, transmit_ready's called %d\n", transmit_ready_scheduled, transmit_ready_failed, transmit_ready_called); | 175 | "transmit_ready's scheduled %d, failed %d, transmit_ready's called %d\n", transmit_ready_scheduled, transmit_ready_failed, transmit_ready_called); |
176 | #endif | 176 | #endif |
177 | sleep(1); | 177 | |
178 | #if VERBOSE | 178 | #if VERBOSE |
179 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 179 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
180 | "Calling daemons_stop\n"); | 180 | "Calling daemons_stop\n"); |
@@ -492,7 +492,8 @@ topology_callback (void *cls, | |||
492 | 492 | ||
493 | GNUNET_SCHEDULER_cancel (sched, die_task); | 493 | GNUNET_SCHEDULER_cancel (sched, die_task); |
494 | die_task = GNUNET_SCHEDULER_NO_TASK; | 494 | die_task = GNUNET_SCHEDULER_NO_TASK; |
495 | GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages); | 495 | GNUNET_SCHEDULER_add_now (sched, &send_test_messages, test_messages); |
496 | //GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages); | ||
496 | } | 497 | } |
497 | else if (total_connections + failed_connections == expected_connections) | 498 | else if (total_connections + failed_connections == expected_connections) |
498 | { | 499 | { |
@@ -500,7 +501,8 @@ topology_callback (void *cls, | |||
500 | { | 501 | { |
501 | GNUNET_SCHEDULER_cancel (sched, die_task); | 502 | GNUNET_SCHEDULER_cancel (sched, die_task); |
502 | die_task = GNUNET_SCHEDULER_NO_TASK; | 503 | die_task = GNUNET_SCHEDULER_NO_TASK; |
503 | GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages); | 504 | GNUNET_SCHEDULER_add_now (sched, &send_test_messages, test_messages); |
505 | //GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages); | ||
504 | } | 506 | } |
505 | else | 507 | else |
506 | { | 508 | { |
@@ -601,6 +603,7 @@ peers_started_callback (void *cls, | |||
601 | GNUNET_TIME_relative_multiply | 603 | GNUNET_TIME_relative_multiply |
602 | (GNUNET_TIME_UNIT_MINUTES, 5), | 604 | (GNUNET_TIME_UNIT_MINUTES, 5), |
603 | &end_badly, "from peers_started_callback"); | 605 | &end_badly, "from peers_started_callback"); |
606 | |||
604 | connect_topology (); | 607 | connect_topology (); |
605 | ok = 0; | 608 | ok = 0; |
606 | } | 609 | } |
@@ -710,8 +713,9 @@ run (void *cls, | |||
710 | } | 713 | } |
711 | } | 714 | } |
712 | 715 | ||
713 | GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "blacklist_transports", | 716 | if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "blacklist_transports", |
714 | &blacklist_transports); | 717 | &blacklist_transports)) |
718 | blacklist_transports = NULL; | ||
715 | 719 | ||
716 | if (GNUNET_YES == | 720 | if (GNUNET_YES == |
717 | GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "blacklist_topology", | 721 | GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "blacklist_topology", |