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

Comparing libev/ev.c (file contents):
Revision 1.52 by root, Sat Nov 3 22:10:39 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
118static ev_tstamp now_floor, mn_now, diff; /* monotonic clock */ 148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
119static ev_tstamp rt_now;
120static int method;
121 149
122static int have_monotonic; /* runtime */ 150/*****************************************************************************/
123 151
124static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */ 152typedef struct
125static void (*method_modify)(EV_P_ int fd, int oev, int nev); 153{
126static void (*method_poll)(EV_P_ ev_tstamp timeout); 154 struct ev_watcher_list *head;
155 unsigned char events;
156 unsigned char reify;
157} ANFD;
127 158
128static int activecnt; /* number of active events */ 159typedef struct
160{
161 W w;
162 int events;
163} ANPENDING;
129 164
130#if EV_USE_SELECT 165#if EV_MULTIPLICITY
131static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo;
132static int vec_max;
133#endif
134 166
135#if EV_USEV_POLL 167struct ev_loop
136static struct pollfd *polls; 168{
137static int pollmax, pollcnt; 169# define VAR(name,decl) decl;
138static int *pollidxs; /* maps fds into structure indices */ 170# include "ev_vars.h"
139static int pollidxmax; 171};
140#endif 172# undef VAR
173# include "ev_wrap.h"
141 174
142#if EV_USE_EPOLL 175#else
143static int epoll_fd = -1;
144 176
145static struct epoll_event *events; 177# define VAR(name,decl) static decl;
146static int eventmax; 178# include "ev_vars.h"
147#endif 179# undef VAR
148 180
149#if EV_USE_KQUEUE
150static int kqueue_fd;
151static struct kevent *kqueue_changes;
152static int kqueue_changemax, kqueue_changecnt;
153static struct kevent *kqueue_events;
154static int kqueue_eventmax;
155#endif 181#endif
156 182
157/*****************************************************************************/ 183/*****************************************************************************/
158 184
159inline ev_tstamp 185inline ev_tstamp
… …
208 cur = newcnt; \ 234 cur = newcnt; \
209 } 235 }
210 236
211/*****************************************************************************/ 237/*****************************************************************************/
212 238
213typedef struct
214{
215 struct ev_watcher_list *head;
216 unsigned char events;
217 unsigned char reify;
218} ANFD;
219
220static ANFD *anfds;
221static int anfdmax;
222
223static void 239static void
224anfds_init (ANFD *base, int count) 240anfds_init (ANFD *base, int count)
225{ 241{
226 while (count--) 242 while (count--)
227 { 243 {
… …
230 base->reify = 0; 246 base->reify = 0;
231 247
232 ++base; 248 ++base;
233 } 249 }
234} 250}
235
236typedef struct
237{
238 W w;
239 int events;
240} ANPENDING;
241
242static ANPENDING *pendings [NUMPRI];
243static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
244 251
245static void 252static void
246event (EV_P_ W w, int events) 253event (EV_P_ W w, int events)
247{ 254{
248 if (w->pending) 255 if (w->pending)
… …
280 event (EV_A_ (W)w, ev); 287 event (EV_A_ (W)w, ev);
281 } 288 }
282} 289}
283 290
284/*****************************************************************************/ 291/*****************************************************************************/
285
286static int *fdchanges;
287static int fdchangemax, fdchangecnt;
288 292
289static void 293static void
290fd_reify (EV_P) 294fd_reify (EV_P)
291{ 295{
292 int i; 296 int i;
… …
353 357
354/* 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 */
355static void 359static void
356fd_enomem (EV_P) 360fd_enomem (EV_P)
357{ 361{
358 int fd = anfdmax; 362 int fd;
359 363
360 while (fd--) 364 for (fd = anfdmax; fd--; )
361 if (anfds [fd].events) 365 if (anfds [fd].events)
362 { 366 {
363 close (fd); 367 close (fd);
364 fd_kill (EV_A_ fd); 368 fd_kill (EV_A_ fd);
365 return; 369 return;
366 } 370 }
367} 371}
368 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
369/*****************************************************************************/ 388/*****************************************************************************/
370 389
371static struct ev_timer **timers;
372static int timermax, timercnt;
373
374static struct ev_periodic **periodics;
375static int periodicmax, periodiccnt;
376
377static void 390static void
378upheap (WT *timers, int k) 391upheap (WT *heap, int k)
379{ 392{
380 WT w = timers [k]; 393 WT w = heap [k];
381 394
382 while (k && timers [k >> 1]->at > w->at) 395 while (k && heap [k >> 1]->at > w->at)
383 { 396 {
384 timers [k] = timers [k >> 1]; 397 heap [k] = heap [k >> 1];
385 timers [k]->active = k + 1; 398 ((W)heap [k])->active = k + 1;
386 k >>= 1; 399 k >>= 1;
387 } 400 }
388 401
389 timers [k] = w; 402 heap [k] = w;
390 timers [k]->active = k + 1; 403 ((W)heap [k])->active = k + 1;
391 404
392} 405}
393 406
394static void 407static void
395downheap (WT *timers, int N, int k) 408downheap (WT *heap, int N, int k)
396{ 409{
397 WT w = timers [k]; 410 WT w = heap [k];
398 411
399 while (k < (N >> 1)) 412 while (k < (N >> 1))
400 { 413 {
401 int j = k << 1; 414 int j = k << 1;
402 415
403 if (j + 1 < N && timers [j]->at > timers [j + 1]->at) 416 if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
404 ++j; 417 ++j;
405 418
406 if (w->at <= timers [j]->at) 419 if (w->at <= heap [j]->at)
407 break; 420 break;
408 421
409 timers [k] = timers [j]; 422 heap [k] = heap [j];
410 timers [k]->active = k + 1; 423 ((W)heap [k])->active = k + 1;
411 k = j; 424 k = j;
412 } 425 }
413 426
414 timers [k] = w; 427 heap [k] = w;
415 timers [k]->active = k + 1; 428 ((W)heap [k])->active = k + 1;
416} 429}
417 430
418/*****************************************************************************/ 431/*****************************************************************************/
419 432
420typedef struct 433typedef struct
… …
486 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 499 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
487 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 500 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
488#endif 501#endif
489 502
490 ev_io_set (&sigev, sigpipe [0], EV_READ); 503 ev_io_set (&sigev, sigpipe [0], EV_READ);
491 ev_io_start (&sigev); 504 ev_io_start (EV_A_ &sigev);
492 ev_unref (EV_A); /* child watcher should not keep loop alive */ 505 ev_unref (EV_A); /* child watcher should not keep loop alive */
493} 506}
494 507
495/*****************************************************************************/ 508/*****************************************************************************/
496 509
497static struct ev_idle **idles; 510#ifndef WIN32
498static int idlemax, idlecnt;
499
500static struct ev_prepare **prepares;
501static int preparemax, preparecnt;
502
503static struct ev_check **checks;
504static int checkmax, checkcnt;
505
506/*****************************************************************************/
507 511
508static struct ev_child *childs [PID_HASHSIZE]; 512static struct ev_child *childs [PID_HASHSIZE];
509static struct ev_signal childev; 513static struct ev_signal childev;
510
511#ifndef WIN32
512 514
513#ifndef WCONTINUED 515#ifndef WCONTINUED
514# define WCONTINUED 0 516# define WCONTINUED 0
515#endif 517#endif
516 518
… …
552# include "ev_kqueue.c" 554# include "ev_kqueue.c"
553#endif 555#endif
554#if EV_USE_EPOLL 556#if EV_USE_EPOLL
555# include "ev_epoll.c" 557# include "ev_epoll.c"
556#endif 558#endif
557#if EV_USEV_POLL 559#if EV_USE_POLL
558# include "ev_poll.c" 560# include "ev_poll.c"
559#endif 561#endif
560#if EV_USE_SELECT 562#if EV_USE_SELECT
561# include "ev_select.c" 563# include "ev_select.c"
562#endif 564#endif
… …
589ev_method (EV_P) 591ev_method (EV_P)
590{ 592{
591 return method; 593 return method;
592} 594}
593 595
594int 596static void
595ev_init (EV_P_ int methods) 597loop_init (EV_P_ int methods)
596{ 598{
597 if (!method) 599 if (!method)
598 { 600 {
599#if EV_USE_MONOTONIC 601#if EV_USE_MONOTONIC
600 { 602 {
… …
605#endif 607#endif
606 608
607 rt_now = ev_time (); 609 rt_now = ev_time ();
608 mn_now = get_clock (); 610 mn_now = get_clock ();
609 now_floor = mn_now; 611 now_floor = mn_now;
610 diff = rt_now - mn_now; 612 rtmn_diff = rt_now - mn_now;
611
612 if (pipe (sigpipe))
613 return 0;
614 613
615 if (methods == EVMETHOD_AUTO) 614 if (methods == EVMETHOD_AUTO)
616 if (!enable_secure () && getenv ("LIBmethodS")) 615 if (!enable_secure () && getenv ("LIBEV_METHODS"))
617 methods = atoi (getenv ("LIBmethodS")); 616 methods = atoi (getenv ("LIBEV_METHODS"));
618 else 617 else
619 methods = EVMETHOD_ANY; 618 methods = EVMETHOD_ANY;
620 619
621 method = 0; 620 method = 0;
621#if EV_USE_WIN32
622 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
623#endif
622#if EV_USE_KQUEUE 624#if EV_USE_KQUEUE
623 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 625 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
624#endif 626#endif
625#if EV_USE_EPOLL 627#if EV_USE_EPOLL
626 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 628 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
627#endif 629#endif
628#if EV_USEV_POLL 630#if EV_USE_POLL
629 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
630#endif 632#endif
631#if EV_USE_SELECT 633#if EV_USE_SELECT
632 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
633#endif 635#endif
636 }
637}
634 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
635 if (method) 729 if (ev_method (EV_A))
636 { 730 {
637 ev_watcher_init (&sigev, sigcb); 731 ev_watcher_init (&sigev, sigcb);
638 ev_set_priority (&sigev, EV_MAXPRI); 732 ev_set_priority (&sigev, EV_MAXPRI);
639 siginit (EV_A); 733 siginit (EV_A);
640 734
… …
643 ev_set_priority (&childev, EV_MAXPRI); 737 ev_set_priority (&childev, EV_MAXPRI);
644 ev_signal_start (EV_A_ &childev); 738 ev_signal_start (EV_A_ &childev);
645 ev_unref (EV_A); /* child watcher should not keep loop alive */ 739 ev_unref (EV_A); /* child watcher should not keep loop alive */
646#endif 740#endif
647 } 741 }
742 else
743 default_loop = 0;
648 } 744 }
649 745
650 return method; 746 return default_loop;
651} 747}
652 748
653/*****************************************************************************/
654
655void 749void
656ev_fork_prepare (void) 750ev_default_destroy (void)
657{ 751{
658 /* nop */ 752#if EV_MULTIPLICITY
659} 753 struct ev_loop *loop = default_loop;
660
661void
662ev_fork_parent (void)
663{
664 /* nop */
665}
666
667void
668ev_fork_child (void)
669{
670#if EV_USE_EPOLL
671 if (method == EVMETHOD_EPOLL)
672 epoll_postfork_child ();
673#endif 754#endif
674 755
756 ev_ref (EV_A); /* child watcher */
757 ev_signal_stop (EV_A_ &childev);
758
759 ev_ref (EV_A); /* signal watcher */
675 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);
676 close (sigpipe [0]); 778 close (sigpipe [0]);
677 close (sigpipe [1]); 779 close (sigpipe [1]);
678 pipe (sigpipe); 780 pipe (sigpipe);
781
782 ev_ref (EV_A); /* signal watcher */
679 siginit (); 783 siginit (EV_A);
680} 784}
681 785
682/*****************************************************************************/ 786/*****************************************************************************/
683 787
684static void 788static void
… …
703timers_reify (EV_P) 807timers_reify (EV_P)
704{ 808{
705 while (timercnt && timers [0]->at <= mn_now) 809 while (timercnt && timers [0]->at <= mn_now)
706 { 810 {
707 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)));
708 814
709 /* first reschedule or stop timer */ 815 /* first reschedule or stop timer */
710 if (w->repeat) 816 if (w->repeat)
711 { 817 {
712 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.));
… …
714 downheap ((WT *)timers, timercnt, 0); 820 downheap ((WT *)timers, timercnt, 0);
715 } 821 }
716 else 822 else
717 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 823 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
718 824
719 event ((W)w, EV_TIMEOUT); 825 event (EV_A_ (W)w, EV_TIMEOUT);
720 } 826 }
721} 827}
722 828
723static void 829static void
724periodics_reify (EV_P) 830periodics_reify (EV_P)
725{ 831{
726 while (periodiccnt && periodics [0]->at <= rt_now) 832 while (periodiccnt && periodics [0]->at <= rt_now)
727 { 833 {
728 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)));
729 837
730 /* first reschedule or stop timer */ 838 /* first reschedule or stop timer */
731 if (w->interval) 839 if (w->interval)
732 { 840 {
733 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;
… …
740 event (EV_A_ (W)w, EV_PERIODIC); 848 event (EV_A_ (W)w, EV_PERIODIC);
741 } 849 }
742} 850}
743 851
744static void 852static void
745periodics_reschedule (EV_P_ ev_tstamp diff) 853periodics_reschedule (EV_P)
746{ 854{
747 int i; 855 int i;
748 856
749 /* adjust periodics after time jump */ 857 /* adjust periodics after time jump */
750 for (i = 0; i < periodiccnt; ++i) 858 for (i = 0; i < periodiccnt; ++i)
… …
771{ 879{
772 mn_now = get_clock (); 880 mn_now = get_clock ();
773 881
774 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 882 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
775 { 883 {
776 rt_now = mn_now + diff; 884 rt_now = rtmn_diff + mn_now;
777 return 0; 885 return 0;
778 } 886 }
779 else 887 else
780 { 888 {
781 now_floor = mn_now; 889 now_floor = mn_now;
… …
792#if EV_USE_MONOTONIC 900#if EV_USE_MONOTONIC
793 if (expect_true (have_monotonic)) 901 if (expect_true (have_monotonic))
794 { 902 {
795 if (time_update_monotonic (EV_A)) 903 if (time_update_monotonic (EV_A))
796 { 904 {
797 ev_tstamp odiff = diff; 905 ev_tstamp odiff = rtmn_diff;
798 906
799 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 */
800 { 908 {
801 diff = rt_now - mn_now; 909 rtmn_diff = rt_now - mn_now;
802 910
803 if (fabs (odiff - diff) < MIN_TIMEJUMP) 911 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
804 return; /* all is well */ 912 return; /* all is well */
805 913
806 rt_now = ev_time (); 914 rt_now = ev_time ();
807 mn_now = get_clock (); 915 mn_now = get_clock ();
808 now_floor = mn_now; 916 now_floor = mn_now;
809 } 917 }
810 918
811 periodics_reschedule (EV_A_ diff - odiff); 919 periodics_reschedule (EV_A);
812 /* 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) */
813 } 922 }
814 } 923 }
815 else 924 else
816#endif 925#endif
817 { 926 {
818 rt_now = ev_time (); 927 rt_now = ev_time ();
819 928
820 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))
821 { 930 {
822 periodics_reschedule (EV_A_ rt_now - mn_now); 931 periodics_reschedule (EV_A);
823 932
824 /* 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 */
825 for (i = 0; i < timercnt; ++i) 934 for (i = 0; i < timercnt; ++i)
826 timers [i]->at += diff; 935 timers [i]->at += rt_now - mn_now;
827 } 936 }
828 937
829 mn_now = rt_now; 938 mn_now = rt_now;
830 } 939 }
831} 940}
… …
1023 1132
1024 ev_start (EV_A_ (W)w, ++timercnt); 1133 ev_start (EV_A_ (W)w, ++timercnt);
1025 array_needsize (timers, timermax, timercnt, ); 1134 array_needsize (timers, timermax, timercnt, );
1026 timers [timercnt - 1] = w; 1135 timers [timercnt - 1] = w;
1027 upheap ((WT *)timers, timercnt - 1); 1136 upheap ((WT *)timers, timercnt - 1);
1137
1138 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1028} 1139}
1029 1140
1030void 1141void
1031ev_timer_stop (EV_P_ struct ev_timer *w) 1142ev_timer_stop (EV_P_ struct ev_timer *w)
1032{ 1143{
1033 ev_clear_pending (EV_A_ (W)w); 1144 ev_clear_pending (EV_A_ (W)w);
1034 if (!ev_is_active (w)) 1145 if (!ev_is_active (w))
1035 return; 1146 return;
1036 1147
1148 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1149
1037 if (w->active < timercnt--) 1150 if (((W)w)->active < timercnt--)
1038 { 1151 {
1039 timers [w->active - 1] = timers [timercnt]; 1152 timers [((W)w)->active - 1] = timers [timercnt];
1040 downheap ((WT *)timers, timercnt, w->active - 1); 1153 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1041 } 1154 }
1042 1155
1043 w->at = w->repeat; 1156 w->at = w->repeat;
1044 1157
1045 ev_stop (EV_A_ (W)w); 1158 ev_stop (EV_A_ (W)w);
… …
1051 if (ev_is_active (w)) 1164 if (ev_is_active (w))
1052 { 1165 {
1053 if (w->repeat) 1166 if (w->repeat)
1054 { 1167 {
1055 w->at = mn_now + w->repeat; 1168 w->at = mn_now + w->repeat;
1056 downheap ((WT *)timers, timercnt, w->active - 1); 1169 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1057 } 1170 }
1058 else 1171 else
1059 ev_timer_stop (EV_A_ w); 1172 ev_timer_stop (EV_A_ w);
1060 } 1173 }
1061 else if (w->repeat) 1174 else if (w->repeat)
… …
1076 1189
1077 ev_start (EV_A_ (W)w, ++periodiccnt); 1190 ev_start (EV_A_ (W)w, ++periodiccnt);
1078 array_needsize (periodics, periodicmax, periodiccnt, ); 1191 array_needsize (periodics, periodicmax, periodiccnt, );
1079 periodics [periodiccnt - 1] = w; 1192 periodics [periodiccnt - 1] = w;
1080 upheap ((WT *)periodics, periodiccnt - 1); 1193 upheap ((WT *)periodics, periodiccnt - 1);
1194
1195 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1081} 1196}
1082 1197
1083void 1198void
1084ev_periodic_stop (EV_P_ struct ev_periodic *w) 1199ev_periodic_stop (EV_P_ struct ev_periodic *w)
1085{ 1200{
1086 ev_clear_pending (EV_A_ (W)w); 1201 ev_clear_pending (EV_A_ (W)w);
1087 if (!ev_is_active (w)) 1202 if (!ev_is_active (w))
1088 return; 1203 return;
1089 1204
1205 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1206
1090 if (w->active < periodiccnt--) 1207 if (((W)w)->active < periodiccnt--)
1091 { 1208 {
1092 periodics [w->active - 1] = periodics [periodiccnt]; 1209 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1093 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1210 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1094 } 1211 }
1095 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];
1096 ev_stop (EV_A_ (W)w); 1279 ev_stop (EV_A_ (W)w);
1097} 1280}
1098 1281
1099#ifndef SA_RESTART 1282#ifndef SA_RESTART
1100# define SA_RESTART 0 1283# define SA_RESTART 0
1101#endif 1284#endif
1102 1285
1103void 1286void
1104ev_signal_start (EV_P_ struct ev_signal *w) 1287ev_signal_start (EV_P_ struct ev_signal *w)
1105{ 1288{
1289#if EV_MULTIPLICITY
1290 assert (("signal watchers are only supported in the default loop", loop == default_loop));
1291#endif
1106 if (ev_is_active (w)) 1292 if (ev_is_active (w))
1107 return; 1293 return;
1108 1294
1109 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));
1110 1296
… …
1135 if (!signals [w->signum - 1].head) 1321 if (!signals [w->signum - 1].head)
1136 signal (w->signum, SIG_DFL); 1322 signal (w->signum, SIG_DFL);
1137} 1323}
1138 1324
1139void 1325void
1140ev_idle_start (EV_P_ struct ev_idle *w)
1141{
1142 if (ev_is_active (w))
1143 return;
1144
1145 ev_start (EV_A_ (W)w, ++idlecnt);
1146 array_needsize (idles, idlemax, idlecnt, );
1147 idles [idlecnt - 1] = w;
1148}
1149
1150void
1151ev_idle_stop (EV_P_ struct ev_idle *w)
1152{
1153 ev_clear_pending (EV_A_ (W)w);
1154 if (ev_is_active (w))
1155 return;
1156
1157 idles [w->active - 1] = idles [--idlecnt];
1158 ev_stop (EV_A_ (W)w);
1159}
1160
1161void
1162ev_prepare_start (EV_P_ struct ev_prepare *w)
1163{
1164 if (ev_is_active (w))
1165 return;
1166
1167 ev_start (EV_A_ (W)w, ++preparecnt);
1168 array_needsize (prepares, preparemax, preparecnt, );
1169 prepares [preparecnt - 1] = w;
1170}
1171
1172void
1173ev_prepare_stop (EV_P_ struct ev_prepare *w)
1174{
1175 ev_clear_pending (EV_A_ (W)w);
1176 if (ev_is_active (w))
1177 return;
1178
1179 prepares [w->active - 1] = prepares [--preparecnt];
1180 ev_stop (EV_A_ (W)w);
1181}
1182
1183void
1184ev_check_start (EV_P_ struct ev_check *w)
1185{
1186 if (ev_is_active (w))
1187 return;
1188
1189 ev_start (EV_A_ (W)w, ++checkcnt);
1190 array_needsize (checks, checkmax, checkcnt, );
1191 checks [checkcnt - 1] = w;
1192}
1193
1194void
1195ev_check_stop (EV_P_ struct ev_check *w)
1196{
1197 ev_clear_pending (EV_A_ (W)w);
1198 if (ev_is_active (w))
1199 return;
1200
1201 checks [w->active - 1] = checks [--checkcnt];
1202 ev_stop (EV_A_ (W)w);
1203}
1204
1205void
1206ev_child_start (EV_P_ struct ev_child *w) 1326ev_child_start (EV_P_ struct ev_child *w)
1207{ 1327{
1328#if EV_MULTIPLICITY
1329 assert (("child watchers are only supported in the default loop", loop == default_loop));
1330#endif
1208 if (ev_is_active (w)) 1331 if (ev_is_active (w))
1209 return; 1332 return;
1210 1333
1211 ev_start (EV_A_ (W)w, 1); 1334 ev_start (EV_A_ (W)w, 1);
1212 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1335 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
… …
1284 ev_timer_start (EV_A_ &once->to); 1407 ev_timer_start (EV_A_ &once->to);
1285 } 1408 }
1286 } 1409 }
1287} 1410}
1288 1411
1289/*****************************************************************************/
1290
1291#if 0
1292
1293struct ev_io wio;
1294
1295static void
1296sin_cb (struct ev_io *w, int revents)
1297{
1298 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
1299}
1300
1301static void
1302ocb (struct ev_timer *w, int revents)
1303{
1304 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
1305 ev_timer_stop (w);
1306 ev_timer_start (w);
1307}
1308
1309static void
1310scb (struct ev_signal *w, int revents)
1311{
1312 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1313 ev_io_stop (&wio);
1314 ev_io_start (&wio);
1315}
1316
1317static void
1318gcb (struct ev_signal *w, int revents)
1319{
1320 fprintf (stderr, "generic %x\n", revents);
1321
1322}
1323
1324int main (void)
1325{
1326 ev_init (0);
1327
1328 ev_io_init (&wio, sin_cb, 0, EV_READ);
1329 ev_io_start (&wio);
1330
1331 struct ev_timer t[10000];
1332
1333#if 0
1334 int i;
1335 for (i = 0; i < 10000; ++i)
1336 {
1337 struct ev_timer *w = t + i;
1338 ev_watcher_init (w, ocb, i);
1339 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1340 ev_timer_start (w);
1341 if (drand48 () < 0.5)
1342 ev_timer_stop (w);
1343 }
1344#endif
1345
1346 struct ev_timer t1;
1347 ev_timer_init (&t1, ocb, 5, 10);
1348 ev_timer_start (&t1);
1349
1350 struct ev_signal sig;
1351 ev_signal_init (&sig, scb, SIGQUIT);
1352 ev_signal_start (&sig);
1353
1354 struct ev_check cw;
1355 ev_check_init (&cw, gcb);
1356 ev_check_start (&cw);
1357
1358 struct ev_idle iw;
1359 ev_idle_init (&iw, gcb);
1360 ev_idle_start (&iw);
1361
1362 ev_loop (0);
1363
1364 return 0;
1365}
1366
1367#endif
1368
1369
1370
1371

Diff Legend

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