diff options
Diffstat (limited to 'src/include/gnunet_scheduler_lib.h')
-rw-r--r-- | src/include/gnunet_scheduler_lib.h | 195 |
1 files changed, 104 insertions, 91 deletions
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h index 39b16a1b4..da968737e 100644 --- a/src/include/gnunet_scheduler_lib.h +++ b/src/include/gnunet_scheduler_lib.h | |||
@@ -52,7 +52,8 @@ struct GNUNET_SCHEDULER_Task; | |||
52 | * Reasons why the schedule may have triggered | 52 | * Reasons why the schedule may have triggered |
53 | * the task now. | 53 | * the task now. |
54 | */ | 54 | */ |
55 | enum GNUNET_SCHEDULER_Reason { | 55 | enum GNUNET_SCHEDULER_Reason |
56 | { | ||
56 | /** | 57 | /** |
57 | * This task is not ready. | 58 | * This task is not ready. |
58 | */ | 59 | */ |
@@ -99,7 +100,8 @@ enum GNUNET_SCHEDULER_Reason { | |||
99 | * Possible events on FDs, used as a bitmask. | 100 | * Possible events on FDs, used as a bitmask. |
100 | * Modelled after GPollFD. | 101 | * Modelled after GPollFD. |
101 | */ | 102 | */ |
102 | enum GNUNET_SCHEDULER_EventType { | 103 | enum GNUNET_SCHEDULER_EventType |
104 | { | ||
103 | /** | 105 | /** |
104 | * No event (useful for timeout). | 106 | * No event (useful for timeout). |
105 | */ | 107 | */ |
@@ -140,7 +142,8 @@ enum GNUNET_SCHEDULER_EventType { | |||
140 | /** | 142 | /** |
141 | * Information about an event relating to a file descriptor/socket. | 143 | * Information about an event relating to a file descriptor/socket. |
142 | */ | 144 | */ |
143 | struct GNUNET_SCHEDULER_FdInfo { | 145 | struct GNUNET_SCHEDULER_FdInfo |
146 | { | ||
144 | /** | 147 | /** |
145 | * GNUnet network socket the event is about, matches @a sock, | 148 | * GNUnet network socket the event is about, matches @a sock, |
146 | * NULL if this is about a file handle or if no network | 149 | * NULL if this is about a file handle or if no network |
@@ -170,7 +173,8 @@ struct GNUNET_SCHEDULER_FdInfo { | |||
170 | /** | 173 | /** |
171 | * Context information passed to each scheduler task. | 174 | * Context information passed to each scheduler task. |
172 | */ | 175 | */ |
173 | struct GNUNET_SCHEDULER_TaskContext { | 176 | struct GNUNET_SCHEDULER_TaskContext |
177 | { | ||
174 | /** | 178 | /** |
175 | * Reason why the task is run now | 179 | * Reason why the task is run now |
176 | */ | 180 | */ |
@@ -219,8 +223,8 @@ struct GNUNET_SCHEDULER_TaskContext { | |||
219 | * @param fdi information about the related FD | 223 | * @param fdi information about the related FD |
220 | */ | 224 | */ |
221 | void | 225 | void |
222 | GNUNET_SCHEDULER_task_ready(struct GNUNET_SCHEDULER_Task *task, | 226 | GNUNET_SCHEDULER_task_ready (struct GNUNET_SCHEDULER_Task *task, |
223 | struct GNUNET_SCHEDULER_FdInfo *fdi); | 227 | struct GNUNET_SCHEDULER_FdInfo *fdi); |
224 | 228 | ||
225 | 229 | ||
226 | /** | 230 | /** |
@@ -250,14 +254,15 @@ struct GNUNET_SCHEDULER_Handle; | |||
250 | * if we are done running tasks (yield to block) | 254 | * if we are done running tasks (yield to block) |
251 | */ | 255 | */ |
252 | int | 256 | int |
253 | GNUNET_SCHEDULER_do_work(struct GNUNET_SCHEDULER_Handle *sh); | 257 | GNUNET_SCHEDULER_do_work (struct GNUNET_SCHEDULER_Handle *sh); |
254 | 258 | ||
255 | 259 | ||
256 | /** | 260 | /** |
257 | * API an external event loop has to implement for | 261 | * API an external event loop has to implement for |
258 | * #GNUNET_SCHEDULER_driver_init. | 262 | * #GNUNET_SCHEDULER_driver_init. |
259 | */ | 263 | */ |
260 | struct GNUNET_SCHEDULER_Driver { | 264 | struct GNUNET_SCHEDULER_Driver |
265 | { | ||
261 | /** | 266 | /** |
262 | * Closure to pass to the functions in this struct. | 267 | * Closure to pass to the functions in this struct. |
263 | */ | 268 | */ |
@@ -348,7 +353,7 @@ typedef void | |||
348 | * #GNUNET_SCHEDULER_driver_done | 353 | * #GNUNET_SCHEDULER_driver_done |
349 | */ | 354 | */ |
350 | struct GNUNET_SCHEDULER_Handle * | 355 | struct GNUNET_SCHEDULER_Handle * |
351 | GNUNET_SCHEDULER_driver_init(const struct GNUNET_SCHEDULER_Driver *driver); | 356 | GNUNET_SCHEDULER_driver_init (const struct GNUNET_SCHEDULER_Driver *driver); |
352 | 357 | ||
353 | 358 | ||
354 | /** | 359 | /** |
@@ -366,7 +371,7 @@ GNUNET_SCHEDULER_driver_init(const struct GNUNET_SCHEDULER_Driver *driver); | |||
366 | * @param sh the handle returned by #GNUNET_SCHEDULER_driver_init | 371 | * @param sh the handle returned by #GNUNET_SCHEDULER_driver_init |
367 | */ | 372 | */ |
368 | void | 373 | void |
369 | GNUNET_SCHEDULER_driver_done(struct GNUNET_SCHEDULER_Handle *sh); | 374 | GNUNET_SCHEDULER_driver_done (struct GNUNET_SCHEDULER_Handle *sh); |
370 | 375 | ||
371 | 376 | ||
372 | /** | 377 | /** |
@@ -375,7 +380,7 @@ GNUNET_SCHEDULER_driver_done(struct GNUNET_SCHEDULER_Handle *sh); | |||
375 | * @return NULL on error | 380 | * @return NULL on error |
376 | */ | 381 | */ |
377 | struct GNUNET_SCHEDULER_Driver * | 382 | struct GNUNET_SCHEDULER_Driver * |
378 | GNUNET_SCHEDULER_driver_select(void); | 383 | GNUNET_SCHEDULER_driver_select (void); |
379 | 384 | ||
380 | 385 | ||
381 | /** | 386 | /** |
@@ -412,8 +417,8 @@ typedef int | |||
412 | * @param task_cls closure of @a task | 417 | * @param task_cls closure of @a task |
413 | */ | 418 | */ |
414 | void | 419 | void |
415 | GNUNET_SCHEDULER_run(GNUNET_SCHEDULER_TaskCallback task, | 420 | GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_TaskCallback task, |
416 | void *task_cls); | 421 | void *task_cls); |
417 | 422 | ||
418 | /** | 423 | /** |
419 | * Initialize and run scheduler. This function will return when all | 424 | * Initialize and run scheduler. This function will return when all |
@@ -427,9 +432,9 @@ GNUNET_SCHEDULER_run(GNUNET_SCHEDULER_TaskCallback task, | |||
427 | * @param task_cls closure of @a task | 432 | * @param task_cls closure of @a task |
428 | */ | 433 | */ |
429 | void | 434 | void |
430 | GNUNET_SCHEDULER_run_with_optional_signals(int install_signals, | 435 | GNUNET_SCHEDULER_run_with_optional_signals (int install_signals, |
431 | GNUNET_SCHEDULER_TaskCallback task, | 436 | GNUNET_SCHEDULER_TaskCallback task, |
432 | void *task_cls); | 437 | void *task_cls); |
433 | 438 | ||
434 | 439 | ||
435 | /** | 440 | /** |
@@ -439,7 +444,7 @@ GNUNET_SCHEDULER_run_with_optional_signals(int install_signals, | |||
439 | * will be delayed until the next shutdown signal. | 444 | * will be delayed until the next shutdown signal. |
440 | */ | 445 | */ |
441 | void | 446 | void |
442 | GNUNET_SCHEDULER_shutdown(void); | 447 | GNUNET_SCHEDULER_shutdown (void); |
443 | 448 | ||
444 | 449 | ||
445 | /** | 450 | /** |
@@ -454,7 +459,7 @@ GNUNET_SCHEDULER_shutdown(void); | |||
454 | * @return number of tasks pending right now | 459 | * @return number of tasks pending right now |
455 | */ | 460 | */ |
456 | unsigned int | 461 | unsigned int |
457 | GNUNET_SCHEDULER_get_load(enum GNUNET_SCHEDULER_Priority p); | 462 | GNUNET_SCHEDULER_get_load (enum GNUNET_SCHEDULER_Priority p); |
458 | 463 | ||
459 | 464 | ||
460 | /** | 465 | /** |
@@ -464,7 +469,7 @@ GNUNET_SCHEDULER_get_load(enum GNUNET_SCHEDULER_Priority p); | |||
464 | * @return task context with information why the current task is run | 469 | * @return task context with information why the current task is run |
465 | */ | 470 | */ |
466 | const struct GNUNET_SCHEDULER_TaskContext * | 471 | const struct GNUNET_SCHEDULER_TaskContext * |
467 | GNUNET_SCHEDULER_get_task_context(void); | 472 | GNUNET_SCHEDULER_get_task_context (void); |
468 | 473 | ||
469 | 474 | ||
470 | /** | 475 | /** |
@@ -480,7 +485,7 @@ GNUNET_SCHEDULER_get_task_context(void); | |||
480 | * @return original closure of the task | 485 | * @return original closure of the task |
481 | */ | 486 | */ |
482 | void * | 487 | void * |
483 | GNUNET_SCHEDULER_cancel(struct GNUNET_SCHEDULER_Task *task); | 488 | GNUNET_SCHEDULER_cancel (struct GNUNET_SCHEDULER_Task *task); |
484 | 489 | ||
485 | 490 | ||
486 | /** | 491 | /** |
@@ -494,10 +499,13 @@ GNUNET_SCHEDULER_cancel(struct GNUNET_SCHEDULER_Task *task); | |||
494 | * @param priority priority to use for the task | 499 | * @param priority priority to use for the task |
495 | */ | 500 | */ |
496 | void | 501 | void |
497 | GNUNET_SCHEDULER_add_with_reason_and_priority(GNUNET_SCHEDULER_TaskCallback task, | 502 | GNUNET_SCHEDULER_add_with_reason_and_priority (GNUNET_SCHEDULER_TaskCallback |
498 | void *task_cls, | 503 | task, |
499 | enum GNUNET_SCHEDULER_Reason reason, | 504 | void *task_cls, |
500 | enum GNUNET_SCHEDULER_Priority priority); | 505 | enum GNUNET_SCHEDULER_Reason |
506 | reason, | ||
507 | enum GNUNET_SCHEDULER_Priority | ||
508 | priority); | ||
501 | 509 | ||
502 | 510 | ||
503 | /** | 511 | /** |
@@ -510,9 +518,9 @@ GNUNET_SCHEDULER_add_with_reason_and_priority(GNUNET_SCHEDULER_TaskCallback task | |||
510 | * only valid until @a task is started! | 518 | * only valid until @a task is started! |
511 | */ | 519 | */ |
512 | struct GNUNET_SCHEDULER_Task * | 520 | struct GNUNET_SCHEDULER_Task * |
513 | GNUNET_SCHEDULER_add_with_priority(enum GNUNET_SCHEDULER_Priority prio, | 521 | GNUNET_SCHEDULER_add_with_priority (enum GNUNET_SCHEDULER_Priority prio, |
514 | GNUNET_SCHEDULER_TaskCallback task, | 522 | GNUNET_SCHEDULER_TaskCallback task, |
515 | void *task_cls); | 523 | void *task_cls); |
516 | 524 | ||
517 | 525 | ||
518 | /** | 526 | /** |
@@ -531,8 +539,8 @@ GNUNET_SCHEDULER_add_with_priority(enum GNUNET_SCHEDULER_Priority prio, | |||
531 | * only valid until @a task is started! | 539 | * only valid until @a task is started! |
532 | */ | 540 | */ |
533 | struct GNUNET_SCHEDULER_Task * | 541 | struct GNUNET_SCHEDULER_Task * |
534 | GNUNET_SCHEDULER_add_now(GNUNET_SCHEDULER_TaskCallback task, | 542 | GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_TaskCallback task, |
535 | void *task_cls); | 543 | void *task_cls); |
536 | 544 | ||
537 | 545 | ||
538 | /** | 546 | /** |
@@ -546,8 +554,8 @@ GNUNET_SCHEDULER_add_now(GNUNET_SCHEDULER_TaskCallback task, | |||
546 | * only valid until @a task is started! | 554 | * only valid until @a task is started! |
547 | */ | 555 | */ |
548 | struct GNUNET_SCHEDULER_Task * | 556 | struct GNUNET_SCHEDULER_Task * |
549 | GNUNET_SCHEDULER_add_shutdown(GNUNET_SCHEDULER_TaskCallback task, | 557 | GNUNET_SCHEDULER_add_shutdown (GNUNET_SCHEDULER_TaskCallback task, |
550 | void *task_cls); | 558 | void *task_cls); |
551 | 559 | ||
552 | 560 | ||
553 | /** | 561 | /** |
@@ -565,9 +573,9 @@ GNUNET_SCHEDULER_add_shutdown(GNUNET_SCHEDULER_TaskCallback task, | |||
565 | * only valid until @a task is started! | 573 | * only valid until @a task is started! |
566 | */ | 574 | */ |
567 | struct GNUNET_SCHEDULER_Task * | 575 | struct GNUNET_SCHEDULER_Task * |
568 | GNUNET_SCHEDULER_add_now_with_lifeness(int lifeness, | 576 | GNUNET_SCHEDULER_add_now_with_lifeness (int lifeness, |
569 | GNUNET_SCHEDULER_TaskCallback task, | 577 | GNUNET_SCHEDULER_TaskCallback task, |
570 | void *task_cls); | 578 | void *task_cls); |
571 | 579 | ||
572 | 580 | ||
573 | /** | 581 | /** |
@@ -582,9 +590,9 @@ GNUNET_SCHEDULER_add_now_with_lifeness(int lifeness, | |||
582 | * only valid until @a task is started! | 590 | * only valid until @a task is started! |
583 | */ | 591 | */ |
584 | struct GNUNET_SCHEDULER_Task * | 592 | struct GNUNET_SCHEDULER_Task * |
585 | GNUNET_SCHEDULER_add_delayed(struct GNUNET_TIME_Relative delay, | 593 | GNUNET_SCHEDULER_add_delayed (struct GNUNET_TIME_Relative delay, |
586 | GNUNET_SCHEDULER_TaskCallback task, | 594 | GNUNET_SCHEDULER_TaskCallback task, |
587 | void *task_cls); | 595 | void *task_cls); |
588 | 596 | ||
589 | 597 | ||
590 | /** | 598 | /** |
@@ -599,9 +607,9 @@ GNUNET_SCHEDULER_add_delayed(struct GNUNET_TIME_Relative delay, | |||
599 | * only valid until @a task is started! | 607 | * only valid until @a task is started! |
600 | */ | 608 | */ |
601 | struct GNUNET_SCHEDULER_Task * | 609 | struct GNUNET_SCHEDULER_Task * |
602 | GNUNET_SCHEDULER_add_at(struct GNUNET_TIME_Absolute at, | 610 | GNUNET_SCHEDULER_add_at (struct GNUNET_TIME_Absolute at, |
603 | GNUNET_SCHEDULER_TaskCallback task, | 611 | GNUNET_SCHEDULER_TaskCallback task, |
604 | void *task_cls); | 612 | void *task_cls); |
605 | 613 | ||
606 | 614 | ||
607 | /** | 615 | /** |
@@ -616,10 +624,11 @@ GNUNET_SCHEDULER_add_at(struct GNUNET_TIME_Absolute at, | |||
616 | * only valid until @a task is started! | 624 | * only valid until @a task is started! |
617 | */ | 625 | */ |
618 | struct GNUNET_SCHEDULER_Task * | 626 | struct GNUNET_SCHEDULER_Task * |
619 | GNUNET_SCHEDULER_add_delayed_with_priority(struct GNUNET_TIME_Relative delay, | 627 | GNUNET_SCHEDULER_add_delayed_with_priority (struct GNUNET_TIME_Relative delay, |
620 | enum GNUNET_SCHEDULER_Priority priority, | 628 | enum GNUNET_SCHEDULER_Priority |
621 | GNUNET_SCHEDULER_TaskCallback task, | 629 | priority, |
622 | void *task_cls); | 630 | GNUNET_SCHEDULER_TaskCallback task, |
631 | void *task_cls); | ||
623 | 632 | ||
624 | 633 | ||
625 | /** | 634 | /** |
@@ -634,10 +643,10 @@ GNUNET_SCHEDULER_add_delayed_with_priority(struct GNUNET_TIME_Relative delay, | |||
634 | * only valid until @a task is started! | 643 | * only valid until @a task is started! |
635 | */ | 644 | */ |
636 | struct GNUNET_SCHEDULER_Task * | 645 | struct GNUNET_SCHEDULER_Task * |
637 | GNUNET_SCHEDULER_add_at_with_priority(struct GNUNET_TIME_Absolute at, | 646 | GNUNET_SCHEDULER_add_at_with_priority (struct GNUNET_TIME_Absolute at, |
638 | enum GNUNET_SCHEDULER_Priority priority, | 647 | enum GNUNET_SCHEDULER_Priority priority, |
639 | GNUNET_SCHEDULER_TaskCallback task, | 648 | GNUNET_SCHEDULER_TaskCallback task, |
640 | void *task_cls); | 649 | void *task_cls); |
641 | 650 | ||
642 | 651 | ||
643 | /** | 652 | /** |
@@ -661,10 +670,10 @@ GNUNET_SCHEDULER_add_at_with_priority(struct GNUNET_TIME_Absolute at, | |||
661 | * only valid until @a task is started! | 670 | * only valid until @a task is started! |
662 | */ | 671 | */ |
663 | struct GNUNET_SCHEDULER_Task * | 672 | struct GNUNET_SCHEDULER_Task * |
664 | GNUNET_SCHEDULER_add_read_net(struct GNUNET_TIME_Relative delay, | 673 | GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay, |
665 | struct GNUNET_NETWORK_Handle *rfd, | 674 | struct GNUNET_NETWORK_Handle *rfd, |
666 | GNUNET_SCHEDULER_TaskCallback task, | 675 | GNUNET_SCHEDULER_TaskCallback task, |
667 | void *task_cls); | 676 | void *task_cls); |
668 | 677 | ||
669 | 678 | ||
670 | /** | 679 | /** |
@@ -690,11 +699,12 @@ GNUNET_SCHEDULER_add_read_net(struct GNUNET_TIME_Relative delay, | |||
690 | * only valid until @a task is started! | 699 | * only valid until @a task is started! |
691 | */ | 700 | */ |
692 | struct GNUNET_SCHEDULER_Task * | 701 | struct GNUNET_SCHEDULER_Task * |
693 | GNUNET_SCHEDULER_add_read_net_with_priority(struct GNUNET_TIME_Relative delay, | 702 | GNUNET_SCHEDULER_add_read_net_with_priority (struct GNUNET_TIME_Relative delay, |
694 | enum GNUNET_SCHEDULER_Priority priority, | 703 | enum GNUNET_SCHEDULER_Priority |
695 | struct GNUNET_NETWORK_Handle *rfd, | 704 | priority, |
696 | GNUNET_SCHEDULER_TaskCallback task, | 705 | struct GNUNET_NETWORK_Handle *rfd, |
697 | void *task_cls); | 706 | GNUNET_SCHEDULER_TaskCallback task, |
707 | void *task_cls); | ||
698 | 708 | ||
699 | 709 | ||
700 | /** | 710 | /** |
@@ -719,10 +729,10 @@ GNUNET_SCHEDULER_add_read_net_with_priority(struct GNUNET_TIME_Relative delay, | |||
719 | * only valid until @a task is started! | 729 | * only valid until @a task is started! |
720 | */ | 730 | */ |
721 | struct GNUNET_SCHEDULER_Task * | 731 | struct GNUNET_SCHEDULER_Task * |
722 | GNUNET_SCHEDULER_add_write_net(struct GNUNET_TIME_Relative delay, | 732 | GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay, |
723 | struct GNUNET_NETWORK_Handle *wfd, | 733 | struct GNUNET_NETWORK_Handle *wfd, |
724 | GNUNET_SCHEDULER_TaskCallback task, | 734 | GNUNET_SCHEDULER_TaskCallback task, |
725 | void *task_cls); | 735 | void *task_cls); |
726 | 736 | ||
727 | 737 | ||
728 | /** | 738 | /** |
@@ -749,13 +759,13 @@ GNUNET_SCHEDULER_add_write_net(struct GNUNET_TIME_Relative delay, | |||
749 | * only valid until "task" is started! | 759 | * only valid until "task" is started! |
750 | */ | 760 | */ |
751 | struct GNUNET_SCHEDULER_Task * | 761 | struct GNUNET_SCHEDULER_Task * |
752 | GNUNET_SCHEDULER_add_net_with_priority(struct GNUNET_TIME_Relative delay, | 762 | GNUNET_SCHEDULER_add_net_with_priority (struct GNUNET_TIME_Relative delay, |
753 | enum GNUNET_SCHEDULER_Priority priority, | 763 | enum GNUNET_SCHEDULER_Priority priority, |
754 | struct GNUNET_NETWORK_Handle *fd, | 764 | struct GNUNET_NETWORK_Handle *fd, |
755 | int on_read, | 765 | int on_read, |
756 | int on_write, | 766 | int on_write, |
757 | GNUNET_SCHEDULER_TaskCallback task, | 767 | GNUNET_SCHEDULER_TaskCallback task, |
758 | void *task_cls); | 768 | void *task_cls); |
759 | 769 | ||
760 | 770 | ||
761 | /** | 771 | /** |
@@ -779,10 +789,10 @@ GNUNET_SCHEDULER_add_net_with_priority(struct GNUNET_TIME_Relative delay, | |||
779 | * only valid until @a task is started! | 789 | * only valid until @a task is started! |
780 | */ | 790 | */ |
781 | struct GNUNET_SCHEDULER_Task * | 791 | struct GNUNET_SCHEDULER_Task * |
782 | GNUNET_SCHEDULER_add_read_file(struct GNUNET_TIME_Relative delay, | 792 | GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay, |
783 | const struct GNUNET_DISK_FileHandle *rfd, | 793 | const struct GNUNET_DISK_FileHandle *rfd, |
784 | GNUNET_SCHEDULER_TaskCallback task, | 794 | GNUNET_SCHEDULER_TaskCallback task, |
785 | void *task_cls); | 795 | void *task_cls); |
786 | 796 | ||
787 | 797 | ||
788 | /** | 798 | /** |
@@ -806,10 +816,10 @@ GNUNET_SCHEDULER_add_read_file(struct GNUNET_TIME_Relative delay, | |||
806 | * only valid until @a task is started! | 816 | * only valid until @a task is started! |
807 | */ | 817 | */ |
808 | struct GNUNET_SCHEDULER_Task * | 818 | struct GNUNET_SCHEDULER_Task * |
809 | GNUNET_SCHEDULER_add_write_file(struct GNUNET_TIME_Relative delay, | 819 | GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay, |
810 | const struct GNUNET_DISK_FileHandle *wfd, | 820 | const struct GNUNET_DISK_FileHandle *wfd, |
811 | GNUNET_SCHEDULER_TaskCallback task, | 821 | GNUNET_SCHEDULER_TaskCallback task, |
812 | void *task_cls); | 822 | void *task_cls); |
813 | 823 | ||
814 | 824 | ||
815 | /** | 825 | /** |
@@ -836,12 +846,15 @@ GNUNET_SCHEDULER_add_write_file(struct GNUNET_TIME_Relative delay, | |||
836 | * only valid until @a task is started! | 846 | * only valid until @a task is started! |
837 | */ | 847 | */ |
838 | struct GNUNET_SCHEDULER_Task * | 848 | struct GNUNET_SCHEDULER_Task * |
839 | GNUNET_SCHEDULER_add_file_with_priority(struct GNUNET_TIME_Relative delay, | 849 | GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, |
840 | enum GNUNET_SCHEDULER_Priority priority, | 850 | enum GNUNET_SCHEDULER_Priority |
841 | const struct GNUNET_DISK_FileHandle *fd, | 851 | priority, |
842 | int on_read, int on_write, | 852 | const struct |
843 | GNUNET_SCHEDULER_TaskCallback task, | 853 | GNUNET_DISK_FileHandle *fd, |
844 | void *task_cls); | 854 | int on_read, |
855 | int on_write, | ||
856 | GNUNET_SCHEDULER_TaskCallback task, | ||
857 | void *task_cls); | ||
845 | 858 | ||
846 | 859 | ||
847 | /** | 860 | /** |
@@ -876,12 +889,12 @@ GNUNET_SCHEDULER_add_file_with_priority(struct GNUNET_TIME_Relative delay, | |||
876 | * only valid until @a task is started! | 889 | * only valid until @a task is started! |
877 | */ | 890 | */ |
878 | struct GNUNET_SCHEDULER_Task * | 891 | struct GNUNET_SCHEDULER_Task * |
879 | GNUNET_SCHEDULER_add_select(enum GNUNET_SCHEDULER_Priority prio, | 892 | GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio, |
880 | struct GNUNET_TIME_Relative delay, | 893 | struct GNUNET_TIME_Relative delay, |
881 | const struct GNUNET_NETWORK_FDSet *rs, | 894 | const struct GNUNET_NETWORK_FDSet *rs, |
882 | const struct GNUNET_NETWORK_FDSet *ws, | 895 | const struct GNUNET_NETWORK_FDSet *ws, |
883 | GNUNET_SCHEDULER_TaskCallback task, | 896 | GNUNET_SCHEDULER_TaskCallback task, |
884 | void *task_cls); | 897 | void *task_cls); |
885 | 898 | ||
886 | /** | 899 | /** |
887 | * Sets the select function to use in the scheduler (scheduler_select). | 900 | * Sets the select function to use in the scheduler (scheduler_select). |
@@ -890,8 +903,8 @@ GNUNET_SCHEDULER_add_select(enum GNUNET_SCHEDULER_Priority prio, | |||
890 | * @param new_select_cls closure for @a new_select | 903 | * @param new_select_cls closure for @a new_select |
891 | */ | 904 | */ |
892 | void | 905 | void |
893 | GNUNET_SCHEDULER_set_select(GNUNET_SCHEDULER_select new_select, | 906 | GNUNET_SCHEDULER_set_select (GNUNET_SCHEDULER_select new_select, |
894 | void *new_select_cls); | 907 | void *new_select_cls); |
895 | 908 | ||
896 | 909 | ||
897 | 910 | ||
@@ -908,7 +921,7 @@ GNUNET_SCHEDULER_set_select(GNUNET_SCHEDULER_select new_select, | |||
908 | * @param aid the asynchronous scope id to enter | 921 | * @param aid the asynchronous scope id to enter |
909 | */ | 922 | */ |
910 | void | 923 | void |
911 | GNUNET_SCHEDULER_begin_async_scope(struct GNUNET_AsyncScopeId *aid); | 924 | GNUNET_SCHEDULER_begin_async_scope (struct GNUNET_AsyncScopeId *aid); |
912 | 925 | ||
913 | 926 | ||
914 | 927 | ||