diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-11-05 18:21:50 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-11-05 18:21:50 +0000 |
commit | 75a33a1499cf60ea4364c9aa673816629a6c1413 (patch) | |
tree | 0620da4312bb04de4d7b65074fdd3b0c3dd6cc0e /src/transport/test_quota_compliance.c | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/transport/test_quota_compliance.c')
-rw-r--r-- | src/transport/test_quota_compliance.c | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 77279897d..041bd0968 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c | |||
@@ -121,8 +121,6 @@ static struct PeerContext p1; | |||
121 | 121 | ||
122 | static struct PeerContext p2; | 122 | static struct PeerContext p2; |
123 | 123 | ||
124 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
125 | |||
126 | static int ok; | 124 | static int ok; |
127 | 125 | ||
128 | static int connected; | 126 | static int connected; |
@@ -165,20 +163,20 @@ end_send () | |||
165 | static void | 163 | static void |
166 | end () | 164 | end () |
167 | { | 165 | { |
168 | GNUNET_SCHEDULER_cancel (sched, die_task); | 166 | GNUNET_SCHEDULER_cancel (die_task); |
169 | die_task = GNUNET_SCHEDULER_NO_TASK; | 167 | die_task = GNUNET_SCHEDULER_NO_TASK; |
170 | 168 | ||
171 | if (measurement_task != GNUNET_SCHEDULER_NO_TASK) | 169 | if (measurement_task != GNUNET_SCHEDULER_NO_TASK) |
172 | { | 170 | { |
173 | GNUNET_SCHEDULER_cancel (sched, measurement_task); | 171 | GNUNET_SCHEDULER_cancel (measurement_task); |
174 | measurement_task = GNUNET_SCHEDULER_NO_TASK; | 172 | measurement_task = GNUNET_SCHEDULER_NO_TASK; |
175 | } | 173 | } |
176 | if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK) | 174 | if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK) |
177 | { | 175 | { |
178 | GNUNET_SCHEDULER_cancel (sched, measurement_counter_task); | 176 | GNUNET_SCHEDULER_cancel (measurement_counter_task); |
179 | measurement_counter_task = GNUNET_SCHEDULER_NO_TASK; | 177 | measurement_counter_task = GNUNET_SCHEDULER_NO_TASK; |
180 | } | 178 | } |
181 | GNUNET_SCHEDULER_shutdown (sched); | 179 | GNUNET_SCHEDULER_shutdown (); |
182 | #if DEBUG_CONNECTIONS | 180 | #if DEBUG_CONNECTIONS |
183 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); | 181 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); |
184 | #endif | 182 | #endif |
@@ -188,7 +186,7 @@ end () | |||
188 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 186 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
189 | "Transports disconnected, returning success!\n"); | 187 | "Transports disconnected, returning success!\n"); |
190 | #endif | 188 | #endif |
191 | GNUNET_SCHEDULER_shutdown (sched); | 189 | GNUNET_SCHEDULER_shutdown (); |
192 | } | 190 | } |
193 | 191 | ||
194 | 192 | ||
@@ -213,12 +211,12 @@ end_badly (void *cls, | |||
213 | { | 211 | { |
214 | if (measurement_task != GNUNET_SCHEDULER_NO_TASK) | 212 | if (measurement_task != GNUNET_SCHEDULER_NO_TASK) |
215 | { | 213 | { |
216 | GNUNET_SCHEDULER_cancel (sched, measurement_task); | 214 | GNUNET_SCHEDULER_cancel (measurement_task); |
217 | measurement_task = GNUNET_SCHEDULER_NO_TASK; | 215 | measurement_task = GNUNET_SCHEDULER_NO_TASK; |
218 | } | 216 | } |
219 | if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK) | 217 | if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK) |
220 | { | 218 | { |
221 | GNUNET_SCHEDULER_cancel (sched, measurement_counter_task); | 219 | GNUNET_SCHEDULER_cancel (measurement_counter_task); |
222 | measurement_counter_task = GNUNET_SCHEDULER_NO_TASK; | 220 | measurement_counter_task = GNUNET_SCHEDULER_NO_TASK; |
223 | } | 221 | } |
224 | GNUNET_break (0); | 222 | GNUNET_break (0); |
@@ -355,8 +353,7 @@ static void measurement_counter | |||
355 | #if VERBOSE | 353 | #if VERBOSE |
356 | fprintf(stderr,"."); | 354 | fprintf(stderr,"."); |
357 | #endif | 355 | #endif |
358 | measurement_counter_task = GNUNET_SCHEDULER_add_delayed (sched, | 356 | measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
359 | GNUNET_TIME_UNIT_SECONDS, | ||
360 | &measurement_counter, | 357 | &measurement_counter, |
361 | NULL); | 358 | NULL); |
362 | } | 359 | } |
@@ -379,7 +376,7 @@ measurement_end (void *cls, | |||
379 | 376 | ||
380 | if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK) | 377 | if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK) |
381 | { | 378 | { |
382 | GNUNET_SCHEDULER_cancel (sched, measurement_counter_task); | 379 | GNUNET_SCHEDULER_cancel (measurement_counter_task); |
383 | measurement_counter_task = GNUNET_SCHEDULER_NO_TASK; | 380 | measurement_counter_task = GNUNET_SCHEDULER_NO_TASK; |
384 | } | 381 | } |
385 | #if VERBOSE | 382 | #if VERBOSE |
@@ -498,19 +495,16 @@ static void measure (unsigned long long quota_p1, unsigned long long quota_p2 ) | |||
498 | GNUNET_TIME_UNIT_FOREVER_REL, | 495 | GNUNET_TIME_UNIT_FOREVER_REL, |
499 | NULL, NULL); | 496 | NULL, NULL); |
500 | 497 | ||
501 | GNUNET_SCHEDULER_cancel (sched, die_task); | 498 | GNUNET_SCHEDULER_cancel (die_task); |
502 | die_task = GNUNET_SCHEDULER_add_delayed (sched, | 499 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
503 | TIMEOUT, | ||
504 | &end_badly, | 500 | &end_badly, |
505 | NULL); | 501 | NULL); |
506 | if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK) | 502 | if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK) |
507 | GNUNET_SCHEDULER_cancel (sched, measurement_counter_task); | 503 | GNUNET_SCHEDULER_cancel (measurement_counter_task); |
508 | measurement_counter_task = GNUNET_SCHEDULER_add_delayed (sched, | 504 | measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
509 | GNUNET_TIME_UNIT_SECONDS, | ||
510 | &measurement_counter, | 505 | &measurement_counter, |
511 | NULL); | 506 | NULL); |
512 | measurement_task = GNUNET_SCHEDULER_add_delayed (sched, | 507 | measurement_task = GNUNET_SCHEDULER_add_delayed (MEASUREMENT_INTERVALL, |
513 | MEASUREMENT_INTERVALL, | ||
514 | &measurement_end, | 508 | &measurement_end, |
515 | NULL); | 509 | NULL); |
516 | total_bytes_sent = 0; | 510 | total_bytes_sent = 0; |
@@ -588,7 +582,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
588 | #endif | 582 | #endif |
589 | 583 | ||
590 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 584 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
591 | p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, NULL, | 585 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, |
592 | p, | 586 | p, |
593 | ¬ify_receive_new, | 587 | ¬ify_receive_new, |
594 | ¬ify_connect, | 588 | ¬ify_connect, |
@@ -634,16 +628,13 @@ exchange_hello (void *cls, | |||
634 | 628 | ||
635 | static void | 629 | static void |
636 | run (void *cls, | 630 | run (void *cls, |
637 | struct GNUNET_SCHEDULER_Handle *s, | ||
638 | char *const *args, | 631 | char *const *args, |
639 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | 632 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) |
640 | { | 633 | { |
641 | GNUNET_assert (ok == 1); | 634 | GNUNET_assert (ok == 1); |
642 | OKPP; | 635 | OKPP; |
643 | sched = s; | ||
644 | 636 | ||
645 | die_task = GNUNET_SCHEDULER_add_delayed (sched, | 637 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
646 | TIMEOUT, | ||
647 | &end_badly, | 638 | &end_badly, |
648 | NULL); | 639 | NULL); |
649 | measurement_running = GNUNET_NO; | 640 | measurement_running = GNUNET_NO; |