diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-11-04 14:10:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-11-04 14:10:32 +0000 |
commit | cf45b8dff29c366d51aa2e6ea6a64b99b514b9c9 (patch) | |
tree | 5cb37c041743daff5af528dbbe24f5c563ce702e /src/arm/gnunet-service-arm.c | |
parent | b91546a3de767292e6472c6b1927480adba43d88 (diff) | |
download | gnunet-cf45b8dff29c366d51aa2e6ea6a64b99b514b9c9.tar.gz gnunet-cf45b8dff29c366d51aa2e6ea6a64b99b514b9c9.zip |
bugfixes and redesigning scheduler API
Diffstat (limited to 'src/arm/gnunet-service-arm.c')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index ebb9c337e..bfb3896bf 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -516,9 +516,6 @@ stop_service (struct GNUNET_SERVER_Client *client, | |||
516 | pos->kill_continuation_cls = client; | 516 | pos->kill_continuation_cls = client; |
517 | GNUNET_SERVER_client_keep (client); | 517 | GNUNET_SERVER_client_keep (client); |
518 | GNUNET_SCHEDULER_add_delayed (sched, | 518 | GNUNET_SCHEDULER_add_delayed (sched, |
519 | GNUNET_YES, | ||
520 | GNUNET_SCHEDULER_PRIORITY_IDLE, | ||
521 | GNUNET_SCHEDULER_NO_TASK, | ||
522 | MAINT_FAST_FREQUENCY, &maint, NULL); | 519 | MAINT_FAST_FREQUENCY, &maint, NULL); |
523 | } | 520 | } |
524 | else | 521 | else |
@@ -641,9 +638,6 @@ maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
641 | } | 638 | } |
642 | if (cls == NULL) | 639 | if (cls == NULL) |
643 | GNUNET_SCHEDULER_add_delayed (tc->sched, | 640 | GNUNET_SCHEDULER_add_delayed (tc->sched, |
644 | GNUNET_YES, | ||
645 | GNUNET_SCHEDULER_PRIORITY_IDLE, | ||
646 | GNUNET_SCHEDULER_NO_TASK, | ||
647 | MAINT_FREQUENCY, &maint, NULL); | 641 | MAINT_FREQUENCY, &maint, NULL); |
648 | 642 | ||
649 | /* check for services that died (WAITPID) */ | 643 | /* check for services that died (WAITPID) */ |
@@ -800,11 +794,9 @@ run (void *cls, | |||
800 | GNUNET_SERVER_add_handlers (server, handlers); | 794 | GNUNET_SERVER_add_handlers (server, handlers); |
801 | 795 | ||
802 | /* manage services */ | 796 | /* manage services */ |
803 | GNUNET_SCHEDULER_add_delayed (sched, | 797 | GNUNET_SCHEDULER_add_with_priority (sched, |
804 | GNUNET_YES, | 798 | GNUNET_SCHEDULER_PRIORITY_IDLE, |
805 | GNUNET_SCHEDULER_PRIORITY_IDLE, | 799 | &maint, NULL); |
806 | GNUNET_SCHEDULER_NO_TASK, | ||
807 | MAINT_FREQUENCY, &maint, NULL); | ||
808 | } | 800 | } |
809 | 801 | ||
810 | 802 | ||
@@ -820,7 +812,7 @@ main (int argc, char *const *argv) | |||
820 | { | 812 | { |
821 | return (GNUNET_OK == | 813 | return (GNUNET_OK == |
822 | GNUNET_SERVICE_run (argc, | 814 | GNUNET_SERVICE_run (argc, |
823 | argv, "arm", &run, NULL, NULL, NULL)) ? 0 : 1; | 815 | argv, "arm", &run, NULL)) ? 0 : 1; |
824 | } | 816 | } |
825 | 817 | ||
826 | /* end of gnunet-service-arm.c */ | 818 | /* end of gnunet-service-arm.c */ |