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.65 by root, Sun Nov 4 23:29:48 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)
… …
194 base = realloc (base, sizeof (*base) * (newcnt)); \ 232 base = realloc (base, sizeof (*base) * (newcnt)); \
195 init (base + cur, newcnt - cur); \ 233 init (base + cur, newcnt - cur); \
196 cur = newcnt; \ 234 cur = newcnt; \
197 } 235 }
198 236
237#define array_free(stem, idx) \
238 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
239
199/*****************************************************************************/ 240/*****************************************************************************/
200 241
201static void 242static void
202anfds_init (ANFD *base, int count) 243anfds_init (ANFD *base, int count)
203{ 244{
… …
268 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 309 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
269 events |= w->events; 310 events |= w->events;
270 311
271 anfd->reify = 0; 312 anfd->reify = 0;
272 313
273 if (anfd->events != events)
274 {
275 method_modify (EV_A_ fd, anfd->events, events); 314 method_modify (EV_A_ fd, anfd->events, events);
276 anfd->events = events; 315 anfd->events = events;
277 }
278 } 316 }
279 317
280 fdchangecnt = 0; 318 fdchangecnt = 0;
281} 319}
282 320
… …
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
… …
465 struct ev_child *w; 522 struct ev_child *w;
466 523
467 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 524 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
468 if (w->pid == pid || !w->pid) 525 if (w->pid == pid || !w->pid)
469 { 526 {
470 w->priority = sw->priority; /* need to do it *now* */ 527 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
471 w->rpid = pid; 528 w->rpid = pid;
472 w->rstatus = status; 529 w->rstatus = status;
473 event (EV_A_ (W)w, EV_CHILD); 530 event (EV_A_ (W)w, EV_CHILD);
474 } 531 }
475} 532}
476 533
477static void 534static void
… …
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 int i;
643
644#if EV_USE_WIN32
645 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
646#endif
647#if EV_USE_KQUEUE
648 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
649#endif
650#if EV_USE_EPOLL
651 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
652#endif
653#if EV_USE_POLL
654 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
655#endif
656#if EV_USE_SELECT
657 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
658#endif
659
660 for (i = NUMPRI; i--; )
661 array_free (pending, [i]);
662
663 array_free (fdchange, );
664 array_free (timer, );
665 array_free (periodic, );
666 array_free (idle, );
667 array_free (prepare, );
668 array_free (check, );
669
670 method = 0;
671 /*TODO*/
672}
673
674void
675loop_fork (EV_P)
676{
677 /*TODO*/
678#if EV_USE_EPOLL
679 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
680#endif
681#if EV_USE_KQUEUE
682 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
683#endif
684}
685
686#if EV_MULTIPLICITY
687struct ev_loop *
688ev_loop_new (int methods)
689{
690 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
691
692 loop_init (EV_A_ methods);
693
694 if (ev_method (EV_A))
695 return loop;
696
697 return 0;
698}
699
700void
701ev_loop_destroy (EV_P)
702{
703 loop_destroy (EV_A);
704 free (loop);
705}
706
707void
708ev_loop_fork (EV_P)
709{
710 loop_fork (EV_A);
711}
712
713#endif
714
715#if EV_MULTIPLICITY
716struct ev_loop default_loop_struct;
717static struct ev_loop *default_loop;
718
719struct ev_loop *
720#else
721static int default_loop;
722
723int
724#endif
725ev_default_loop (int methods)
726{
727 if (sigpipe [0] == sigpipe [1])
728 if (pipe (sigpipe))
729 return 0;
730
731 if (!default_loop)
732 {
733#if EV_MULTIPLICITY
734 struct ev_loop *loop = default_loop = &default_loop_struct;
735#else
736 default_loop = 1;
737#endif
738
739 loop_init (EV_A_ methods);
740
584 if (method) 741 if (ev_method (EV_A))
585 { 742 {
586 ev_watcher_init (&sigev, sigcb); 743 ev_watcher_init (&sigev, sigcb);
587 ev_set_priority (&sigev, EV_MAXPRI); 744 ev_set_priority (&sigev, EV_MAXPRI);
588 siginit (EV_A); 745 siginit (EV_A);
589 746
… …
592 ev_set_priority (&childev, EV_MAXPRI); 749 ev_set_priority (&childev, EV_MAXPRI);
593 ev_signal_start (EV_A_ &childev); 750 ev_signal_start (EV_A_ &childev);
594 ev_unref (EV_A); /* child watcher should not keep loop alive */ 751 ev_unref (EV_A); /* child watcher should not keep loop alive */
595#endif 752#endif
596 } 753 }
754 else
755 default_loop = 0;
597 } 756 }
598 757
599 return method; 758 return default_loop;
600} 759}
601 760
602/*****************************************************************************/
603
604void 761void
605ev_fork_prepare (void) 762ev_default_destroy (void)
606{ 763{
607 /* nop */ 764#if EV_MULTIPLICITY
608} 765 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 766#endif
623 767
768 ev_ref (EV_A); /* child watcher */
769 ev_signal_stop (EV_A_ &childev);
770
771 ev_ref (EV_A); /* signal watcher */
624 ev_io_stop (&sigev); 772 ev_io_stop (EV_A_ &sigev);
773
774 close (sigpipe [0]); sigpipe [0] = 0;
775 close (sigpipe [1]); sigpipe [1] = 0;
776
777 loop_destroy (EV_A);
778}
779
780void
781ev_default_fork (void)
782{
783#if EV_MULTIPLICITY
784 struct ev_loop *loop = default_loop;
785#endif
786
787 loop_fork (EV_A);
788
789 ev_io_stop (EV_A_ &sigev);
625 close (sigpipe [0]); 790 close (sigpipe [0]);
626 close (sigpipe [1]); 791 close (sigpipe [1]);
627 pipe (sigpipe); 792 pipe (sigpipe);
793
794 ev_ref (EV_A); /* signal watcher */
628 siginit (); 795 siginit (EV_A);
629} 796}
630 797
631/*****************************************************************************/ 798/*****************************************************************************/
632 799
633static void 800static void
… …
641 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 808 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
642 809
643 if (p->w) 810 if (p->w)
644 { 811 {
645 p->w->pending = 0; 812 p->w->pending = 0;
813
646 p->w->cb (EV_A_ p->w, p->events); 814 ((void (*)(EV_P_ W, int))p->w->cb) (EV_A_ p->w, p->events);
647 } 815 }
648 } 816 }
649} 817}
650 818
651static void 819static void
652timers_reify (EV_P) 820timers_reify (EV_P)
653{ 821{
654 while (timercnt && timers [0]->at <= mn_now) 822 while (timercnt && ((WT)timers [0])->at <= mn_now)
655 { 823 {
656 struct ev_timer *w = timers [0]; 824 struct ev_timer *w = timers [0];
825
826 assert (("inactive timer on timer heap detected", ev_is_active (w)));
657 827
658 /* first reschedule or stop timer */ 828 /* first reschedule or stop timer */
659 if (w->repeat) 829 if (w->repeat)
660 { 830 {
661 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 831 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
662 w->at = mn_now + w->repeat; 832 ((WT)w)->at = mn_now + w->repeat;
663 downheap ((WT *)timers, timercnt, 0); 833 downheap ((WT *)timers, timercnt, 0);
664 } 834 }
665 else 835 else
666 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 836 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
667 837
668 event ((W)w, EV_TIMEOUT); 838 event (EV_A_ (W)w, EV_TIMEOUT);
669 } 839 }
670} 840}
671 841
672static void 842static void
673periodics_reify (EV_P) 843periodics_reify (EV_P)
674{ 844{
675 while (periodiccnt && periodics [0]->at <= rt_now) 845 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
676 { 846 {
677 struct ev_periodic *w = periodics [0]; 847 struct ev_periodic *w = periodics [0];
848
849 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
678 850
679 /* first reschedule or stop timer */ 851 /* first reschedule or stop timer */
680 if (w->interval) 852 if (w->interval)
681 { 853 {
682 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 854 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
683 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 855 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
684 downheap ((WT *)periodics, periodiccnt, 0); 856 downheap ((WT *)periodics, periodiccnt, 0);
685 } 857 }
686 else 858 else
687 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 859 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
688 860
689 event (EV_A_ (W)w, EV_PERIODIC); 861 event (EV_A_ (W)w, EV_PERIODIC);
690 } 862 }
691} 863}
692 864
693static void 865static void
694periodics_reschedule (EV_P_ ev_tstamp diff) 866periodics_reschedule (EV_P)
695{ 867{
696 int i; 868 int i;
697 869
698 /* adjust periodics after time jump */ 870 /* adjust periodics after time jump */
699 for (i = 0; i < periodiccnt; ++i) 871 for (i = 0; i < periodiccnt; ++i)
700 { 872 {
701 struct ev_periodic *w = periodics [i]; 873 struct ev_periodic *w = periodics [i];
702 874
703 if (w->interval) 875 if (w->interval)
704 { 876 {
705 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 877 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
706 878
707 if (fabs (diff) >= 1e-4) 879 if (fabs (diff) >= 1e-4)
708 { 880 {
709 ev_periodic_stop (EV_A_ w); 881 ev_periodic_stop (EV_A_ w);
710 ev_periodic_start (EV_A_ w); 882 ev_periodic_start (EV_A_ w);
… …
720{ 892{
721 mn_now = get_clock (); 893 mn_now = get_clock ();
722 894
723 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 895 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
724 { 896 {
725 rt_now = mn_now + diff; 897 rt_now = rtmn_diff + mn_now;
726 return 0; 898 return 0;
727 } 899 }
728 else 900 else
729 { 901 {
730 now_floor = mn_now; 902 now_floor = mn_now;
… …
741#if EV_USE_MONOTONIC 913#if EV_USE_MONOTONIC
742 if (expect_true (have_monotonic)) 914 if (expect_true (have_monotonic))
743 { 915 {
744 if (time_update_monotonic (EV_A)) 916 if (time_update_monotonic (EV_A))
745 { 917 {
746 ev_tstamp odiff = diff; 918 ev_tstamp odiff = rtmn_diff;
747 919
748 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 920 for (i = 4; --i; ) /* loop a few times, before making important decisions */
749 { 921 {
750 diff = rt_now - mn_now; 922 rtmn_diff = rt_now - mn_now;
751 923
752 if (fabs (odiff - diff) < MIN_TIMEJUMP) 924 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
753 return; /* all is well */ 925 return; /* all is well */
754 926
755 rt_now = ev_time (); 927 rt_now = ev_time ();
756 mn_now = get_clock (); 928 mn_now = get_clock ();
757 now_floor = mn_now; 929 now_floor = mn_now;
758 } 930 }
759 931
760 periodics_reschedule (EV_A_ diff - odiff); 932 periodics_reschedule (EV_A);
761 /* no timer adjustment, as the monotonic clock doesn't jump */ 933 /* no timer adjustment, as the monotonic clock doesn't jump */
934 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
762 } 935 }
763 } 936 }
764 else 937 else
765#endif 938#endif
766 { 939 {
767 rt_now = ev_time (); 940 rt_now = ev_time ();
768 941
769 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 942 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
770 { 943 {
771 periodics_reschedule (EV_A_ rt_now - mn_now); 944 periodics_reschedule (EV_A);
772 945
773 /* adjust timers. this is easy, as the offset is the same for all */ 946 /* adjust timers. this is easy, as the offset is the same for all */
774 for (i = 0; i < timercnt; ++i) 947 for (i = 0; i < timercnt; ++i)
775 timers [i]->at += diff; 948 ((WT)timers [i])->at += rt_now - mn_now;
776 } 949 }
777 950
778 mn_now = rt_now; 951 mn_now = rt_now;
779 } 952 }
780} 953}
… …
831 { 1004 {
832 block = MAX_BLOCKTIME; 1005 block = MAX_BLOCKTIME;
833 1006
834 if (timercnt) 1007 if (timercnt)
835 { 1008 {
836 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1009 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
837 if (block > to) block = to; 1010 if (block > to) block = to;
838 } 1011 }
839 1012
840 if (periodiccnt) 1013 if (periodiccnt)
841 { 1014 {
842 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1015 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
843 if (block > to) block = to; 1016 if (block > to) block = to;
844 } 1017 }
845 1018
846 if (block < 0.) block = 0.; 1019 if (block < 0.) block = 0.;
847 } 1020 }
… …
964ev_timer_start (EV_P_ struct ev_timer *w) 1137ev_timer_start (EV_P_ struct ev_timer *w)
965{ 1138{
966 if (ev_is_active (w)) 1139 if (ev_is_active (w))
967 return; 1140 return;
968 1141
969 w->at += mn_now; 1142 ((WT)w)->at += mn_now;
970 1143
971 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1144 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
972 1145
973 ev_start (EV_A_ (W)w, ++timercnt); 1146 ev_start (EV_A_ (W)w, ++timercnt);
974 array_needsize (timers, timermax, timercnt, ); 1147 array_needsize (timers, timermax, timercnt, );
975 timers [timercnt - 1] = w; 1148 timers [timercnt - 1] = w;
976 upheap ((WT *)timers, timercnt - 1); 1149 upheap ((WT *)timers, timercnt - 1);
1150
1151 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
977} 1152}
978 1153
979void 1154void
980ev_timer_stop (EV_P_ struct ev_timer *w) 1155ev_timer_stop (EV_P_ struct ev_timer *w)
981{ 1156{
982 ev_clear_pending (EV_A_ (W)w); 1157 ev_clear_pending (EV_A_ (W)w);
983 if (!ev_is_active (w)) 1158 if (!ev_is_active (w))
984 return; 1159 return;
985 1160
1161 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1162
986 if (w->active < timercnt--) 1163 if (((W)w)->active < timercnt--)
987 { 1164 {
988 timers [w->active - 1] = timers [timercnt]; 1165 timers [((W)w)->active - 1] = timers [timercnt];
989 downheap ((WT *)timers, timercnt, w->active - 1); 1166 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
990 } 1167 }
991 1168
992 w->at = w->repeat; 1169 ((WT)w)->at = w->repeat;
993 1170
994 ev_stop (EV_A_ (W)w); 1171 ev_stop (EV_A_ (W)w);
995} 1172}
996 1173
997void 1174void
… …
999{ 1176{
1000 if (ev_is_active (w)) 1177 if (ev_is_active (w))
1001 { 1178 {
1002 if (w->repeat) 1179 if (w->repeat)
1003 { 1180 {
1004 w->at = mn_now + w->repeat; 1181 ((WT)w)->at = mn_now + w->repeat;
1005 downheap ((WT *)timers, timercnt, w->active - 1); 1182 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1006 } 1183 }
1007 else 1184 else
1008 ev_timer_stop (EV_A_ w); 1185 ev_timer_stop (EV_A_ w);
1009 } 1186 }
1010 else if (w->repeat) 1187 else if (w->repeat)
… …
1019 1196
1020 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1197 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1021 1198
1022 /* this formula differs from the one in periodic_reify because we do not always round up */ 1199 /* this formula differs from the one in periodic_reify because we do not always round up */
1023 if (w->interval) 1200 if (w->interval)
1024 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1201 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1025 1202
1026 ev_start (EV_A_ (W)w, ++periodiccnt); 1203 ev_start (EV_A_ (W)w, ++periodiccnt);
1027 array_needsize (periodics, periodicmax, periodiccnt, ); 1204 array_needsize (periodics, periodicmax, periodiccnt, );
1028 periodics [periodiccnt - 1] = w; 1205 periodics [periodiccnt - 1] = w;
1029 upheap ((WT *)periodics, periodiccnt - 1); 1206 upheap ((WT *)periodics, periodiccnt - 1);
1207
1208 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1030} 1209}
1031 1210
1032void 1211void
1033ev_periodic_stop (EV_P_ struct ev_periodic *w) 1212ev_periodic_stop (EV_P_ struct ev_periodic *w)
1034{ 1213{
1035 ev_clear_pending (EV_A_ (W)w); 1214 ev_clear_pending (EV_A_ (W)w);
1036 if (!ev_is_active (w)) 1215 if (!ev_is_active (w))
1037 return; 1216 return;
1038 1217
1218 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1219
1039 if (w->active < periodiccnt--) 1220 if (((W)w)->active < periodiccnt--)
1040 { 1221 {
1041 periodics [w->active - 1] = periodics [periodiccnt]; 1222 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1042 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1223 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1043 } 1224 }
1044 1225
1226 ev_stop (EV_A_ (W)w);
1227}
1228
1229void
1230ev_idle_start (EV_P_ struct ev_idle *w)
1231{
1232 if (ev_is_active (w))
1233 return;
1234
1235 ev_start (EV_A_ (W)w, ++idlecnt);
1236 array_needsize (idles, idlemax, idlecnt, );
1237 idles [idlecnt - 1] = w;
1238}
1239
1240void
1241ev_idle_stop (EV_P_ struct ev_idle *w)
1242{
1243 ev_clear_pending (EV_A_ (W)w);
1244 if (ev_is_active (w))
1245 return;
1246
1247 idles [((W)w)->active - 1] = idles [--idlecnt];
1248 ev_stop (EV_A_ (W)w);
1249}
1250
1251void
1252ev_prepare_start (EV_P_ struct ev_prepare *w)
1253{
1254 if (ev_is_active (w))
1255 return;
1256
1257 ev_start (EV_A_ (W)w, ++preparecnt);
1258 array_needsize (prepares, preparemax, preparecnt, );
1259 prepares [preparecnt - 1] = w;
1260}
1261
1262void
1263ev_prepare_stop (EV_P_ struct ev_prepare *w)
1264{
1265 ev_clear_pending (EV_A_ (W)w);
1266 if (ev_is_active (w))
1267 return;
1268
1269 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1270 ev_stop (EV_A_ (W)w);
1271}
1272
1273void
1274ev_check_start (EV_P_ struct ev_check *w)
1275{
1276 if (ev_is_active (w))
1277 return;
1278
1279 ev_start (EV_A_ (W)w, ++checkcnt);
1280 array_needsize (checks, checkmax, checkcnt, );
1281 checks [checkcnt - 1] = w;
1282}
1283
1284void
1285ev_check_stop (EV_P_ struct ev_check *w)
1286{
1287 ev_clear_pending (EV_A_ (W)w);
1288 if (ev_is_active (w))
1289 return;
1290
1291 checks [((W)w)->active - 1] = checks [--checkcnt];
1045 ev_stop (EV_A_ (W)w); 1292 ev_stop (EV_A_ (W)w);
1046} 1293}
1047 1294
1048#ifndef SA_RESTART 1295#ifndef SA_RESTART
1049# define SA_RESTART 0 1296# define SA_RESTART 0
1050#endif 1297#endif
1051 1298
1052void 1299void
1053ev_signal_start (EV_P_ struct ev_signal *w) 1300ev_signal_start (EV_P_ struct ev_signal *w)
1054{ 1301{
1302#if EV_MULTIPLICITY
1303 assert (("signal watchers are only supported in the default loop", loop == default_loop));
1304#endif
1055 if (ev_is_active (w)) 1305 if (ev_is_active (w))
1056 return; 1306 return;
1057 1307
1058 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1308 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1059 1309
1060 ev_start (EV_A_ (W)w, 1); 1310 ev_start (EV_A_ (W)w, 1);
1061 array_needsize (signals, signalmax, w->signum, signals_init); 1311 array_needsize (signals, signalmax, w->signum, signals_init);
1062 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1312 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1063 1313
1064 if (!w->next) 1314 if (!((WL)w)->next)
1065 { 1315 {
1066 struct sigaction sa; 1316 struct sigaction sa;
1067 sa.sa_handler = sighandler; 1317 sa.sa_handler = sighandler;
1068 sigfillset (&sa.sa_mask); 1318 sigfillset (&sa.sa_mask);
1069 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1319 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
… …
1084 if (!signals [w->signum - 1].head) 1334 if (!signals [w->signum - 1].head)
1085 signal (w->signum, SIG_DFL); 1335 signal (w->signum, SIG_DFL);
1086} 1336}
1087 1337
1088void 1338void
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) 1339ev_child_start (EV_P_ struct ev_child *w)
1156{ 1340{
1341#if EV_MULTIPLICITY
1342 assert (("child watchers are only supported in the default loop", loop == default_loop));
1343#endif
1157 if (ev_is_active (w)) 1344 if (ev_is_active (w))
1158 return; 1345 return;
1159 1346
1160 ev_start (EV_A_ (W)w, 1); 1347 ev_start (EV_A_ (W)w, 1);
1161 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1348 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
… …
1233 ev_timer_start (EV_A_ &once->to); 1420 ev_timer_start (EV_A_ &once->to);
1234 } 1421 }
1235 } 1422 }
1236} 1423}
1237 1424
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