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.64 by root, Sun Nov 4 23:14:11 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)
… …
281 } 288 }
282} 289}
283 290
284/*****************************************************************************/ 291/*****************************************************************************/
285 292
286static int *fdchanges;
287static int fdchangemax, fdchangecnt;
288
289static void 293static void
290fd_reify (EV_P) 294fd_reify (EV_P)
291{ 295{
292 int i; 296 int i;
293 297
… …
302 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 306 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
303 events |= w->events; 307 events |= w->events;
304 308
305 anfd->reify = 0; 309 anfd->reify = 0;
306 310
307 if (anfd->events != events)
308 {
309 method_modify (EV_A_ fd, anfd->events, events); 311 method_modify (EV_A_ fd, anfd->events, events);
310 anfd->events = events; 312 anfd->events = events;
311 }
312 } 313 }
313 314
314 fdchangecnt = 0; 315 fdchangecnt = 0;
315} 316}
316 317
… …
353 354
354/* called on ENOMEM in select/poll to kill some fds and retry */ 355/* called on ENOMEM in select/poll to kill some fds and retry */
355static void 356static void
356fd_enomem (EV_P) 357fd_enomem (EV_P)
357{ 358{
358 int fd = anfdmax; 359 int fd;
359 360
360 while (fd--) 361 for (fd = anfdmax; fd--; )
361 if (anfds [fd].events) 362 if (anfds [fd].events)
362 { 363 {
363 close (fd); 364 close (fd);
364 fd_kill (EV_A_ fd); 365 fd_kill (EV_A_ fd);
365 return; 366 return;
366 } 367 }
367} 368}
368 369
370/* susually called after fork if method needs to re-arm all fds from scratch */
371static void
372fd_rearm_all (EV_P)
373{
374 int fd;
375
376 /* this should be highly optimised to not do anything but set a flag */
377 for (fd = 0; fd < anfdmax; ++fd)
378 if (anfds [fd].events)
379 {
380 anfds [fd].events = 0;
381 fd_change (EV_A_ fd);
382 }
383}
384
369/*****************************************************************************/ 385/*****************************************************************************/
370 386
371static struct ev_timer **timers;
372static int timermax, timercnt;
373
374static struct ev_periodic **periodics;
375static int periodicmax, periodiccnt;
376
377static void 387static void
378upheap (WT *timers, int k) 388upheap (WT *heap, int k)
379{ 389{
380 WT w = timers [k]; 390 WT w = heap [k];
381 391
382 while (k && timers [k >> 1]->at > w->at) 392 while (k && heap [k >> 1]->at > w->at)
383 { 393 {
384 timers [k] = timers [k >> 1]; 394 heap [k] = heap [k >> 1];
385 timers [k]->active = k + 1; 395 ((W)heap [k])->active = k + 1;
386 k >>= 1; 396 k >>= 1;
387 } 397 }
388 398
389 timers [k] = w; 399 heap [k] = w;
390 timers [k]->active = k + 1; 400 ((W)heap [k])->active = k + 1;
391 401
392} 402}
393 403
394static void 404static void
395downheap (WT *timers, int N, int k) 405downheap (WT *heap, int N, int k)
396{ 406{
397 WT w = timers [k]; 407 WT w = heap [k];
398 408
399 while (k < (N >> 1)) 409 while (k < (N >> 1))
400 { 410 {
401 int j = k << 1; 411 int j = k << 1;
402 412
403 if (j + 1 < N && timers [j]->at > timers [j + 1]->at) 413 if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
404 ++j; 414 ++j;
405 415
406 if (w->at <= timers [j]->at) 416 if (w->at <= heap [j]->at)
407 break; 417 break;
408 418
409 timers [k] = timers [j]; 419 heap [k] = heap [j];
410 timers [k]->active = k + 1; 420 ((W)heap [k])->active = k + 1;
411 k = j; 421 k = j;
412 } 422 }
413 423
414 timers [k] = w; 424 heap [k] = w;
415 timers [k]->active = k + 1; 425 ((W)heap [k])->active = k + 1;
416} 426}
417 427
418/*****************************************************************************/ 428/*****************************************************************************/
419 429
420typedef struct 430typedef struct
… …
486 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 496 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
487 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 497 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
488#endif 498#endif
489 499
490 ev_io_set (&sigev, sigpipe [0], EV_READ); 500 ev_io_set (&sigev, sigpipe [0], EV_READ);
491 ev_io_start (&sigev); 501 ev_io_start (EV_A_ &sigev);
492 ev_unref (EV_A); /* child watcher should not keep loop alive */ 502 ev_unref (EV_A); /* child watcher should not keep loop alive */
493} 503}
494 504
495/*****************************************************************************/ 505/*****************************************************************************/
496 506
497static struct ev_idle **idles; 507#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 508
508static struct ev_child *childs [PID_HASHSIZE]; 509static struct ev_child *childs [PID_HASHSIZE];
509static struct ev_signal childev; 510static struct ev_signal childev;
510
511#ifndef WIN32
512 511
513#ifndef WCONTINUED 512#ifndef WCONTINUED
514# define WCONTINUED 0 513# define WCONTINUED 0
515#endif 514#endif
516 515
… …
520 struct ev_child *w; 519 struct ev_child *w;
521 520
522 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 521 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
523 if (w->pid == pid || !w->pid) 522 if (w->pid == pid || !w->pid)
524 { 523 {
525 w->priority = sw->priority; /* need to do it *now* */ 524 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
526 w->rpid = pid; 525 w->rpid = pid;
527 w->rstatus = status; 526 w->rstatus = status;
528 event (EV_A_ (W)w, EV_CHILD); 527 event (EV_A_ (W)w, EV_CHILD);
529 } 528 }
530} 529}
531 530
532static void 531static void
… …
552# include "ev_kqueue.c" 551# include "ev_kqueue.c"
553#endif 552#endif
554#if EV_USE_EPOLL 553#if EV_USE_EPOLL
555# include "ev_epoll.c" 554# include "ev_epoll.c"
556#endif 555#endif
557#if EV_USEV_POLL 556#if EV_USE_POLL
558# include "ev_poll.c" 557# include "ev_poll.c"
559#endif 558#endif
560#if EV_USE_SELECT 559#if EV_USE_SELECT
561# include "ev_select.c" 560# include "ev_select.c"
562#endif 561#endif
… …
589ev_method (EV_P) 588ev_method (EV_P)
590{ 589{
591 return method; 590 return method;
592} 591}
593 592
594int 593static void
595ev_init (EV_P_ int methods) 594loop_init (EV_P_ int methods)
596{ 595{
597 if (!method) 596 if (!method)
598 { 597 {
599#if EV_USE_MONOTONIC 598#if EV_USE_MONOTONIC
600 { 599 {
… …
605#endif 604#endif
606 605
607 rt_now = ev_time (); 606 rt_now = ev_time ();
608 mn_now = get_clock (); 607 mn_now = get_clock ();
609 now_floor = mn_now; 608 now_floor = mn_now;
610 diff = rt_now - mn_now; 609 rtmn_diff = rt_now - mn_now;
611
612 if (pipe (sigpipe))
613 return 0;
614 610
615 if (methods == EVMETHOD_AUTO) 611 if (methods == EVMETHOD_AUTO)
616 if (!enable_secure () && getenv ("LIBmethodS")) 612 if (!enable_secure () && getenv ("LIBEV_METHODS"))
617 methods = atoi (getenv ("LIBmethodS")); 613 methods = atoi (getenv ("LIBEV_METHODS"));
618 else 614 else
619 methods = EVMETHOD_ANY; 615 methods = EVMETHOD_ANY;
620 616
621 method = 0; 617 method = 0;
618#if EV_USE_WIN32
619 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
620#endif
622#if EV_USE_KQUEUE 621#if EV_USE_KQUEUE
623 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 622 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
624#endif 623#endif
625#if EV_USE_EPOLL 624#if EV_USE_EPOLL
626 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 625 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
627#endif 626#endif
628#if EV_USEV_POLL 627#if EV_USE_POLL
629 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 628 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
630#endif 629#endif
631#if EV_USE_SELECT 630#if EV_USE_SELECT
632 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 631 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
633#endif 632#endif
633 }
634}
634 635
636void
637loop_destroy (EV_P)
638{
639#if EV_USE_WIN32
640 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
641#endif
642#if EV_USE_KQUEUE
643 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
644#endif
645#if EV_USE_EPOLL
646 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
647#endif
648#if EV_USE_POLL
649 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
650#endif
651#if EV_USE_SELECT
652 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
653#endif
654
655 method = 0;
656 /*TODO*/
657}
658
659void
660loop_fork (EV_P)
661{
662 /*TODO*/
663#if EV_USE_EPOLL
664 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
665#endif
666#if EV_USE_KQUEUE
667 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
668#endif
669}
670
671#if EV_MULTIPLICITY
672struct ev_loop *
673ev_loop_new (int methods)
674{
675 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
676
677 loop_init (EV_A_ methods);
678
679 if (ev_method (EV_A))
680 return loop;
681
682 return 0;
683}
684
685void
686ev_loop_destroy (EV_P)
687{
688 loop_destroy (EV_A);
689 free (loop);
690}
691
692void
693ev_loop_fork (EV_P)
694{
695 loop_fork (EV_A);
696}
697
698#endif
699
700#if EV_MULTIPLICITY
701struct ev_loop default_loop_struct;
702static struct ev_loop *default_loop;
703
704struct ev_loop *
705#else
706static int default_loop;
707
708int
709#endif
710ev_default_loop (int methods)
711{
712 if (sigpipe [0] == sigpipe [1])
713 if (pipe (sigpipe))
714 return 0;
715
716 if (!default_loop)
717 {
718#if EV_MULTIPLICITY
719 struct ev_loop *loop = default_loop = &default_loop_struct;
720#else
721 default_loop = 1;
722#endif
723
724 loop_init (EV_A_ methods);
725
635 if (method) 726 if (ev_method (EV_A))
636 { 727 {
637 ev_watcher_init (&sigev, sigcb); 728 ev_watcher_init (&sigev, sigcb);
638 ev_set_priority (&sigev, EV_MAXPRI); 729 ev_set_priority (&sigev, EV_MAXPRI);
639 siginit (EV_A); 730 siginit (EV_A);
640 731
… …
643 ev_set_priority (&childev, EV_MAXPRI); 734 ev_set_priority (&childev, EV_MAXPRI);
644 ev_signal_start (EV_A_ &childev); 735 ev_signal_start (EV_A_ &childev);
645 ev_unref (EV_A); /* child watcher should not keep loop alive */ 736 ev_unref (EV_A); /* child watcher should not keep loop alive */
646#endif 737#endif
647 } 738 }
739 else
740 default_loop = 0;
648 } 741 }
649 742
650 return method; 743 return default_loop;
651} 744}
652 745
653/*****************************************************************************/
654
655void 746void
656ev_fork_prepare (void) 747ev_default_destroy (void)
657{ 748{
658 /* nop */ 749#if EV_MULTIPLICITY
659} 750 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 751#endif
674 752
753 ev_ref (EV_A); /* child watcher */
754 ev_signal_stop (EV_A_ &childev);
755
756 ev_ref (EV_A); /* signal watcher */
675 ev_io_stop (&sigev); 757 ev_io_stop (EV_A_ &sigev);
758
759 close (sigpipe [0]); sigpipe [0] = 0;
760 close (sigpipe [1]); sigpipe [1] = 0;
761
762 loop_destroy (EV_A);
763}
764
765void
766ev_default_fork (void)
767{
768#if EV_MULTIPLICITY
769 struct ev_loop *loop = default_loop;
770#endif
771
772 loop_fork (EV_A);
773
774 ev_io_stop (EV_A_ &sigev);
676 close (sigpipe [0]); 775 close (sigpipe [0]);
677 close (sigpipe [1]); 776 close (sigpipe [1]);
678 pipe (sigpipe); 777 pipe (sigpipe);
778
779 ev_ref (EV_A); /* signal watcher */
679 siginit (); 780 siginit (EV_A);
680} 781}
681 782
682/*****************************************************************************/ 783/*****************************************************************************/
683 784
684static void 785static void
… …
692 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 793 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
693 794
694 if (p->w) 795 if (p->w)
695 { 796 {
696 p->w->pending = 0; 797 p->w->pending = 0;
798
697 p->w->cb (EV_A_ p->w, p->events); 799 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events);
698 } 800 }
699 } 801 }
700} 802}
701 803
702static void 804static void
703timers_reify (EV_P) 805timers_reify (EV_P)
704{ 806{
705 while (timercnt && timers [0]->at <= mn_now) 807 while (timercnt && ((WT)timers [0])->at <= mn_now)
706 { 808 {
707 struct ev_timer *w = timers [0]; 809 struct ev_timer *w = timers [0];
810
811 assert (("inactive timer on timer heap detected", ev_is_active (w)));
708 812
709 /* first reschedule or stop timer */ 813 /* first reschedule or stop timer */
710 if (w->repeat) 814 if (w->repeat)
711 { 815 {
712 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 816 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
713 w->at = mn_now + w->repeat; 817 ((WT)w)->at = mn_now + w->repeat;
714 downheap ((WT *)timers, timercnt, 0); 818 downheap ((WT *)timers, timercnt, 0);
715 } 819 }
716 else 820 else
717 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 821 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
718 822
719 event ((W)w, EV_TIMEOUT); 823 event (EV_A_ (W)w, EV_TIMEOUT);
720 } 824 }
721} 825}
722 826
723static void 827static void
724periodics_reify (EV_P) 828periodics_reify (EV_P)
725{ 829{
726 while (periodiccnt && periodics [0]->at <= rt_now) 830 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
727 { 831 {
728 struct ev_periodic *w = periodics [0]; 832 struct ev_periodic *w = periodics [0];
833
834 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
729 835
730 /* first reschedule or stop timer */ 836 /* first reschedule or stop timer */
731 if (w->interval) 837 if (w->interval)
732 { 838 {
733 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 839 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
734 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 840 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
735 downheap ((WT *)periodics, periodiccnt, 0); 841 downheap ((WT *)periodics, periodiccnt, 0);
736 } 842 }
737 else 843 else
738 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 844 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
739 845
740 event (EV_A_ (W)w, EV_PERIODIC); 846 event (EV_A_ (W)w, EV_PERIODIC);
741 } 847 }
742} 848}
743 849
744static void 850static void
745periodics_reschedule (EV_P_ ev_tstamp diff) 851periodics_reschedule (EV_P)
746{ 852{
747 int i; 853 int i;
748 854
749 /* adjust periodics after time jump */ 855 /* adjust periodics after time jump */
750 for (i = 0; i < periodiccnt; ++i) 856 for (i = 0; i < periodiccnt; ++i)
751 { 857 {
752 struct ev_periodic *w = periodics [i]; 858 struct ev_periodic *w = periodics [i];
753 859
754 if (w->interval) 860 if (w->interval)
755 { 861 {
756 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 862 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
757 863
758 if (fabs (diff) >= 1e-4) 864 if (fabs (diff) >= 1e-4)
759 { 865 {
760 ev_periodic_stop (EV_A_ w); 866 ev_periodic_stop (EV_A_ w);
761 ev_periodic_start (EV_A_ w); 867 ev_periodic_start (EV_A_ w);
… …
771{ 877{
772 mn_now = get_clock (); 878 mn_now = get_clock ();
773 879
774 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 880 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
775 { 881 {
776 rt_now = mn_now + diff; 882 rt_now = rtmn_diff + mn_now;
777 return 0; 883 return 0;
778 } 884 }
779 else 885 else
780 { 886 {
781 now_floor = mn_now; 887 now_floor = mn_now;
… …
792#if EV_USE_MONOTONIC 898#if EV_USE_MONOTONIC
793 if (expect_true (have_monotonic)) 899 if (expect_true (have_monotonic))
794 { 900 {
795 if (time_update_monotonic (EV_A)) 901 if (time_update_monotonic (EV_A))
796 { 902 {
797 ev_tstamp odiff = diff; 903 ev_tstamp odiff = rtmn_diff;
798 904
799 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 905 for (i = 4; --i; ) /* loop a few times, before making important decisions */
800 { 906 {
801 diff = rt_now - mn_now; 907 rtmn_diff = rt_now - mn_now;
802 908
803 if (fabs (odiff - diff) < MIN_TIMEJUMP) 909 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
804 return; /* all is well */ 910 return; /* all is well */
805 911
806 rt_now = ev_time (); 912 rt_now = ev_time ();
807 mn_now = get_clock (); 913 mn_now = get_clock ();
808 now_floor = mn_now; 914 now_floor = mn_now;
809 } 915 }
810 916
811 periodics_reschedule (EV_A_ diff - odiff); 917 periodics_reschedule (EV_A);
812 /* no timer adjustment, as the monotonic clock doesn't jump */ 918 /* no timer adjustment, as the monotonic clock doesn't jump */
919 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
813 } 920 }
814 } 921 }
815 else 922 else
816#endif 923#endif
817 { 924 {
818 rt_now = ev_time (); 925 rt_now = ev_time ();
819 926
820 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 927 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
821 { 928 {
822 periodics_reschedule (EV_A_ rt_now - mn_now); 929 periodics_reschedule (EV_A);
823 930
824 /* adjust timers. this is easy, as the offset is the same for all */ 931 /* adjust timers. this is easy, as the offset is the same for all */
825 for (i = 0; i < timercnt; ++i) 932 for (i = 0; i < timercnt; ++i)
826 timers [i]->at += diff; 933 ((WT)timers [i])->at += rt_now - mn_now;
827 } 934 }
828 935
829 mn_now = rt_now; 936 mn_now = rt_now;
830 } 937 }
831} 938}
… …
882 { 989 {
883 block = MAX_BLOCKTIME; 990 block = MAX_BLOCKTIME;
884 991
885 if (timercnt) 992 if (timercnt)
886 { 993 {
887 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 994 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
888 if (block > to) block = to; 995 if (block > to) block = to;
889 } 996 }
890 997
891 if (periodiccnt) 998 if (periodiccnt)
892 { 999 {
893 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1000 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
894 if (block > to) block = to; 1001 if (block > to) block = to;
895 } 1002 }
896 1003
897 if (block < 0.) block = 0.; 1004 if (block < 0.) block = 0.;
898 } 1005 }
… …
1015ev_timer_start (EV_P_ struct ev_timer *w) 1122ev_timer_start (EV_P_ struct ev_timer *w)
1016{ 1123{
1017 if (ev_is_active (w)) 1124 if (ev_is_active (w))
1018 return; 1125 return;
1019 1126
1020 w->at += mn_now; 1127 ((WT)w)->at += mn_now;
1021 1128
1022 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1129 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1023 1130
1024 ev_start (EV_A_ (W)w, ++timercnt); 1131 ev_start (EV_A_ (W)w, ++timercnt);
1025 array_needsize (timers, timermax, timercnt, ); 1132 array_needsize (timers, timermax, timercnt, );
1026 timers [timercnt - 1] = w; 1133 timers [timercnt - 1] = w;
1027 upheap ((WT *)timers, timercnt - 1); 1134 upheap ((WT *)timers, timercnt - 1);
1135
1136 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1028} 1137}
1029 1138
1030void 1139void
1031ev_timer_stop (EV_P_ struct ev_timer *w) 1140ev_timer_stop (EV_P_ struct ev_timer *w)
1032{ 1141{
1033 ev_clear_pending (EV_A_ (W)w); 1142 ev_clear_pending (EV_A_ (W)w);
1034 if (!ev_is_active (w)) 1143 if (!ev_is_active (w))
1035 return; 1144 return;
1036 1145
1146 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1147
1037 if (w->active < timercnt--) 1148 if (((W)w)->active < timercnt--)
1038 { 1149 {
1039 timers [w->active - 1] = timers [timercnt]; 1150 timers [((W)w)->active - 1] = timers [timercnt];
1040 downheap ((WT *)timers, timercnt, w->active - 1); 1151 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1041 } 1152 }
1042 1153
1043 w->at = w->repeat; 1154 ((WT)w)->at = w->repeat;
1044 1155
1045 ev_stop (EV_A_ (W)w); 1156 ev_stop (EV_A_ (W)w);
1046} 1157}
1047 1158
1048void 1159void
… …
1050{ 1161{
1051 if (ev_is_active (w)) 1162 if (ev_is_active (w))
1052 { 1163 {
1053 if (w->repeat) 1164 if (w->repeat)
1054 { 1165 {
1055 w->at = mn_now + w->repeat; 1166 ((WT)w)->at = mn_now + w->repeat;
1056 downheap ((WT *)timers, timercnt, w->active - 1); 1167 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1057 } 1168 }
1058 else 1169 else
1059 ev_timer_stop (EV_A_ w); 1170 ev_timer_stop (EV_A_ w);
1060 } 1171 }
1061 else if (w->repeat) 1172 else if (w->repeat)
… …
1070 1181
1071 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1182 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1072 1183
1073 /* this formula differs from the one in periodic_reify because we do not always round up */ 1184 /* this formula differs from the one in periodic_reify because we do not always round up */
1074 if (w->interval) 1185 if (w->interval)
1075 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1186 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1076 1187
1077 ev_start (EV_A_ (W)w, ++periodiccnt); 1188 ev_start (EV_A_ (W)w, ++periodiccnt);
1078 array_needsize (periodics, periodicmax, periodiccnt, ); 1189 array_needsize (periodics, periodicmax, periodiccnt, );
1079 periodics [periodiccnt - 1] = w; 1190 periodics [periodiccnt - 1] = w;
1080 upheap ((WT *)periodics, periodiccnt - 1); 1191 upheap ((WT *)periodics, periodiccnt - 1);
1192
1193 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1081} 1194}
1082 1195
1083void 1196void
1084ev_periodic_stop (EV_P_ struct ev_periodic *w) 1197ev_periodic_stop (EV_P_ struct ev_periodic *w)
1085{ 1198{
1086 ev_clear_pending (EV_A_ (W)w); 1199 ev_clear_pending (EV_A_ (W)w);
1087 if (!ev_is_active (w)) 1200 if (!ev_is_active (w))
1088 return; 1201 return;
1089 1202
1203 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1204
1090 if (w->active < periodiccnt--) 1205 if (((W)w)->active < periodiccnt--)
1091 { 1206 {
1092 periodics [w->active - 1] = periodics [periodiccnt]; 1207 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1093 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1208 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1094 } 1209 }
1095 1210
1211 ev_stop (EV_A_ (W)w);
1212}
1213
1214void
1215ev_idle_start (EV_P_ struct ev_idle *w)
1216{
1217 if (ev_is_active (w))
1218 return;
1219
1220 ev_start (EV_A_ (W)w, ++idlecnt);
1221 array_needsize (idles, idlemax, idlecnt, );
1222 idles [idlecnt - 1] = w;
1223}
1224
1225void
1226ev_idle_stop (EV_P_ struct ev_idle *w)
1227{
1228 ev_clear_pending (EV_A_ (W)w);
1229 if (ev_is_active (w))
1230 return;
1231
1232 idles [((W)w)->active - 1] = idles [--idlecnt];
1233 ev_stop (EV_A_ (W)w);
1234}
1235
1236void
1237ev_prepare_start (EV_P_ struct ev_prepare *w)
1238{
1239 if (ev_is_active (w))
1240 return;
1241
1242 ev_start (EV_A_ (W)w, ++preparecnt);
1243 array_needsize (prepares, preparemax, preparecnt, );
1244 prepares [preparecnt - 1] = w;
1245}
1246
1247void
1248ev_prepare_stop (EV_P_ struct ev_prepare *w)
1249{
1250 ev_clear_pending (EV_A_ (W)w);
1251 if (ev_is_active (w))
1252 return;
1253
1254 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1255 ev_stop (EV_A_ (W)w);
1256}
1257
1258void
1259ev_check_start (EV_P_ struct ev_check *w)
1260{
1261 if (ev_is_active (w))
1262 return;
1263
1264 ev_start (EV_A_ (W)w, ++checkcnt);
1265 array_needsize (checks, checkmax, checkcnt, );
1266 checks [checkcnt - 1] = w;
1267}
1268
1269void
1270ev_check_stop (EV_P_ struct ev_check *w)
1271{
1272 ev_clear_pending (EV_A_ (W)w);
1273 if (ev_is_active (w))
1274 return;
1275
1276 checks [((W)w)->active - 1] = checks [--checkcnt];
1096 ev_stop (EV_A_ (W)w); 1277 ev_stop (EV_A_ (W)w);
1097} 1278}
1098 1279
1099#ifndef SA_RESTART 1280#ifndef SA_RESTART
1100# define SA_RESTART 0 1281# define SA_RESTART 0
1101#endif 1282#endif
1102 1283
1103void 1284void
1104ev_signal_start (EV_P_ struct ev_signal *w) 1285ev_signal_start (EV_P_ struct ev_signal *w)
1105{ 1286{
1287#if EV_MULTIPLICITY
1288 assert (("signal watchers are only supported in the default loop", loop == default_loop));
1289#endif
1106 if (ev_is_active (w)) 1290 if (ev_is_active (w))
1107 return; 1291 return;
1108 1292
1109 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1293 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1110 1294
1111 ev_start (EV_A_ (W)w, 1); 1295 ev_start (EV_A_ (W)w, 1);
1112 array_needsize (signals, signalmax, w->signum, signals_init); 1296 array_needsize (signals, signalmax, w->signum, signals_init);
1113 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1297 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1114 1298
1115 if (!w->next) 1299 if (!((WL)w)->next)
1116 { 1300 {
1117 struct sigaction sa; 1301 struct sigaction sa;
1118 sa.sa_handler = sighandler; 1302 sa.sa_handler = sighandler;
1119 sigfillset (&sa.sa_mask); 1303 sigfillset (&sa.sa_mask);
1120 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1304 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
… …
1135 if (!signals [w->signum - 1].head) 1319 if (!signals [w->signum - 1].head)
1136 signal (w->signum, SIG_DFL); 1320 signal (w->signum, SIG_DFL);
1137} 1321}
1138 1322
1139void 1323void
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) 1324ev_child_start (EV_P_ struct ev_child *w)
1207{ 1325{
1326#if EV_MULTIPLICITY
1327 assert (("child watchers are only supported in the default loop", loop == default_loop));
1328#endif
1208 if (ev_is_active (w)) 1329 if (ev_is_active (w))
1209 return; 1330 return;
1210 1331
1211 ev_start (EV_A_ (W)w, 1); 1332 ev_start (EV_A_ (W)w, 1);
1212 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1333 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
… …
1284 ev_timer_start (EV_A_ &once->to); 1405 ev_timer_start (EV_A_ &once->to);
1285 } 1406 }
1286 } 1407 }
1287} 1408}
1288 1409
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