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

Comparing libev/ev.c (file contents):
Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC vs.
Revision 1.211 by root, Tue Feb 19 17:09:28 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
… …
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
146 162
147#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
149#endif 165#endif
150 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
151#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
153#endif 173#endif
154 174
155#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
… …
202#ifndef CLOCK_REALTIME 222#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 223# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 224# define EV_USE_REALTIME 0
205#endif 225#endif
206 226
227#if !EV_STAT_ENABLE
228# undef EV_USE_INOTIFY
229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
236#endif
237
238#if EV_USE_INOTIFY
239# include <sys/inotify.h>
240#endif
241
207#if EV_SELECT_IS_WINSOCKET 242#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 243# include <winsock.h>
209#endif
210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif 244#endif
218 245
219/**/ 246/**/
220 247
221/* 248/*
222 * This is used to avoid floating point rounding problems. 249 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics 250 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding 251 * to ensure progress, time-wise, even when rounding
225 * errors are against us. 252 * errors are against us.
226 * This value is good at least till the year 4000 253 * This value is good at least till the year 4000.
227 * and intervals up to 20 years.
228 * Better solutions welcome. 254 * Better solutions welcome.
229 */ 255 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 256#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
231 257
232#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 258#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
233#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 259#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
235 261
236#if __GNUC__ >= 3 262#if __GNUC__ >= 4
237# define expect(expr,value) __builtin_expect ((expr),(value)) 263# define expect(expr,value) __builtin_expect ((expr),(value))
238# define noinline __attribute__ ((noinline)) 264# define noinline __attribute__ ((noinline))
239#else 265#else
240# define expect(expr,value) (expr) 266# define expect(expr,value) (expr)
241# define noinline 267# define noinline
… …
262 288
263typedef ev_watcher *W; 289typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
266 292
293#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
268 298
269#ifdef _WIN32 299#ifdef _WIN32
270# include "ev_win32.c" 300# include "ev_win32.c"
271#endif 301#endif
272 302
… …
408{ 438{
409 return ev_rt_now; 439 return ev_rt_now;
410} 440}
411#endif 441#endif
412 442
443void
444ev_sleep (ev_tstamp delay)
445{
446 if (delay > 0.)
447 {
448#if EV_USE_NANOSLEEP
449 struct timespec ts;
450
451 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453
454 nanosleep (&ts, 0);
455#elif defined(_WIN32)
456 Sleep (delay * 1e3);
457#else
458 struct timeval tv;
459
460 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
462
463 select (0, 0, 0, 0, &tv);
464#endif
465 }
466}
467
468/*****************************************************************************/
469
413int inline_size 470int inline_size
414array_nextsize (int elem, int cur, int cnt) 471array_nextsize (int elem, int cur, int cnt)
415{ 472{
416 int ncur = cur + 1; 473 int ncur = cur + 1;
417 474
… …
477 pendings [pri][w_->pending - 1].w = w_; 534 pendings [pri][w_->pending - 1].w = w_;
478 pendings [pri][w_->pending - 1].events = revents; 535 pendings [pri][w_->pending - 1].events = revents;
479 } 536 }
480} 537}
481 538
482void inline_size 539void inline_speed
483queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
484{ 541{
485 int i; 542 int i;
486 543
487 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
… …
534 { 591 {
535 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
536 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
537 ev_io *w; 594 ev_io *w;
538 595
539 int events = 0; 596 unsigned char events = 0;
540 597
541 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 598 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
542 events |= w->events; 599 events |= (unsigned char)w->events;
543 600
544#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
545 if (events) 602 if (events)
546 { 603 {
547 unsigned long argp; 604 unsigned long argp;
605 #ifdef EV_FD_TO_WIN32_HANDLE
606 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
607 #else
548 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 610 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
550 } 611 }
551#endif 612#endif
552 613
614 {
615 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify;
617
553 anfd->reify = 0; 618 anfd->reify = 0;
554
555 backend_modify (EV_A_ fd, anfd->events, events);
556 anfd->events = events; 619 anfd->events = events;
620
621 if (o_events != events || o_reify & EV_IOFDSET)
622 backend_modify (EV_A_ fd, o_events, events);
623 }
557 } 624 }
558 625
559 fdchangecnt = 0; 626 fdchangecnt = 0;
560} 627}
561 628
562void inline_size 629void inline_size
563fd_change (EV_P_ int fd) 630fd_change (EV_P_ int fd, int flags)
564{ 631{
565 if (expect_false (anfds [fd].reify)) 632 unsigned char reify = anfds [fd].reify;
566 return;
567
568 anfds [fd].reify = 1; 633 anfds [fd].reify |= flags;
569 634
635 if (expect_true (!reify))
636 {
570 ++fdchangecnt; 637 ++fdchangecnt;
571 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
572 fdchanges [fdchangecnt - 1] = fd; 639 fdchanges [fdchangecnt - 1] = fd;
640 }
573} 641}
574 642
575void inline_speed 643void inline_speed
576fd_kill (EV_P_ int fd) 644fd_kill (EV_P_ int fd)
577{ 645{
… …
628 696
629 for (fd = 0; fd < anfdmax; ++fd) 697 for (fd = 0; fd < anfdmax; ++fd)
630 if (anfds [fd].events) 698 if (anfds [fd].events)
631 { 699 {
632 anfds [fd].events = 0; 700 anfds [fd].events = 0;
633 fd_change (EV_A_ fd); 701 fd_change (EV_A_ fd, EV_IOFDSET | 1);
634 } 702 }
635} 703}
636 704
637/*****************************************************************************/ 705/*****************************************************************************/
638 706
639void inline_speed 707void inline_speed
640upheap (WT *heap, int k) 708upheap (WT *heap, int k)
641{ 709{
642 WT w = heap [k]; 710 WT w = heap [k];
643 711
644 while (k && heap [k >> 1]->at > w->at) 712 while (k)
645 { 713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
646 heap [k] = heap [k >> 1]; 719 heap [k] = heap [p];
647 ((W)heap [k])->active = k + 1; 720 ((W)heap [k])->active = k + 1;
648 k >>= 1; 721 k = p;
649 } 722 }
650 723
651 heap [k] = w; 724 heap [k] = w;
652 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
653
654} 726}
655 727
656void inline_speed 728void inline_speed
657downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
658{ 730{
659 WT w = heap [k]; 731 WT w = heap [k];
660 732
661 while (k < (N >> 1)) 733 for (;;)
662 { 734 {
663 int j = k << 1; 735 int c = (k << 1) + 1;
664 736
665 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 737 if (c >= N)
666 ++j;
667
668 if (w->at <= heap [j]->at)
669 break; 738 break;
670 739
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0;
742
743 if (w->at <= heap [c]->at)
744 break;
745
671 heap [k] = heap [j]; 746 heap [k] = heap [c];
672 ((W)heap [k])->active = k + 1; 747 ((W)heap [k])->active = k + 1;
748
673 k = j; 749 k = c;
674 } 750 }
675 751
676 heap [k] = w; 752 heap [k] = w;
677 ((W)heap [k])->active = k + 1; 753 ((W)heap [k])->active = k + 1;
678} 754}
… …
687/*****************************************************************************/ 763/*****************************************************************************/
688 764
689typedef struct 765typedef struct
690{ 766{
691 WL head; 767 WL head;
692 sig_atomic_t volatile gotsig; 768 EV_ATOMIC_T gotsig;
693} ANSIG; 769} ANSIG;
694 770
695static ANSIG *signals; 771static ANSIG *signals;
696static int signalmax; 772static int signalmax;
697 773
698static int sigpipe [2]; 774static EV_ATOMIC_T gotsig;
699static sig_atomic_t volatile gotsig;
700static ev_io sigev;
701 775
702void inline_size 776void inline_size
703signals_init (ANSIG *base, int count) 777signals_init (ANSIG *base, int count)
704{ 778{
705 while (count--) 779 while (count--)
… …
709 783
710 ++base; 784 ++base;
711 } 785 }
712} 786}
713 787
714static void 788/*****************************************************************************/
715sighandler (int signum)
716{
717#if _WIN32
718 signal (signum, sighandler);
719#endif
720
721 signals [signum - 1].gotsig = 1;
722
723 if (!gotsig)
724 {
725 int old_errno = errno;
726 gotsig = 1;
727 write (sigpipe [1], &signum, 1);
728 errno = old_errno;
729 }
730}
731
732void noinline
733ev_feed_signal_event (EV_P_ int signum)
734{
735 WL w;
736
737#if EV_MULTIPLICITY
738 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
739#endif
740
741 --signum;
742
743 if (signum < 0 || signum >= signalmax)
744 return;
745
746 signals [signum].gotsig = 0;
747
748 for (w = signals [signum].head; w; w = w->next)
749 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
750}
751
752static void
753sigcb (EV_P_ ev_io *iow, int revents)
754{
755 int signum;
756
757 read (sigpipe [0], &revents, 1);
758 gotsig = 0;
759
760 for (signum = signalmax; signum--; )
761 if (signals [signum].gotsig)
762 ev_feed_signal_event (EV_A_ signum + 1);
763}
764 789
765void inline_speed 790void inline_speed
766fd_intern (int fd) 791fd_intern (int fd)
767{ 792{
768#ifdef _WIN32 793#ifdef _WIN32
… …
773 fcntl (fd, F_SETFL, O_NONBLOCK); 798 fcntl (fd, F_SETFL, O_NONBLOCK);
774#endif 799#endif
775} 800}
776 801
777static void noinline 802static void noinline
778siginit (EV_P) 803evpipe_init (EV_P)
779{ 804{
805 if (!ev_is_active (&pipeev))
806 {
807 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe");
809
780 fd_intern (sigpipe [0]); 810 fd_intern (evpipe [0]);
781 fd_intern (sigpipe [1]); 811 fd_intern (evpipe [1]);
782 812
783 ev_io_set (&sigev, sigpipe [0], EV_READ); 813 ev_io_set (&pipeev, evpipe [0], EV_READ);
784 ev_io_start (EV_A_ &sigev); 814 ev_io_start (EV_A_ &pipeev);
785 ev_unref (EV_A); /* child watcher should not keep loop alive */ 815 ev_unref (EV_A); /* watcher should not keep loop alive */
816
817 /* in case we received the signal before we had the chance of installing a handler */
818 ev_feed_event (EV_A_ &pipeev, 0);
819 }
820}
821
822void inline_size
823evpipe_write (EV_P_ int sig, int async)
824{
825 if (!(gotasync || gotsig))
826 {
827 int old_errno = errno; /* save errno becaue write might clobber it */
828
829 if (sig) gotsig = 1;
830 if (async) gotasync = 1;
831
832 write (evpipe [1], &old_errno, 1);
833
834 errno = old_errno;
835 }
836}
837
838static void
839pipecb (EV_P_ ev_io *iow, int revents)
840{
841 {
842 int dummy;
843 read (evpipe [0], &dummy, 1);
844 }
845
846 if (gotsig && ev_is_default_loop (EV_A))
847 {
848 int signum;
849 gotsig = 0;
850
851 for (signum = signalmax; signum--; )
852 if (signals [signum].gotsig)
853 ev_feed_signal_event (EV_A_ signum + 1);
854 }
855
856#if EV_ASYNC_ENABLE
857 if (gotasync)
858 {
859 int i;
860 gotasync = 0;
861
862 for (i = asynccnt; i--; )
863 if (asyncs [i]->sent)
864 {
865 asyncs [i]->sent = 0;
866 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
867 }
868 }
869#endif
786} 870}
787 871
788/*****************************************************************************/ 872/*****************************************************************************/
789 873
874static void
875sighandler (int signum)
876{
877#if EV_MULTIPLICITY
878 struct ev_loop *loop = &default_loop_struct;
879#endif
880
881#if _WIN32
882 signal (signum, sighandler);
883#endif
884
885 signals [signum - 1].gotsig = 1;
886 evpipe_write (EV_A_ 1, 0);
887}
888
889void noinline
890ev_feed_signal_event (EV_P_ int signum)
891{
892 WL w;
893
894#if EV_MULTIPLICITY
895 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
896#endif
897
898 --signum;
899
900 if (signum < 0 || signum >= signalmax)
901 return;
902
903 signals [signum].gotsig = 0;
904
905 for (w = signals [signum].head; w; w = w->next)
906 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
907}
908
909/*****************************************************************************/
910
790static ev_child *childs [EV_PID_HASHSIZE]; 911static WL childs [EV_PID_HASHSIZE];
791 912
792#ifndef _WIN32 913#ifndef _WIN32
793 914
794static ev_signal childev; 915static ev_signal childev;
916
917#ifndef WIFCONTINUED
918# define WIFCONTINUED(status) 0
919#endif
795 920
796void inline_speed 921void inline_speed
797child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 922child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
798{ 923{
799 ev_child *w; 924 ev_child *w;
925 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
800 926
801 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 927 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
928 {
802 if (w->pid == pid || !w->pid) 929 if ((w->pid == pid || !w->pid)
930 && (!traced || (w->flags & 1)))
803 { 931 {
804 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 932 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
805 w->rpid = pid; 933 w->rpid = pid;
806 w->rstatus = status; 934 w->rstatus = status;
807 ev_feed_event (EV_A_ (W)w, EV_CHILD); 935 ev_feed_event (EV_A_ (W)w, EV_CHILD);
808 } 936 }
937 }
809} 938}
810 939
811#ifndef WCONTINUED 940#ifndef WCONTINUED
812# define WCONTINUED 0 941# define WCONTINUED 0
813#endif 942#endif
… …
910} 1039}
911 1040
912unsigned int 1041unsigned int
913ev_embeddable_backends (void) 1042ev_embeddable_backends (void)
914{ 1043{
915 return EVBACKEND_EPOLL 1044 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
916 | EVBACKEND_KQUEUE 1045
917 | EVBACKEND_PORT; 1046 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1047 /* please fix it and tell me how to detect the fix */
1048 flags &= ~EVBACKEND_EPOLL;
1049
1050 return flags;
918} 1051}
919 1052
920unsigned int 1053unsigned int
921ev_backend (EV_P) 1054ev_backend (EV_P)
922{ 1055{
… …
925 1058
926unsigned int 1059unsigned int
927ev_loop_count (EV_P) 1060ev_loop_count (EV_P)
928{ 1061{
929 return loop_count; 1062 return loop_count;
1063}
1064
1065void
1066ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1067{
1068 io_blocktime = interval;
1069}
1070
1071void
1072ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1073{
1074 timeout_blocktime = interval;
930} 1075}
931 1076
932static void noinline 1077static void noinline
933loop_init (EV_P_ unsigned int flags) 1078loop_init (EV_P_ unsigned int flags)
934{ 1079{
… …
940 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1085 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
941 have_monotonic = 1; 1086 have_monotonic = 1;
942 } 1087 }
943#endif 1088#endif
944 1089
945 ev_rt_now = ev_time (); 1090 ev_rt_now = ev_time ();
946 mn_now = get_clock (); 1091 mn_now = get_clock ();
947 now_floor = mn_now; 1092 now_floor = mn_now;
948 rtmn_diff = ev_rt_now - mn_now; 1093 rtmn_diff = ev_rt_now - mn_now;
1094
1095 io_blocktime = 0.;
1096 timeout_blocktime = 0.;
1097 backend = 0;
1098 backend_fd = -1;
1099 gotasync = 0;
1100#if EV_USE_INOTIFY
1101 fs_fd = -2;
1102#endif
949 1103
950 /* pid check not overridable via env */ 1104 /* pid check not overridable via env */
951#ifndef _WIN32 1105#ifndef _WIN32
952 if (flags & EVFLAG_FORKCHECK) 1106 if (flags & EVFLAG_FORKCHECK)
953 curpid = getpid (); 1107 curpid = getpid ();
… …
959 flags = atoi (getenv ("LIBEV_FLAGS")); 1113 flags = atoi (getenv ("LIBEV_FLAGS"));
960 1114
961 if (!(flags & 0x0000ffffUL)) 1115 if (!(flags & 0x0000ffffUL))
962 flags |= ev_recommended_backends (); 1116 flags |= ev_recommended_backends ();
963 1117
964 backend = 0;
965 backend_fd = -1;
966#if EV_USE_INOTIFY
967 fs_fd = -2;
968#endif
969
970#if EV_USE_PORT 1118#if EV_USE_PORT
971 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1119 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
972#endif 1120#endif
973#if EV_USE_KQUEUE 1121#if EV_USE_KQUEUE
974 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1122 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
981#endif 1129#endif
982#if EV_USE_SELECT 1130#if EV_USE_SELECT
983 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1131 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
984#endif 1132#endif
985 1133
986 ev_init (&sigev, sigcb); 1134 ev_init (&pipeev, pipecb);
987 ev_set_priority (&sigev, EV_MAXPRI); 1135 ev_set_priority (&pipeev, EV_MAXPRI);
988 } 1136 }
989} 1137}
990 1138
991static void noinline 1139static void noinline
992loop_destroy (EV_P) 1140loop_destroy (EV_P)
993{ 1141{
994 int i; 1142 int i;
1143
1144 if (ev_is_active (&pipeev))
1145 {
1146 ev_ref (EV_A); /* signal watcher */
1147 ev_io_stop (EV_A_ &pipeev);
1148
1149 close (evpipe [0]); evpipe [0] = 0;
1150 close (evpipe [1]); evpipe [1] = 0;
1151 }
995 1152
996#if EV_USE_INOTIFY 1153#if EV_USE_INOTIFY
997 if (fs_fd >= 0) 1154 if (fs_fd >= 0)
998 close (fs_fd); 1155 close (fs_fd);
999#endif 1156#endif
… …
1022 array_free (pending, [i]); 1179 array_free (pending, [i]);
1023#if EV_IDLE_ENABLE 1180#if EV_IDLE_ENABLE
1024 array_free (idle, [i]); 1181 array_free (idle, [i]);
1025#endif 1182#endif
1026 } 1183 }
1184
1185 ev_free (anfds); anfdmax = 0;
1027 1186
1028 /* have to use the microsoft-never-gets-it-right macro */ 1187 /* have to use the microsoft-never-gets-it-right macro */
1029 array_free (fdchange, EMPTY); 1188 array_free (fdchange, EMPTY);
1030 array_free (timer, EMPTY); 1189 array_free (timer, EMPTY);
1031#if EV_PERIODIC_ENABLE 1190#if EV_PERIODIC_ENABLE
1032 array_free (periodic, EMPTY); 1191 array_free (periodic, EMPTY);
1033#endif 1192#endif
1193#if EV_FORK_ENABLE
1194 array_free (fork, EMPTY);
1195#endif
1034 array_free (prepare, EMPTY); 1196 array_free (prepare, EMPTY);
1035 array_free (check, EMPTY); 1197 array_free (check, EMPTY);
1198#if EV_ASYNC_ENABLE
1199 array_free (async, EMPTY);
1200#endif
1036 1201
1037 backend = 0; 1202 backend = 0;
1038} 1203}
1039 1204
1040void inline_size infy_fork (EV_P); 1205void inline_size infy_fork (EV_P);
… …
1053#endif 1218#endif
1054#if EV_USE_INOTIFY 1219#if EV_USE_INOTIFY
1055 infy_fork (EV_A); 1220 infy_fork (EV_A);
1056#endif 1221#endif
1057 1222
1058 if (ev_is_active (&sigev)) 1223 if (ev_is_active (&pipeev))
1059 { 1224 {
1060 /* default loop */ 1225 /* this "locks" the handlers against writing to the pipe */
1226 gotsig = gotasync = 1;
1061 1227
1062 ev_ref (EV_A); 1228 ev_ref (EV_A);
1063 ev_io_stop (EV_A_ &sigev); 1229 ev_io_stop (EV_A_ &pipeev);
1064 close (sigpipe [0]); 1230 close (evpipe [0]);
1065 close (sigpipe [1]); 1231 close (evpipe [1]);
1066 1232
1067 while (pipe (sigpipe))
1068 syserr ("(libev) error creating pipe");
1069
1070 siginit (EV_A); 1233 evpipe_init (EV_A);
1234 /* now iterate over everything, in case we missed something */
1235 pipecb (EV_A_ &pipeev, EV_READ);
1071 } 1236 }
1072 1237
1073 postfork = 0; 1238 postfork = 0;
1074} 1239}
1075 1240
… …
1097} 1262}
1098 1263
1099void 1264void
1100ev_loop_fork (EV_P) 1265ev_loop_fork (EV_P)
1101{ 1266{
1102 postfork = 1; 1267 postfork = 1; /* must be in line with ev_default_fork */
1103} 1268}
1104 1269
1105#endif 1270#endif
1106 1271
1107#if EV_MULTIPLICITY 1272#if EV_MULTIPLICITY
… …
1110#else 1275#else
1111int 1276int
1112ev_default_loop (unsigned int flags) 1277ev_default_loop (unsigned int flags)
1113#endif 1278#endif
1114{ 1279{
1115 if (sigpipe [0] == sigpipe [1])
1116 if (pipe (sigpipe))
1117 return 0;
1118
1119 if (!ev_default_loop_ptr) 1280 if (!ev_default_loop_ptr)
1120 { 1281 {
1121#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1122 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1283 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1123#else 1284#else
… …
1126 1287
1127 loop_init (EV_A_ flags); 1288 loop_init (EV_A_ flags);
1128 1289
1129 if (ev_backend (EV_A)) 1290 if (ev_backend (EV_A))
1130 { 1291 {
1131 siginit (EV_A);
1132
1133#ifndef _WIN32 1292#ifndef _WIN32
1134 ev_signal_init (&childev, childcb, SIGCHLD); 1293 ev_signal_init (&childev, childcb, SIGCHLD);
1135 ev_set_priority (&childev, EV_MAXPRI); 1294 ev_set_priority (&childev, EV_MAXPRI);
1136 ev_signal_start (EV_A_ &childev); 1295 ev_signal_start (EV_A_ &childev);
1137 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1296 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1154#ifndef _WIN32 1313#ifndef _WIN32
1155 ev_ref (EV_A); /* child watcher */ 1314 ev_ref (EV_A); /* child watcher */
1156 ev_signal_stop (EV_A_ &childev); 1315 ev_signal_stop (EV_A_ &childev);
1157#endif 1316#endif
1158 1317
1159 ev_ref (EV_A); /* signal watcher */
1160 ev_io_stop (EV_A_ &sigev);
1161
1162 close (sigpipe [0]); sigpipe [0] = 0;
1163 close (sigpipe [1]); sigpipe [1] = 0;
1164
1165 loop_destroy (EV_A); 1318 loop_destroy (EV_A);
1166} 1319}
1167 1320
1168void 1321void
1169ev_default_fork (void) 1322ev_default_fork (void)
… …
1171#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1172 struct ev_loop *loop = ev_default_loop_ptr; 1325 struct ev_loop *loop = ev_default_loop_ptr;
1173#endif 1326#endif
1174 1327
1175 if (backend) 1328 if (backend)
1176 postfork = 1; 1329 postfork = 1; /* must be in line with ev_loop_fork */
1177} 1330}
1178 1331
1179/*****************************************************************************/ 1332/*****************************************************************************/
1180 1333
1181void 1334void
… …
1207void inline_size 1360void inline_size
1208timers_reify (EV_P) 1361timers_reify (EV_P)
1209{ 1362{
1210 while (timercnt && ((WT)timers [0])->at <= mn_now) 1363 while (timercnt && ((WT)timers [0])->at <= mn_now)
1211 { 1364 {
1212 ev_timer *w = timers [0]; 1365 ev_timer *w = (ev_timer *)timers [0];
1213 1366
1214 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1367 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1215 1368
1216 /* first reschedule or stop timer */ 1369 /* first reschedule or stop timer */
1217 if (w->repeat) 1370 if (w->repeat)
… …
1220 1373
1221 ((WT)w)->at += w->repeat; 1374 ((WT)w)->at += w->repeat;
1222 if (((WT)w)->at < mn_now) 1375 if (((WT)w)->at < mn_now)
1223 ((WT)w)->at = mn_now; 1376 ((WT)w)->at = mn_now;
1224 1377
1225 downheap ((WT *)timers, timercnt, 0); 1378 downheap (timers, timercnt, 0);
1226 } 1379 }
1227 else 1380 else
1228 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1381 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1229 1382
1230 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1383 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1235void inline_size 1388void inline_size
1236periodics_reify (EV_P) 1389periodics_reify (EV_P)
1237{ 1390{
1238 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1391 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1239 { 1392 {
1240 ev_periodic *w = periodics [0]; 1393 ev_periodic *w = (ev_periodic *)periodics [0];
1241 1394
1242 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1395 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1243 1396
1244 /* first reschedule or stop timer */ 1397 /* first reschedule or stop timer */
1245 if (w->reschedule_cb) 1398 if (w->reschedule_cb)
1246 { 1399 {
1247 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1400 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1248 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1401 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1249 downheap ((WT *)periodics, periodiccnt, 0); 1402 downheap (periodics, periodiccnt, 0);
1250 } 1403 }
1251 else if (w->interval) 1404 else if (w->interval)
1252 { 1405 {
1253 ((WT)w)->at = w->offset + floor ((ev_rt_now + TIME_EPSILON - w->offset) / w->interval + 1.) * w->interval; 1406 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1407 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1408 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1255 downheap ((WT *)periodics, periodiccnt, 0); 1409 downheap (periodics, periodiccnt, 0);
1256 } 1410 }
1257 else 1411 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1412 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1413
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1414 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1421 int i;
1268 1422
1269 /* adjust periodics after time jump */ 1423 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1424 for (i = 0; i < periodiccnt; ++i)
1271 { 1425 {
1272 ev_periodic *w = periodics [i]; 1426 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1427
1274 if (w->reschedule_cb) 1428 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1429 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1430 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1431 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1432 }
1279 1433
1280 /* now rebuild the heap */ 1434 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1435 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1436 downheap (periodics, periodiccnt, i);
1283} 1437}
1284#endif 1438#endif
1285 1439
1286#if EV_IDLE_ENABLE 1440#if EV_IDLE_ENABLE
1287void inline_size 1441void inline_size
… …
1304 } 1458 }
1305 } 1459 }
1306} 1460}
1307#endif 1461#endif
1308 1462
1309int inline_size 1463void inline_speed
1310time_update_monotonic (EV_P) 1464time_update (EV_P_ ev_tstamp max_block)
1311{ 1465{
1466 int i;
1467
1468#if EV_USE_MONOTONIC
1469 if (expect_true (have_monotonic))
1470 {
1471 ev_tstamp odiff = rtmn_diff;
1472
1312 mn_now = get_clock (); 1473 mn_now = get_clock ();
1313 1474
1475 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1476 /* interpolate in the meantime */
1314 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1477 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1315 { 1478 {
1316 ev_rt_now = rtmn_diff + mn_now; 1479 ev_rt_now = rtmn_diff + mn_now;
1317 return 0; 1480 return;
1318 } 1481 }
1319 else 1482
1320 {
1321 now_floor = mn_now; 1483 now_floor = mn_now;
1322 ev_rt_now = ev_time (); 1484 ev_rt_now = ev_time ();
1323 return 1;
1324 }
1325}
1326 1485
1327void inline_size 1486 /* loop a few times, before making important decisions.
1328time_update (EV_P) 1487 * on the choice of "4": one iteration isn't enough,
1329{ 1488 * in case we get preempted during the calls to
1330 int i; 1489 * ev_time and get_clock. a second call is almost guaranteed
1331 1490 * to succeed in that case, though. and looping a few more times
1332#if EV_USE_MONOTONIC 1491 * doesn't hurt either as we only do this on time-jumps or
1333 if (expect_true (have_monotonic)) 1492 * in the unlikely event of having been preempted here.
1334 { 1493 */
1335 if (time_update_monotonic (EV_A)) 1494 for (i = 4; --i; )
1336 { 1495 {
1337 ev_tstamp odiff = rtmn_diff;
1338
1339 /* loop a few times, before making important decisions.
1340 * on the choice of "4": one iteration isn't enough,
1341 * in case we get preempted during the calls to
1342 * ev_time and get_clock. a second call is almost guaranteed
1343 * to succeed in that case, though. and looping a few more times
1344 * doesn't hurt either as we only do this on time-jumps or
1345 * in the unlikely event of having been preempted here.
1346 */
1347 for (i = 4; --i; )
1348 {
1349 rtmn_diff = ev_rt_now - mn_now; 1496 rtmn_diff = ev_rt_now - mn_now;
1350 1497
1351 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1498 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1352 return; /* all is well */ 1499 return; /* all is well */
1353 1500
1354 ev_rt_now = ev_time (); 1501 ev_rt_now = ev_time ();
1355 mn_now = get_clock (); 1502 mn_now = get_clock ();
1356 now_floor = mn_now; 1503 now_floor = mn_now;
1357 } 1504 }
1358 1505
1359# if EV_PERIODIC_ENABLE 1506# if EV_PERIODIC_ENABLE
1360 periodics_reschedule (EV_A); 1507 periodics_reschedule (EV_A);
1361# endif 1508# endif
1362 /* no timer adjustment, as the monotonic clock doesn't jump */ 1509 /* no timer adjustment, as the monotonic clock doesn't jump */
1363 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1510 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1364 }
1365 } 1511 }
1366 else 1512 else
1367#endif 1513#endif
1368 { 1514 {
1369 ev_rt_now = ev_time (); 1515 ev_rt_now = ev_time ();
1370 1516
1371 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1517 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1372 { 1518 {
1373#if EV_PERIODIC_ENABLE 1519#if EV_PERIODIC_ENABLE
1374 periodics_reschedule (EV_A); 1520 periodics_reschedule (EV_A);
1375#endif 1521#endif
1376
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1522 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1523 for (i = 0; i < timercnt; ++i)
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1524 ((WT)timers [i])->at += ev_rt_now - mn_now;
1380 } 1525 }
1381 1526
… …
1444 /* update fd-related kernel structures */ 1589 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1590 fd_reify (EV_A);
1446 1591
1447 /* calculate blocking time */ 1592 /* calculate blocking time */
1448 { 1593 {
1449 ev_tstamp block; 1594 ev_tstamp waittime = 0.;
1595 ev_tstamp sleeptime = 0.;
1450 1596
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1597 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1598 {
1455 /* update time to cancel out callback processing overhead */ 1599 /* update time to cancel out callback processing overhead */
1456#if EV_USE_MONOTONIC
1457 if (expect_true (have_monotonic))
1458 time_update_monotonic (EV_A); 1600 time_update (EV_A_ 1e100);
1459 else
1460#endif
1461 {
1462 ev_rt_now = ev_time ();
1463 mn_now = ev_rt_now;
1464 }
1465 1601
1466 block = MAX_BLOCKTIME; 1602 waittime = MAX_BLOCKTIME;
1467 1603
1468 if (timercnt) 1604 if (timercnt)
1469 { 1605 {
1470 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1606 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1471 if (block > to) block = to; 1607 if (waittime > to) waittime = to;
1472 } 1608 }
1473 1609
1474#if EV_PERIODIC_ENABLE 1610#if EV_PERIODIC_ENABLE
1475 if (periodiccnt) 1611 if (periodiccnt)
1476 { 1612 {
1477 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1613 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1478 if (block > to) block = to; 1614 if (waittime > to) waittime = to;
1479 } 1615 }
1480#endif 1616#endif
1481 1617
1482 if (expect_false (block < 0.)) block = 0.; 1618 if (expect_false (waittime < timeout_blocktime))
1619 waittime = timeout_blocktime;
1620
1621 sleeptime = waittime - backend_fudge;
1622
1623 if (expect_true (sleeptime > io_blocktime))
1624 sleeptime = io_blocktime;
1625
1626 if (sleeptime)
1627 {
1628 ev_sleep (sleeptime);
1629 waittime -= sleeptime;
1630 }
1483 } 1631 }
1484 1632
1485 ++loop_count; 1633 ++loop_count;
1486 backend_poll (EV_A_ block); 1634 backend_poll (EV_A_ waittime);
1635
1636 /* update ev_rt_now, do magic */
1637 time_update (EV_A_ waittime + sleeptime);
1487 } 1638 }
1488
1489 /* update ev_rt_now, do magic */
1490 time_update (EV_A);
1491 1639
1492 /* queue pending timers and reschedule them */ 1640 /* queue pending timers and reschedule them */
1493 timers_reify (EV_A); /* relative timers called last */ 1641 timers_reify (EV_A); /* relative timers called last */
1494#if EV_PERIODIC_ENABLE 1642#if EV_PERIODIC_ENABLE
1495 periodics_reify (EV_A); /* absolute timers called first */ 1643 periodics_reify (EV_A); /* absolute timers called first */
… …
1606 1754
1607 assert (("ev_io_start called with negative fd", fd >= 0)); 1755 assert (("ev_io_start called with negative fd", fd >= 0));
1608 1756
1609 ev_start (EV_A_ (W)w, 1); 1757 ev_start (EV_A_ (W)w, 1);
1610 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1758 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1611 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1759 wlist_add (&anfds[fd].head, (WL)w);
1612 1760
1613 fd_change (EV_A_ fd); 1761 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1762 w->events &= ~EV_IOFDSET;
1614} 1763}
1615 1764
1616void noinline 1765void noinline
1617ev_io_stop (EV_P_ ev_io *w) 1766ev_io_stop (EV_P_ ev_io *w)
1618{ 1767{
… …
1620 if (expect_false (!ev_is_active (w))) 1769 if (expect_false (!ev_is_active (w)))
1621 return; 1770 return;
1622 1771
1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1772 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1624 1773
1625 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1774 wlist_del (&anfds[w->fd].head, (WL)w);
1626 ev_stop (EV_A_ (W)w); 1775 ev_stop (EV_A_ (W)w);
1627 1776
1628 fd_change (EV_A_ w->fd); 1777 fd_change (EV_A_ w->fd, 1);
1629} 1778}
1630 1779
1631void noinline 1780void noinline
1632ev_timer_start (EV_P_ ev_timer *w) 1781ev_timer_start (EV_P_ ev_timer *w)
1633{ 1782{
… …
1637 ((WT)w)->at += mn_now; 1786 ((WT)w)->at += mn_now;
1638 1787
1639 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1788 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1640 1789
1641 ev_start (EV_A_ (W)w, ++timercnt); 1790 ev_start (EV_A_ (W)w, ++timercnt);
1642 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1791 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1643 timers [timercnt - 1] = w; 1792 timers [timercnt - 1] = (WT)w;
1644 upheap ((WT *)timers, timercnt - 1); 1793 upheap (timers, timercnt - 1);
1645 1794
1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1795 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1647} 1796}
1648 1797
1649void noinline 1798void noinline
… …
1651{ 1800{
1652 clear_pending (EV_A_ (W)w); 1801 clear_pending (EV_A_ (W)w);
1653 if (expect_false (!ev_is_active (w))) 1802 if (expect_false (!ev_is_active (w)))
1654 return; 1803 return;
1655 1804
1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1805 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1657 1806
1658 { 1807 {
1659 int active = ((W)w)->active; 1808 int active = ((W)w)->active;
1660 1809
1661 if (expect_true (--active < --timercnt)) 1810 if (expect_true (--active < --timercnt))
1662 { 1811 {
1663 timers [active] = timers [timercnt]; 1812 timers [active] = timers [timercnt];
1664 adjustheap ((WT *)timers, timercnt, active); 1813 adjustheap (timers, timercnt, active);
1665 } 1814 }
1666 } 1815 }
1667 1816
1668 ((WT)w)->at -= mn_now; 1817 ((WT)w)->at -= mn_now;
1669 1818
… …
1676 if (ev_is_active (w)) 1825 if (ev_is_active (w))
1677 { 1826 {
1678 if (w->repeat) 1827 if (w->repeat)
1679 { 1828 {
1680 ((WT)w)->at = mn_now + w->repeat; 1829 ((WT)w)->at = mn_now + w->repeat;
1681 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1830 adjustheap (timers, timercnt, ((W)w)->active - 1);
1682 } 1831 }
1683 else 1832 else
1684 ev_timer_stop (EV_A_ w); 1833 ev_timer_stop (EV_A_ w);
1685 } 1834 }
1686 else if (w->repeat) 1835 else if (w->repeat)
… …
1707 } 1856 }
1708 else 1857 else
1709 ((WT)w)->at = w->offset; 1858 ((WT)w)->at = w->offset;
1710 1859
1711 ev_start (EV_A_ (W)w, ++periodiccnt); 1860 ev_start (EV_A_ (W)w, ++periodiccnt);
1712 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1861 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1713 periodics [periodiccnt - 1] = w; 1862 periodics [periodiccnt - 1] = (WT)w;
1714 upheap ((WT *)periodics, periodiccnt - 1); 1863 upheap (periodics, periodiccnt - 1);
1715 1864
1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1865 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1717} 1866}
1718 1867
1719void noinline 1868void noinline
… …
1721{ 1870{
1722 clear_pending (EV_A_ (W)w); 1871 clear_pending (EV_A_ (W)w);
1723 if (expect_false (!ev_is_active (w))) 1872 if (expect_false (!ev_is_active (w)))
1724 return; 1873 return;
1725 1874
1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1875 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1727 1876
1728 { 1877 {
1729 int active = ((W)w)->active; 1878 int active = ((W)w)->active;
1730 1879
1731 if (expect_true (--active < --periodiccnt)) 1880 if (expect_true (--active < --periodiccnt))
1732 { 1881 {
1733 periodics [active] = periodics [periodiccnt]; 1882 periodics [active] = periodics [periodiccnt];
1734 adjustheap ((WT *)periodics, periodiccnt, active); 1883 adjustheap (periodics, periodiccnt, active);
1735 } 1884 }
1736 } 1885 }
1737 1886
1738 ev_stop (EV_A_ (W)w); 1887 ev_stop (EV_A_ (W)w);
1739} 1888}
… …
1760 if (expect_false (ev_is_active (w))) 1909 if (expect_false (ev_is_active (w)))
1761 return; 1910 return;
1762 1911
1763 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1912 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1764 1913
1914 evpipe_init (EV_A);
1915
1916 {
1917#ifndef _WIN32
1918 sigset_t full, prev;
1919 sigfillset (&full);
1920 sigprocmask (SIG_SETMASK, &full, &prev);
1921#endif
1922
1923 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1924
1925#ifndef _WIN32
1926 sigprocmask (SIG_SETMASK, &prev, 0);
1927#endif
1928 }
1929
1765 ev_start (EV_A_ (W)w, 1); 1930 ev_start (EV_A_ (W)w, 1);
1766 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1767 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1931 wlist_add (&signals [w->signum - 1].head, (WL)w);
1768 1932
1769 if (!((WL)w)->next) 1933 if (!((WL)w)->next)
1770 { 1934 {
1771#if _WIN32 1935#if _WIN32
1772 signal (w->signum, sighandler); 1936 signal (w->signum, sighandler);
… …
1785{ 1949{
1786 clear_pending (EV_A_ (W)w); 1950 clear_pending (EV_A_ (W)w);
1787 if (expect_false (!ev_is_active (w))) 1951 if (expect_false (!ev_is_active (w)))
1788 return; 1952 return;
1789 1953
1790 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1954 wlist_del (&signals [w->signum - 1].head, (WL)w);
1791 ev_stop (EV_A_ (W)w); 1955 ev_stop (EV_A_ (W)w);
1792 1956
1793 if (!signals [w->signum - 1].head) 1957 if (!signals [w->signum - 1].head)
1794 signal (w->signum, SIG_DFL); 1958 signal (w->signum, SIG_DFL);
1795} 1959}
… …
1802#endif 1966#endif
1803 if (expect_false (ev_is_active (w))) 1967 if (expect_false (ev_is_active (w)))
1804 return; 1968 return;
1805 1969
1806 ev_start (EV_A_ (W)w, 1); 1970 ev_start (EV_A_ (W)w, 1);
1807 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1971 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1808} 1972}
1809 1973
1810void 1974void
1811ev_child_stop (EV_P_ ev_child *w) 1975ev_child_stop (EV_P_ ev_child *w)
1812{ 1976{
1813 clear_pending (EV_A_ (W)w); 1977 clear_pending (EV_A_ (W)w);
1814 if (expect_false (!ev_is_active (w))) 1978 if (expect_false (!ev_is_active (w)))
1815 return; 1979 return;
1816 1980
1817 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1981 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1818 ev_stop (EV_A_ (W)w); 1982 ev_stop (EV_A_ (W)w);
1819} 1983}
1820 1984
1821#if EV_STAT_ENABLE 1985#if EV_STAT_ENABLE
1822 1986
… …
2164 2328
2165#if EV_EMBED_ENABLE 2329#if EV_EMBED_ENABLE
2166void noinline 2330void noinline
2167ev_embed_sweep (EV_P_ ev_embed *w) 2331ev_embed_sweep (EV_P_ ev_embed *w)
2168{ 2332{
2169 ev_loop (w->loop, EVLOOP_NONBLOCK); 2333 ev_loop (w->other, EVLOOP_NONBLOCK);
2170} 2334}
2171 2335
2172static void 2336static void
2173embed_cb (EV_P_ ev_io *io, int revents) 2337embed_io_cb (EV_P_ ev_io *io, int revents)
2174{ 2338{
2175 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2339 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2176 2340
2177 if (ev_cb (w)) 2341 if (ev_cb (w))
2178 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2342 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2179 else 2343 else
2180 ev_embed_sweep (loop, w); 2344 ev_loop (w->other, EVLOOP_NONBLOCK);
2181} 2345}
2346
2347static void
2348embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2349{
2350 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2351
2352 {
2353 struct ev_loop *loop = w->other;
2354
2355 while (fdchangecnt)
2356 {
2357 fd_reify (EV_A);
2358 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2359 }
2360 }
2361}
2362
2363#if 0
2364static void
2365embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2366{
2367 ev_idle_stop (EV_A_ idle);
2368}
2369#endif
2182 2370
2183void 2371void
2184ev_embed_start (EV_P_ ev_embed *w) 2372ev_embed_start (EV_P_ ev_embed *w)
2185{ 2373{
2186 if (expect_false (ev_is_active (w))) 2374 if (expect_false (ev_is_active (w)))
2187 return; 2375 return;
2188 2376
2189 { 2377 {
2190 struct ev_loop *loop = w->loop; 2378 struct ev_loop *loop = w->other;
2191 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2379 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2192 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2380 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2193 } 2381 }
2194 2382
2195 ev_set_priority (&w->io, ev_priority (w)); 2383 ev_set_priority (&w->io, ev_priority (w));
2196 ev_io_start (EV_A_ &w->io); 2384 ev_io_start (EV_A_ &w->io);
2197 2385
2386 ev_prepare_init (&w->prepare, embed_prepare_cb);
2387 ev_set_priority (&w->prepare, EV_MINPRI);
2388 ev_prepare_start (EV_A_ &w->prepare);
2389
2390 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2391
2198 ev_start (EV_A_ (W)w, 1); 2392 ev_start (EV_A_ (W)w, 1);
2199} 2393}
2200 2394
2201void 2395void
2202ev_embed_stop (EV_P_ ev_embed *w) 2396ev_embed_stop (EV_P_ ev_embed *w)
… …
2204 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2205 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2206 return; 2400 return;
2207 2401
2208 ev_io_stop (EV_A_ &w->io); 2402 ev_io_stop (EV_A_ &w->io);
2403 ev_prepare_stop (EV_A_ &w->prepare);
2209 2404
2210 ev_stop (EV_A_ (W)w); 2405 ev_stop (EV_A_ (W)w);
2211} 2406}
2212#endif 2407#endif
2213 2408
… …
2238 2433
2239 ev_stop (EV_A_ (W)w); 2434 ev_stop (EV_A_ (W)w);
2240} 2435}
2241#endif 2436#endif
2242 2437
2438#if EV_ASYNC_ENABLE
2439void
2440ev_async_start (EV_P_ ev_async *w)
2441{
2442 if (expect_false (ev_is_active (w)))
2443 return;
2444
2445 evpipe_init (EV_A);
2446
2447 ev_start (EV_A_ (W)w, ++asynccnt);
2448 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2449 asyncs [asynccnt - 1] = w;
2450}
2451
2452void
2453ev_async_stop (EV_P_ ev_async *w)
2454{
2455 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w)))
2457 return;
2458
2459 {
2460 int active = ((W)w)->active;
2461 asyncs [active - 1] = asyncs [--asynccnt];
2462 ((W)asyncs [active - 1])->active = active;
2463 }
2464
2465 ev_stop (EV_A_ (W)w);
2466}
2467
2468void
2469ev_async_send (EV_P_ ev_async *w)
2470{
2471 w->sent = 1;
2472 evpipe_write (EV_A_ 0, 1);
2473}
2474#endif
2475
2243/*****************************************************************************/ 2476/*****************************************************************************/
2244 2477
2245struct ev_once 2478struct ev_once
2246{ 2479{
2247 ev_io io; 2480 ev_io io;
… …
2302 ev_timer_set (&once->to, timeout, 0.); 2535 ev_timer_set (&once->to, timeout, 0.);
2303 ev_timer_start (EV_A_ &once->to); 2536 ev_timer_start (EV_A_ &once->to);
2304 } 2537 }
2305} 2538}
2306 2539
2540#if EV_MULTIPLICITY
2541 #include "ev_wrap.h"
2542#endif
2543
2307#ifdef __cplusplus 2544#ifdef __cplusplus
2308} 2545}
2309#endif 2546#endif
2310 2547

Diff Legend

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