ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.c
(Generate patch)

Comparing libev/ev.c (file contents):
Revision 1.53 by root, Sat Nov 3 22:31:11 2007 UTC vs.
Revision 1.62 by root, Sun Nov 4 20:38:07 2007 UTC

… …
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31#ifndef EV_STANDALONE 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33
34# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1
36# define EV_USE_REALTIME 1
37# endif
38
39# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1
41# endif
42
43# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1
45# endif
46
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1
49# endif
50
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1
53# endif
54
33#endif 55#endif
34 56
35#include <math.h> 57#include <math.h>
36#include <stdlib.h> 58#include <stdlib.h>
37#include <unistd.h> 59#include <unistd.h>
… …
58 80
59#ifndef EV_USE_SELECT 81#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1 82# define EV_USE_SELECT 1
61#endif 83#endif
62 84
63#ifndef EV_USEV_POLL 85#ifndef EV_USE_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */ 86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif 87#endif
66 88
67#ifndef EV_USE_EPOLL 89#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0 90# define EV_USE_EPOLL 0
69#endif 91#endif
70 92
71#ifndef EV_USE_KQUEUE 93#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0 94# define EV_USE_KQUEUE 0
95#endif
96
97#ifndef EV_USE_WIN32
98# ifdef WIN32
99# define EV_USE_WIN32 1
100# else
101# define EV_USE_WIN32 0
102# endif
73#endif 103#endif
74 104
75#ifndef EV_USE_REALTIME 105#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1 106# define EV_USE_REALTIME 1
77#endif 107#endif
… …
113 143
114typedef struct ev_watcher *W; 144typedef struct ev_watcher *W;
115typedef struct ev_watcher_list *WL; 145typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT; 146typedef struct ev_watcher_time *WT;
117 147
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149
118/*****************************************************************************/ 150/*****************************************************************************/
119 151
120typedef struct 152typedef struct
121{ 153{
122 struct ev_watcher_list *head; 154 struct ev_watcher_list *head;
… …
128{ 160{
129 W w; 161 W w;
130 int events; 162 int events;
131} ANPENDING; 163} ANPENDING;
132 164
133#ifdef EV_MULTIPLICITY 165#if EV_MULTIPLICITY
166
134struct ev_loop 167struct ev_loop
135{ 168{
136# define VAR(name,decl) decl 169# define VAR(name,decl) decl;
137# include "ev_vars.h" 170# include "ev_vars.h"
138}; 171};
172# undef VAR
173# include "ev_wrap.h"
174
139#else 175#else
176
140# define VAR(name,decl) static decl 177# define VAR(name,decl) static decl;
141# include "ev_vars.h" 178# include "ev_vars.h"
142#endif
143#undef VAR 179# undef VAR
180
181#endif
144 182
145/*****************************************************************************/ 183/*****************************************************************************/
146 184
147inline ev_tstamp 185inline ev_tstamp
148ev_time (void) 186ev_time (void)
… …
319 357
320/* called on ENOMEM in select/poll to kill some fds and retry */ 358/* called on ENOMEM in select/poll to kill some fds and retry */
321static void 359static void
322fd_enomem (EV_P) 360fd_enomem (EV_P)
323{ 361{
324 int fd = anfdmax; 362 int fd;
325 363
326 while (fd--) 364 for (fd = anfdmax; fd--; )
327 if (anfds [fd].events) 365 if (anfds [fd].events)
328 { 366 {
329 close (fd); 367 close (fd);
330 fd_kill (EV_A_ fd); 368 fd_kill (EV_A_ fd);
331 return; 369 return;
332 } 370 }
333} 371}
334 372
373/* susually called after fork if method needs to re-arm all fds from scratch */
374static void
375fd_rearm_all (EV_P)
376{
377 int fd;
378
379 /* this should be highly optimised to not do anything but set a flag */
380 for (fd = 0; fd < anfdmax; ++fd)
381 if (anfds [fd].events)
382 {
383 anfds [fd].events = 0;
384 fd_change (EV_A_ fd);
385 }
386}
387
335/*****************************************************************************/ 388/*****************************************************************************/
336 389
337static void 390static void
338upheap (WT *timers, int k) 391upheap (WT *heap, int k)
339{ 392{
340 WT w = timers [k]; 393 WT w = heap [k];
341 394
342 while (k && timers [k >> 1]->at > w->at) 395 while (k && heap [k >> 1]->at > w->at)
343 { 396 {
344 timers [k] = timers [k >> 1]; 397 heap [k] = heap [k >> 1];
345 timers [k]->active = k + 1; 398 ((W)heap [k])->active = k + 1;
346 k >>= 1; 399 k >>= 1;
347 } 400 }
348 401
349 timers [k] = w; 402 heap [k] = w;
350 timers [k]->active = k + 1; 403 ((W)heap [k])->active = k + 1;
351 404
352} 405}
353 406
354static void 407static void
355downheap (WT *timers, int N, int k) 408downheap (WT *heap, int N, int k)
356{ 409{
357 WT w = timers [k]; 410 WT w = heap [k];
358 411
359 while (k < (N >> 1)) 412 while (k < (N >> 1))
360 { 413 {
361 int j = k << 1; 414 int j = k << 1;
362 415
363 if (j + 1 < N && timers [j]->at > timers [j + 1]->at) 416 if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
364 ++j; 417 ++j;
365 418
366 if (w->at <= timers [j]->at) 419 if (w->at <= heap [j]->at)
367 break; 420 break;
368 421
369 timers [k] = timers [j]; 422 heap [k] = heap [j];
370 timers [k]->active = k + 1; 423 ((W)heap [k])->active = k + 1;
371 k = j; 424 k = j;
372 } 425 }
373 426
374 timers [k] = w; 427 heap [k] = w;
375 timers [k]->active = k + 1; 428 ((W)heap [k])->active = k + 1;
376} 429}
377 430
378/*****************************************************************************/ 431/*****************************************************************************/
379 432
380typedef struct 433typedef struct
… …
386static ANSIG *signals; 439static ANSIG *signals;
387static int signalmax; 440static int signalmax;
388 441
389static int sigpipe [2]; 442static int sigpipe [2];
390static sig_atomic_t volatile gotsig; 443static sig_atomic_t volatile gotsig;
444static struct ev_io sigev;
391 445
392static void 446static void
393signals_init (ANSIG *base, int count) 447signals_init (ANSIG *base, int count)
394{ 448{
395 while (count--) 449 while (count--)
… …
445 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 499 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
446 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 500 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
447#endif 501#endif
448 502
449 ev_io_set (&sigev, sigpipe [0], EV_READ); 503 ev_io_set (&sigev, sigpipe [0], EV_READ);
450 ev_io_start (&sigev); 504 ev_io_start (EV_A_ &sigev);
451 ev_unref (EV_A); /* child watcher should not keep loop alive */ 505 ev_unref (EV_A); /* child watcher should not keep loop alive */
452} 506}
453 507
454/*****************************************************************************/ 508/*****************************************************************************/
455 509
456#ifndef WIN32 510#ifndef WIN32
511
512static struct ev_child *childs [PID_HASHSIZE];
513static struct ev_signal childev;
457 514
458#ifndef WCONTINUED 515#ifndef WCONTINUED
459# define WCONTINUED 0 516# define WCONTINUED 0
460#endif 517#endif
461 518
… …
497# include "ev_kqueue.c" 554# include "ev_kqueue.c"
498#endif 555#endif
499#if EV_USE_EPOLL 556#if EV_USE_EPOLL
500# include "ev_epoll.c" 557# include "ev_epoll.c"
501#endif 558#endif
502#if EV_USEV_POLL 559#if EV_USE_POLL
503# include "ev_poll.c" 560# include "ev_poll.c"
504#endif 561#endif
505#if EV_USE_SELECT 562#if EV_USE_SELECT
506# include "ev_select.c" 563# include "ev_select.c"
507#endif 564#endif
… …
534ev_method (EV_P) 591ev_method (EV_P)
535{ 592{
536 return method; 593 return method;
537} 594}
538 595
539int 596static void
540ev_init (EV_P_ int methods) 597loop_init (EV_P_ int methods)
541{ 598{
542#ifdef EV_MULTIPLICITY
543 memset (loop, 0, sizeof (struct ev_loop));
544#endif
545
546 if (!method) 599 if (!method)
547 { 600 {
548#if EV_USE_MONOTONIC 601#if EV_USE_MONOTONIC
549 { 602 {
550 struct timespec ts; 603 struct timespec ts;
… …
554#endif 607#endif
555 608
556 rt_now = ev_time (); 609 rt_now = ev_time ();
557 mn_now = get_clock (); 610 mn_now = get_clock ();
558 now_floor = mn_now; 611 now_floor = mn_now;
559 diff = rt_now - mn_now; 612 rtmn_diff = rt_now - mn_now;
560
561 if (pipe (sigpipe))
562 return 0;
563 613
564 if (methods == EVMETHOD_AUTO) 614 if (methods == EVMETHOD_AUTO)
565 if (!enable_secure () && getenv ("LIBmethodS")) 615 if (!enable_secure () && getenv ("LIBEV_METHODS"))
566 methods = atoi (getenv ("LIBmethodS")); 616 methods = atoi (getenv ("LIBEV_METHODS"));
567 else 617 else
568 methods = EVMETHOD_ANY; 618 methods = EVMETHOD_ANY;
569 619
570 method = 0; 620 method = 0;
621#if EV_USE_WIN32
622 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
623#endif
571#if EV_USE_KQUEUE 624#if EV_USE_KQUEUE
572 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 625 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
573#endif 626#endif
574#if EV_USE_EPOLL 627#if EV_USE_EPOLL
575 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 628 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
576#endif 629#endif
577#if EV_USEV_POLL 630#if EV_USE_POLL
578 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
579#endif 632#endif
580#if EV_USE_SELECT 633#if EV_USE_SELECT
581 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
582#endif 635#endif
636 }
637}
583 638
639void
640loop_destroy (EV_P)
641{
642#if EV_USE_WIN32
643 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
644#endif
645#if EV_USE_KQUEUE
646 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
647#endif
648#if EV_USE_EPOLL
649 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
650#endif
651#if EV_USE_POLL
652 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
653#endif
654#if EV_USE_SELECT
655 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
656#endif
657
658 method = 0;
659 /*TODO*/
660}
661
662void
663loop_fork (EV_P)
664{
665 /*TODO*/
666#if EV_USE_EPOLL
667 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
668#endif
669#if EV_USE_KQUEUE
670 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
671#endif
672}
673
674#if EV_MULTIPLICITY
675struct ev_loop *
676ev_loop_new (int methods)
677{
678 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
679
680 loop_init (EV_A_ methods);
681
682 if (ev_method (EV_A))
683 return loop;
684
685 return 0;
686}
687
688void
689ev_loop_destroy (EV_P)
690{
691 loop_destroy (EV_A);
692 free (loop);
693}
694
695void
696ev_loop_fork (EV_P)
697{
698 loop_fork (EV_A);
699}
700
701#endif
702
703#if EV_MULTIPLICITY
704struct ev_loop default_loop_struct;
705static struct ev_loop *default_loop;
706
707struct ev_loop *
708#else
709static int default_loop;
710
711int
712#endif
713ev_default_loop (int methods)
714{
715 if (sigpipe [0] == sigpipe [1])
716 if (pipe (sigpipe))
717 return 0;
718
719 if (!default_loop)
720 {
721#if EV_MULTIPLICITY
722 struct ev_loop *loop = default_loop = &default_loop_struct;
723#else
724 default_loop = 1;
725#endif
726
727 loop_init (EV_A_ methods);
728
584 if (method) 729 if (ev_method (EV_A))
585 { 730 {
586 ev_watcher_init (&sigev, sigcb); 731 ev_watcher_init (&sigev, sigcb);
587 ev_set_priority (&sigev, EV_MAXPRI); 732 ev_set_priority (&sigev, EV_MAXPRI);
588 siginit (EV_A); 733 siginit (EV_A);
589 734
… …
592 ev_set_priority (&childev, EV_MAXPRI); 737 ev_set_priority (&childev, EV_MAXPRI);
593 ev_signal_start (EV_A_ &childev); 738 ev_signal_start (EV_A_ &childev);
594 ev_unref (EV_A); /* child watcher should not keep loop alive */ 739 ev_unref (EV_A); /* child watcher should not keep loop alive */
595#endif 740#endif
596 } 741 }
742 else
743 default_loop = 0;
597 } 744 }
598 745
599 return method; 746 return default_loop;
600} 747}
601 748
602/*****************************************************************************/
603
604void 749void
605ev_fork_prepare (void) 750ev_default_destroy (void)
606{ 751{
607 /* nop */ 752#if EV_MULTIPLICITY
608} 753 struct ev_loop *loop = default_loop;
609
610void
611ev_fork_parent (void)
612{
613 /* nop */
614}
615
616void
617ev_fork_child (void)
618{
619#if EV_USE_EPOLL
620 if (method == EVMETHOD_EPOLL)
621 epoll_postfork_child ();
622#endif 754#endif
623 755
756 ev_ref (EV_A); /* child watcher */
757 ev_signal_stop (EV_A_ &childev);
758
759 ev_ref (EV_A); /* signal watcher */
624 ev_io_stop (&sigev); 760 ev_io_stop (EV_A_ &sigev);
761
762 close (sigpipe [0]); sigpipe [0] = 0;
763 close (sigpipe [1]); sigpipe [1] = 0;
764
765 loop_destroy (EV_A);
766}
767
768void
769ev_default_fork (void)
770{
771#if EV_MULTIPLICITY
772 struct ev_loop *loop = default_loop;
773#endif
774
775 loop_fork (EV_A);
776
777 ev_io_stop (EV_A_ &sigev);
625 close (sigpipe [0]); 778 close (sigpipe [0]);
626 close (sigpipe [1]); 779 close (sigpipe [1]);
627 pipe (sigpipe); 780 pipe (sigpipe);
781
782 ev_ref (EV_A); /* signal watcher */
628 siginit (); 783 siginit (EV_A);
629} 784}
630 785
631/*****************************************************************************/ 786/*****************************************************************************/
632 787
633static void 788static void
… …
652timers_reify (EV_P) 807timers_reify (EV_P)
653{ 808{
654 while (timercnt && timers [0]->at <= mn_now) 809 while (timercnt && timers [0]->at <= mn_now)
655 { 810 {
656 struct ev_timer *w = timers [0]; 811 struct ev_timer *w = timers [0];
812
813 assert (("inactive timer on timer heap detected", ev_is_active (w)));
657 814
658 /* first reschedule or stop timer */ 815 /* first reschedule or stop timer */
659 if (w->repeat) 816 if (w->repeat)
660 { 817 {
661 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 818 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
663 downheap ((WT *)timers, timercnt, 0); 820 downheap ((WT *)timers, timercnt, 0);
664 } 821 }
665 else 822 else
666 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 823 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
667 824
668 event ((W)w, EV_TIMEOUT); 825 event (EV_A_ (W)w, EV_TIMEOUT);
669 } 826 }
670} 827}
671 828
672static void 829static void
673periodics_reify (EV_P) 830periodics_reify (EV_P)
674{ 831{
675 while (periodiccnt && periodics [0]->at <= rt_now) 832 while (periodiccnt && periodics [0]->at <= rt_now)
676 { 833 {
677 struct ev_periodic *w = periodics [0]; 834 struct ev_periodic *w = periodics [0];
835
836 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
678 837
679 /* first reschedule or stop timer */ 838 /* first reschedule or stop timer */
680 if (w->interval) 839 if (w->interval)
681 { 840 {
682 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 841 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
… …
689 event (EV_A_ (W)w, EV_PERIODIC); 848 event (EV_A_ (W)w, EV_PERIODIC);
690 } 849 }
691} 850}
692 851
693static void 852static void
694periodics_reschedule (EV_P_ ev_tstamp diff) 853periodics_reschedule (EV_P)
695{ 854{
696 int i; 855 int i;
697 856
698 /* adjust periodics after time jump */ 857 /* adjust periodics after time jump */
699 for (i = 0; i < periodiccnt; ++i) 858 for (i = 0; i < periodiccnt; ++i)
… …
720{ 879{
721 mn_now = get_clock (); 880 mn_now = get_clock ();
722 881
723 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 882 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
724 { 883 {
725 rt_now = mn_now + diff; 884 rt_now = rtmn_diff + mn_now;
726 return 0; 885 return 0;
727 } 886 }
728 else 887 else
729 { 888 {
730 now_floor = mn_now; 889 now_floor = mn_now;
… …
741#if EV_USE_MONOTONIC 900#if EV_USE_MONOTONIC
742 if (expect_true (have_monotonic)) 901 if (expect_true (have_monotonic))
743 { 902 {
744 if (time_update_monotonic (EV_A)) 903 if (time_update_monotonic (EV_A))
745 { 904 {
746 ev_tstamp odiff = diff; 905 ev_tstamp odiff = rtmn_diff;
747 906
748 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 907 for (i = 4; --i; ) /* loop a few times, before making important decisions */
749 { 908 {
750 diff = rt_now - mn_now; 909 rtmn_diff = rt_now - mn_now;
751 910
752 if (fabs (odiff - diff) < MIN_TIMEJUMP) 911 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
753 return; /* all is well */ 912 return; /* all is well */
754 913
755 rt_now = ev_time (); 914 rt_now = ev_time ();
756 mn_now = get_clock (); 915 mn_now = get_clock ();
757 now_floor = mn_now; 916 now_floor = mn_now;
758 } 917 }
759 918
760 periodics_reschedule (EV_A_ diff - odiff); 919 periodics_reschedule (EV_A);
761 /* no timer adjustment, as the monotonic clock doesn't jump */ 920 /* no timer adjustment, as the monotonic clock doesn't jump */
921 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
762 } 922 }
763 } 923 }
764 else 924 else
765#endif 925#endif
766 { 926 {
767 rt_now = ev_time (); 927 rt_now = ev_time ();
768 928
769 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 929 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
770 { 930 {
771 periodics_reschedule (EV_A_ rt_now - mn_now); 931 periodics_reschedule (EV_A);
772 932
773 /* adjust timers. this is easy, as the offset is the same for all */ 933 /* adjust timers. this is easy, as the offset is the same for all */
774 for (i = 0; i < timercnt; ++i) 934 for (i = 0; i < timercnt; ++i)
775 timers [i]->at += diff; 935 timers [i]->at += rt_now - mn_now;
776 } 936 }
777 937
778 mn_now = rt_now; 938 mn_now = rt_now;
779 } 939 }
780} 940}
… …
972 1132
973 ev_start (EV_A_ (W)w, ++timercnt); 1133 ev_start (EV_A_ (W)w, ++timercnt);
974 array_needsize (timers, timermax, timercnt, ); 1134 array_needsize (timers, timermax, timercnt, );
975 timers [timercnt - 1] = w; 1135 timers [timercnt - 1] = w;
976 upheap ((WT *)timers, timercnt - 1); 1136 upheap ((WT *)timers, timercnt - 1);
1137
1138 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
977} 1139}
978 1140
979void 1141void
980ev_timer_stop (EV_P_ struct ev_timer *w) 1142ev_timer_stop (EV_P_ struct ev_timer *w)
981{ 1143{
982 ev_clear_pending (EV_A_ (W)w); 1144 ev_clear_pending (EV_A_ (W)w);
983 if (!ev_is_active (w)) 1145 if (!ev_is_active (w))
984 return; 1146 return;
985 1147
1148 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1149
986 if (w->active < timercnt--) 1150 if (((W)w)->active < timercnt--)
987 { 1151 {
988 timers [w->active - 1] = timers [timercnt]; 1152 timers [((W)w)->active - 1] = timers [timercnt];
989 downheap ((WT *)timers, timercnt, w->active - 1); 1153 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
990 } 1154 }
991 1155
992 w->at = w->repeat; 1156 w->at = w->repeat;
993 1157
994 ev_stop (EV_A_ (W)w); 1158 ev_stop (EV_A_ (W)w);
… …
1000 if (ev_is_active (w)) 1164 if (ev_is_active (w))
1001 { 1165 {
1002 if (w->repeat) 1166 if (w->repeat)
1003 { 1167 {
1004 w->at = mn_now + w->repeat; 1168 w->at = mn_now + w->repeat;
1005 downheap ((WT *)timers, timercnt, w->active - 1); 1169 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1006 } 1170 }
1007 else 1171 else
1008 ev_timer_stop (EV_A_ w); 1172 ev_timer_stop (EV_A_ w);
1009 } 1173 }
1010 else if (w->repeat) 1174 else if (w->repeat)
… …
1025 1189
1026 ev_start (EV_A_ (W)w, ++periodiccnt); 1190 ev_start (EV_A_ (W)w, ++periodiccnt);
1027 array_needsize (periodics, periodicmax, periodiccnt, ); 1191 array_needsize (periodics, periodicmax, periodiccnt, );
1028 periodics [periodiccnt - 1] = w; 1192 periodics [periodiccnt - 1] = w;
1029 upheap ((WT *)periodics, periodiccnt - 1); 1193 upheap ((WT *)periodics, periodiccnt - 1);
1194
1195 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1030} 1196}
1031 1197
1032void 1198void
1033ev_periodic_stop (EV_P_ struct ev_periodic *w) 1199ev_periodic_stop (EV_P_ struct ev_periodic *w)
1034{ 1200{
1035 ev_clear_pending (EV_A_ (W)w); 1201 ev_clear_pending (EV_A_ (W)w);
1036 if (!ev_is_active (w)) 1202 if (!ev_is_active (w))
1037 return; 1203 return;
1038 1204
1205 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1206
1039 if (w->active < periodiccnt--) 1207 if (((W)w)->active < periodiccnt--)
1040 { 1208 {
1041 periodics [w->active - 1] = periodics [periodiccnt]; 1209 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1042 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1210 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1043 } 1211 }
1044 1212
1213 ev_stop (EV_A_ (W)w);
1214}
1215
1216void
1217ev_idle_start (EV_P_ struct ev_idle *w)
1218{
1219 if (ev_is_active (w))
1220 return;
1221
1222 ev_start (EV_A_ (W)w, ++idlecnt);
1223 array_needsize (idles, idlemax, idlecnt, );
1224 idles [idlecnt - 1] = w;
1225}
1226
1227void
1228ev_idle_stop (EV_P_ struct ev_idle *w)
1229{
1230 ev_clear_pending (EV_A_ (W)w);
1231 if (ev_is_active (w))
1232 return;
1233
1234 idles [((W)w)->active - 1] = idles [--idlecnt];
1235 ev_stop (EV_A_ (W)w);
1236}
1237
1238void
1239ev_prepare_start (EV_P_ struct ev_prepare *w)
1240{
1241 if (ev_is_active (w))
1242 return;
1243
1244 ev_start (EV_A_ (W)w, ++preparecnt);
1245 array_needsize (prepares, preparemax, preparecnt, );
1246 prepares [preparecnt - 1] = w;
1247}
1248
1249void
1250ev_prepare_stop (EV_P_ struct ev_prepare *w)
1251{
1252 ev_clear_pending (EV_A_ (W)w);
1253 if (ev_is_active (w))
1254 return;
1255
1256 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1257 ev_stop (EV_A_ (W)w);
1258}
1259
1260void
1261ev_check_start (EV_P_ struct ev_check *w)
1262{
1263 if (ev_is_active (w))
1264 return;
1265
1266 ev_start (EV_A_ (W)w, ++checkcnt);
1267 array_needsize (checks, checkmax, checkcnt, );
1268 checks [checkcnt - 1] = w;
1269}
1270
1271void
1272ev_check_stop (EV_P_ struct ev_check *w)
1273{
1274 ev_clear_pending (EV_A_ (W)w);
1275 if (ev_is_active (w))
1276 return;
1277
1278 checks [((W)w)->active - 1] = checks [--checkcnt];
1045 ev_stop (EV_A_ (W)w); 1279 ev_stop (EV_A_ (W)w);
1046} 1280}
1047 1281
1048#ifndef SA_RESTART 1282#ifndef SA_RESTART
1049# define SA_RESTART 0 1283# define SA_RESTART 0
1050#endif 1284#endif
1051 1285
1052void 1286void
1053ev_signal_start (EV_P_ struct ev_signal *w) 1287ev_signal_start (EV_P_ struct ev_signal *w)
1054{ 1288{
1289#if EV_MULTIPLICITY
1290 assert (("signal watchers are only supported in the default loop", loop == default_loop));
1291#endif
1055 if (ev_is_active (w)) 1292 if (ev_is_active (w))
1056 return; 1293 return;
1057 1294
1058 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1295 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1059 1296
… …
1084 if (!signals [w->signum - 1].head) 1321 if (!signals [w->signum - 1].head)
1085 signal (w->signum, SIG_DFL); 1322 signal (w->signum, SIG_DFL);
1086} 1323}
1087 1324
1088void 1325void
1089ev_idle_start (EV_P_ struct ev_idle *w)
1090{
1091 if (ev_is_active (w))
1092 return;
1093
1094 ev_start (EV_A_ (W)w, ++idlecnt);
1095 array_needsize (idles, idlemax, idlecnt, );
1096 idles [idlecnt - 1] = w;
1097}
1098
1099void
1100ev_idle_stop (EV_P_ struct ev_idle *w)
1101{
1102 ev_clear_pending (EV_A_ (W)w);
1103 if (ev_is_active (w))
1104 return;
1105
1106 idles [w->active - 1] = idles [--idlecnt];
1107 ev_stop (EV_A_ (W)w);
1108}
1109
1110void
1111ev_prepare_start (EV_P_ struct ev_prepare *w)
1112{
1113 if (ev_is_active (w))
1114 return;
1115
1116 ev_start (EV_A_ (W)w, ++preparecnt);
1117 array_needsize (prepares, preparemax, preparecnt, );
1118 prepares [preparecnt - 1] = w;
1119}
1120
1121void
1122ev_prepare_stop (EV_P_ struct ev_prepare *w)
1123{
1124 ev_clear_pending (EV_A_ (W)w);
1125 if (ev_is_active (w))
1126 return;
1127
1128 prepares [w->active - 1] = prepares [--preparecnt];
1129 ev_stop (EV_A_ (W)w);
1130}
1131
1132void
1133ev_check_start (EV_P_ struct ev_check *w)
1134{
1135 if (ev_is_active (w))
1136 return;
1137
1138 ev_start (EV_A_ (W)w, ++checkcnt);
1139 array_needsize (checks, checkmax, checkcnt, );
1140 checks [checkcnt - 1] = w;
1141}
1142
1143void
1144ev_check_stop (EV_P_ struct ev_check *w)
1145{
1146 ev_clear_pending (EV_A_ (W)w);
1147 if (ev_is_active (w))
1148 return;
1149
1150 checks [w->active - 1] = checks [--checkcnt];
1151 ev_stop (EV_A_ (W)w);
1152}
1153
1154void
1155ev_child_start (EV_P_ struct ev_child *w) 1326ev_child_start (EV_P_ struct ev_child *w)
1156{ 1327{
1328#if EV_MULTIPLICITY
1329 assert (("child watchers are only supported in the default loop", loop == default_loop));
1330#endif
1157 if (ev_is_active (w)) 1331 if (ev_is_active (w))
1158 return; 1332 return;
1159 1333
1160 ev_start (EV_A_ (W)w, 1); 1334 ev_start (EV_A_ (W)w, 1);
1161 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1335 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
… …
1233 ev_timer_start (EV_A_ &once->to); 1407 ev_timer_start (EV_A_ &once->to);
1234 } 1408 }
1235 } 1409 }
1236} 1410}
1237 1411
1238/*****************************************************************************/
1239
1240#if 0
1241
1242struct ev_io wio;
1243
1244static void
1245sin_cb (struct ev_io *w, int revents)
1246{
1247 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
1248}
1249
1250static void
1251ocb (struct ev_timer *w, int revents)
1252{
1253 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
1254 ev_timer_stop (w);
1255 ev_timer_start (w);
1256}
1257
1258static void
1259scb (struct ev_signal *w, int revents)
1260{
1261 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1262 ev_io_stop (&wio);
1263 ev_io_start (&wio);
1264}
1265
1266static void
1267gcb (struct ev_signal *w, int revents)
1268{
1269 fprintf (stderr, "generic %x\n", revents);
1270
1271}
1272
1273int main (void)
1274{
1275 ev_init (0);
1276
1277 ev_io_init (&wio, sin_cb, 0, EV_READ);
1278 ev_io_start (&wio);
1279
1280 struct ev_timer t[10000];
1281
1282#if 0
1283 int i;
1284 for (i = 0; i < 10000; ++i)
1285 {
1286 struct ev_timer *w = t + i;
1287 ev_watcher_init (w, ocb, i);
1288 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1289 ev_timer_start (w);
1290 if (drand48 () < 0.5)
1291 ev_timer_stop (w);
1292 }
1293#endif
1294
1295 struct ev_timer t1;
1296 ev_timer_init (&t1, ocb, 5, 10);
1297 ev_timer_start (&t1);
1298
1299 struct ev_signal sig;
1300 ev_signal_init (&sig, scb, SIGQUIT);
1301 ev_signal_start (&sig);
1302
1303 struct ev_check cw;
1304 ev_check_init (&cw, gcb);
1305 ev_check_start (&cw);
1306
1307 struct ev_idle iw;
1308 ev_idle_init (&iw, gcb);
1309 ev_idle_start (&iw);
1310
1311 ev_loop (0);
1312
1313 return 0;
1314}
1315
1316#endif
1317
1318
1319
1320

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines