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

Comparing libev/ev.c (file contents):
Revision 1.173 by root, Sun Dec 9 19:42:57 2007 UTC vs.
Revision 1.219 by root, Wed Apr 2 10:55:39 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 244#endif
210 245
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
218
219/**/ 246/**/
247
248/*
249 * This is used to avoid floating point rounding problems.
250 * It is added to ev_rt_now when scheduling periodics
251 * to ensure progress, time-wise, even when rounding
252 * errors are against us.
253 * This value is good at least till the year 4000.
254 * Better solutions welcome.
255 */
256#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 257
221#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) */
222#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) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 261
225#if __GNUC__ >= 3 262#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 263# define expect(expr,value) __builtin_expect ((expr),(value))
227# define noinline __attribute__ ((noinline)) 264# define noinline __attribute__ ((noinline))
228#else 265#else
229# define expect(expr,value) (expr) 266# define expect(expr,value) (expr)
230# define noinline 267# define noinline
251 288
252typedef ev_watcher *W; 289typedef ev_watcher *W;
253typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
254typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
255 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 */
256static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
257 298
258#ifdef _WIN32 299#ifdef _WIN32
259# include "ev_win32.c" 300# include "ev_win32.c"
260#endif 301#endif
261 302
397{ 438{
398 return ev_rt_now; 439 return ev_rt_now;
399} 440}
400#endif 441#endif
401 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 ((unsigned long)(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
402int inline_size 470int inline_size
403array_nextsize (int elem, int cur, int cnt) 471array_nextsize (int elem, int cur, int cnt)
404{ 472{
405 int ncur = cur + 1; 473 int ncur = cur + 1;
406 474
466 pendings [pri][w_->pending - 1].w = w_; 534 pendings [pri][w_->pending - 1].w = w_;
467 pendings [pri][w_->pending - 1].events = revents; 535 pendings [pri][w_->pending - 1].events = revents;
468 } 536 }
469} 537}
470 538
471void inline_size 539void inline_speed
472queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
473{ 541{
474 int i; 542 int i;
475 543
476 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
523 { 591 {
524 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
525 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
526 ev_io *w; 594 ev_io *w;
527 595
528 int events = 0; 596 unsigned char events = 0;
529 597
530 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)
531 events |= w->events; 599 events |= (unsigned char)w->events;
532 600
533#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
534 if (events) 602 if (events)
535 { 603 {
536 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
537 anfd->handle = _get_osfhandle (fd); 608 anfd->handle = _get_osfhandle (fd);
609 #endif
538 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));
539 } 611 }
540#endif 612#endif
541 613
614 {
615 unsigned char o_events = anfd->events;
616 unsigned char o_reify = anfd->reify;
617
542 anfd->reify = 0; 618 anfd->reify = 0;
543
544 backend_modify (EV_A_ fd, anfd->events, events);
545 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 }
546 } 624 }
547 625
548 fdchangecnt = 0; 626 fdchangecnt = 0;
549} 627}
550 628
551void inline_size 629void inline_size
552fd_change (EV_P_ int fd) 630fd_change (EV_P_ int fd, int flags)
553{ 631{
554 if (expect_false (anfds [fd].reify)) 632 unsigned char reify = anfds [fd].reify;
555 return;
556
557 anfds [fd].reify = 1; 633 anfds [fd].reify |= flags;
558 634
635 if (expect_true (!reify))
636 {
559 ++fdchangecnt; 637 ++fdchangecnt;
560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 638 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
561 fdchanges [fdchangecnt - 1] = fd; 639 fdchanges [fdchangecnt - 1] = fd;
640 }
562} 641}
563 642
564void inline_speed 643void inline_speed
565fd_kill (EV_P_ int fd) 644fd_kill (EV_P_ int fd)
566{ 645{
617 696
618 for (fd = 0; fd < anfdmax; ++fd) 697 for (fd = 0; fd < anfdmax; ++fd)
619 if (anfds [fd].events) 698 if (anfds [fd].events)
620 { 699 {
621 anfds [fd].events = 0; 700 anfds [fd].events = 0;
622 fd_change (EV_A_ fd); 701 fd_change (EV_A_ fd, EV_IOFDSET | 1);
623 } 702 }
624} 703}
625 704
626/*****************************************************************************/ 705/*****************************************************************************/
627 706
628void inline_speed 707void inline_speed
629upheap (WT *heap, int k) 708upheap (WT *heap, int k)
630{ 709{
631 WT w = heap [k]; 710 WT w = heap [k];
632 711
633 while (k && heap [k >> 1]->at > w->at) 712 while (k)
634 { 713 {
714 int p = (k - 1) >> 1;
715
716 if (heap [p]->at <= w->at)
717 break;
718
635 heap [k] = heap [k >> 1]; 719 heap [k] = heap [p];
636 ((W)heap [k])->active = k + 1; 720 ((W)heap [k])->active = k + 1;
637 k >>= 1; 721 k = p;
638 } 722 }
639 723
640 heap [k] = w; 724 heap [k] = w;
641 ((W)heap [k])->active = k + 1; 725 ((W)heap [k])->active = k + 1;
642
643} 726}
644 727
645void inline_speed 728void inline_speed
646downheap (WT *heap, int N, int k) 729downheap (WT *heap, int N, int k)
647{ 730{
648 WT w = heap [k]; 731 WT w = heap [k];
649 732
650 while (k < (N >> 1)) 733 for (;;)
651 { 734 {
652 int j = k << 1; 735 int c = (k << 1) + 1;
653 736
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 737 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 738 break;
659 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
660 heap [k] = heap [j]; 746 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 747 ((W)heap [k])->active = k + 1;
748
662 k = j; 749 k = c;
663 } 750 }
664 751
665 heap [k] = w; 752 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 753 ((W)heap [k])->active = k + 1;
667} 754}
676/*****************************************************************************/ 763/*****************************************************************************/
677 764
678typedef struct 765typedef struct
679{ 766{
680 WL head; 767 WL head;
681 sig_atomic_t volatile gotsig; 768 EV_ATOMIC_T gotsig;
682} ANSIG; 769} ANSIG;
683 770
684static ANSIG *signals; 771static ANSIG *signals;
685static int signalmax; 772static int signalmax;
686 773
687static int sigpipe [2]; 774static EV_ATOMIC_T gotsig;
688static sig_atomic_t volatile gotsig;
689static ev_io sigev;
690 775
691void inline_size 776void inline_size
692signals_init (ANSIG *base, int count) 777signals_init (ANSIG *base, int count)
693{ 778{
694 while (count--) 779 while (count--)
698 783
699 ++base; 784 ++base;
700 } 785 }
701} 786}
702 787
703static void 788/*****************************************************************************/
704sighandler (int signum)
705{
706#if _WIN32
707 signal (signum, sighandler);
708#endif
709
710 signals [signum - 1].gotsig = 1;
711
712 if (!gotsig)
713 {
714 int old_errno = errno;
715 gotsig = 1;
716 write (sigpipe [1], &signum, 1);
717 errno = old_errno;
718 }
719}
720
721void noinline
722ev_feed_signal_event (EV_P_ int signum)
723{
724 WL w;
725
726#if EV_MULTIPLICITY
727 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
728#endif
729
730 --signum;
731
732 if (signum < 0 || signum >= signalmax)
733 return;
734
735 signals [signum].gotsig = 0;
736
737 for (w = signals [signum].head; w; w = w->next)
738 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
739}
740
741static void
742sigcb (EV_P_ ev_io *iow, int revents)
743{
744 int signum;
745
746 read (sigpipe [0], &revents, 1);
747 gotsig = 0;
748
749 for (signum = signalmax; signum--; )
750 if (signals [signum].gotsig)
751 ev_feed_signal_event (EV_A_ signum + 1);
752}
753 789
754void inline_speed 790void inline_speed
755fd_intern (int fd) 791fd_intern (int fd)
756{ 792{
757#ifdef _WIN32 793#ifdef _WIN32
762 fcntl (fd, F_SETFL, O_NONBLOCK); 798 fcntl (fd, F_SETFL, O_NONBLOCK);
763#endif 799#endif
764} 800}
765 801
766static void noinline 802static void noinline
767siginit (EV_P) 803evpipe_init (EV_P)
768{ 804{
805 if (!ev_is_active (&pipeev))
806 {
807 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe");
809
769 fd_intern (sigpipe [0]); 810 fd_intern (evpipe [0]);
770 fd_intern (sigpipe [1]); 811 fd_intern (evpipe [1]);
771 812
772 ev_io_set (&sigev, sigpipe [0], EV_READ); 813 ev_io_set (&pipeev, evpipe [0], EV_READ);
773 ev_io_start (EV_A_ &sigev); 814 ev_io_start (EV_A_ &pipeev);
774 ev_unref (EV_A); /* child watcher should not keep loop alive */ 815 ev_unref (EV_A); /* watcher should not keep loop alive */
816 }
817}
818
819void inline_size
820evpipe_write (EV_P_ EV_ATOMIC_T *flag)
821{
822 if (!*flag)
823 {
824 int old_errno = errno; /* save errno because write might clobber it */
825
826 *flag = 1;
827 write (evpipe [1], &old_errno, 1);
828
829 errno = old_errno;
830 }
831}
832
833static void
834pipecb (EV_P_ ev_io *iow, int revents)
835{
836 {
837 int dummy;
838 read (evpipe [0], &dummy, 1);
839 }
840
841 if (gotsig && ev_is_default_loop (EV_A))
842 {
843 int signum;
844 gotsig = 0;
845
846 for (signum = signalmax; signum--; )
847 if (signals [signum].gotsig)
848 ev_feed_signal_event (EV_A_ signum + 1);
849 }
850
851#if EV_ASYNC_ENABLE
852 if (gotasync)
853 {
854 int i;
855 gotasync = 0;
856
857 for (i = asynccnt; i--; )
858 if (asyncs [i]->sent)
859 {
860 asyncs [i]->sent = 0;
861 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
862 }
863 }
864#endif
775} 865}
776 866
777/*****************************************************************************/ 867/*****************************************************************************/
778 868
869static void
870ev_sighandler (int signum)
871{
872#if EV_MULTIPLICITY
873 struct ev_loop *loop = &default_loop_struct;
874#endif
875
876#if _WIN32
877 signal (signum, ev_sighandler);
878#endif
879
880 signals [signum - 1].gotsig = 1;
881 evpipe_write (EV_A_ &gotsig);
882}
883
884void noinline
885ev_feed_signal_event (EV_P_ int signum)
886{
887 WL w;
888
889#if EV_MULTIPLICITY
890 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
891#endif
892
893 --signum;
894
895 if (signum < 0 || signum >= signalmax)
896 return;
897
898 signals [signum].gotsig = 0;
899
900 for (w = signals [signum].head; w; w = w->next)
901 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
902}
903
904/*****************************************************************************/
905
779static ev_child *childs [EV_PID_HASHSIZE]; 906static WL childs [EV_PID_HASHSIZE];
780 907
781#ifndef _WIN32 908#ifndef _WIN32
782 909
783static ev_signal childev; 910static ev_signal childev;
784 911
912#ifndef WIFCONTINUED
913# define WIFCONTINUED(status) 0
914#endif
915
785void inline_speed 916void inline_speed
786child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 917child_reap (EV_P_ int chain, int pid, int status)
787{ 918{
788 ev_child *w; 919 ev_child *w;
920 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
789 921
790 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 922 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
923 {
791 if (w->pid == pid || !w->pid) 924 if ((w->pid == pid || !w->pid)
925 && (!traced || (w->flags & 1)))
792 { 926 {
793 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 927 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
794 w->rpid = pid; 928 w->rpid = pid;
795 w->rstatus = status; 929 w->rstatus = status;
796 ev_feed_event (EV_A_ (W)w, EV_CHILD); 930 ev_feed_event (EV_A_ (W)w, EV_CHILD);
797 } 931 }
932 }
798} 933}
799 934
800#ifndef WCONTINUED 935#ifndef WCONTINUED
801# define WCONTINUED 0 936# define WCONTINUED 0
802#endif 937#endif
811 if (!WCONTINUED 946 if (!WCONTINUED
812 || errno != EINVAL 947 || errno != EINVAL
813 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 948 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
814 return; 949 return;
815 950
816 /* make sure we are called again until all childs have been reaped */ 951 /* make sure we are called again until all children have been reaped */
817 /* we need to do it this way so that the callback gets called before we continue */ 952 /* we need to do it this way so that the callback gets called before we continue */
818 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 953 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
819 954
820 child_reap (EV_A_ sw, pid, pid, status); 955 child_reap (EV_A_ pid, pid, status);
821 if (EV_PID_HASHSIZE > 1) 956 if (EV_PID_HASHSIZE > 1)
822 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 957 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
823} 958}
824 959
825#endif 960#endif
826 961
827/*****************************************************************************/ 962/*****************************************************************************/
899} 1034}
900 1035
901unsigned int 1036unsigned int
902ev_embeddable_backends (void) 1037ev_embeddable_backends (void)
903{ 1038{
904 return EVBACKEND_EPOLL 1039 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
905 | EVBACKEND_KQUEUE 1040
906 | EVBACKEND_PORT; 1041 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1042 /* please fix it and tell me how to detect the fix */
1043 flags &= ~EVBACKEND_EPOLL;
1044
1045 return flags;
907} 1046}
908 1047
909unsigned int 1048unsigned int
910ev_backend (EV_P) 1049ev_backend (EV_P)
911{ 1050{
914 1053
915unsigned int 1054unsigned int
916ev_loop_count (EV_P) 1055ev_loop_count (EV_P)
917{ 1056{
918 return loop_count; 1057 return loop_count;
1058}
1059
1060void
1061ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1062{
1063 io_blocktime = interval;
1064}
1065
1066void
1067ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1068{
1069 timeout_blocktime = interval;
919} 1070}
920 1071
921static void noinline 1072static void noinline
922loop_init (EV_P_ unsigned int flags) 1073loop_init (EV_P_ unsigned int flags)
923{ 1074{
929 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1080 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
930 have_monotonic = 1; 1081 have_monotonic = 1;
931 } 1082 }
932#endif 1083#endif
933 1084
934 ev_rt_now = ev_time (); 1085 ev_rt_now = ev_time ();
935 mn_now = get_clock (); 1086 mn_now = get_clock ();
936 now_floor = mn_now; 1087 now_floor = mn_now;
937 rtmn_diff = ev_rt_now - mn_now; 1088 rtmn_diff = ev_rt_now - mn_now;
1089
1090 io_blocktime = 0.;
1091 timeout_blocktime = 0.;
1092 backend = 0;
1093 backend_fd = -1;
1094 gotasync = 0;
1095#if EV_USE_INOTIFY
1096 fs_fd = -2;
1097#endif
938 1098
939 /* pid check not overridable via env */ 1099 /* pid check not overridable via env */
940#ifndef _WIN32 1100#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK) 1101 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid (); 1102 curpid = getpid ();
948 flags = atoi (getenv ("LIBEV_FLAGS")); 1108 flags = atoi (getenv ("LIBEV_FLAGS"));
949 1109
950 if (!(flags & 0x0000ffffUL)) 1110 if (!(flags & 0x0000ffffUL))
951 flags |= ev_recommended_backends (); 1111 flags |= ev_recommended_backends ();
952 1112
953 backend = 0;
954 backend_fd = -1;
955#if EV_USE_INOTIFY
956 fs_fd = -2;
957#endif
958
959#if EV_USE_PORT 1113#if EV_USE_PORT
960 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1114 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
961#endif 1115#endif
962#if EV_USE_KQUEUE 1116#if EV_USE_KQUEUE
963 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1117 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
970#endif 1124#endif
971#if EV_USE_SELECT 1125#if EV_USE_SELECT
972 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1126 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
973#endif 1127#endif
974 1128
975 ev_init (&sigev, sigcb); 1129 ev_init (&pipeev, pipecb);
976 ev_set_priority (&sigev, EV_MAXPRI); 1130 ev_set_priority (&pipeev, EV_MAXPRI);
977 } 1131 }
978} 1132}
979 1133
980static void noinline 1134static void noinline
981loop_destroy (EV_P) 1135loop_destroy (EV_P)
982{ 1136{
983 int i; 1137 int i;
1138
1139 if (ev_is_active (&pipeev))
1140 {
1141 ev_ref (EV_A); /* signal watcher */
1142 ev_io_stop (EV_A_ &pipeev);
1143
1144 close (evpipe [0]); evpipe [0] = 0;
1145 close (evpipe [1]); evpipe [1] = 0;
1146 }
984 1147
985#if EV_USE_INOTIFY 1148#if EV_USE_INOTIFY
986 if (fs_fd >= 0) 1149 if (fs_fd >= 0)
987 close (fs_fd); 1150 close (fs_fd);
988#endif 1151#endif
1011 array_free (pending, [i]); 1174 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE 1175#if EV_IDLE_ENABLE
1013 array_free (idle, [i]); 1176 array_free (idle, [i]);
1014#endif 1177#endif
1015 } 1178 }
1179
1180 ev_free (anfds); anfdmax = 0;
1016 1181
1017 /* have to use the microsoft-never-gets-it-right macro */ 1182 /* have to use the microsoft-never-gets-it-right macro */
1018 array_free (fdchange, EMPTY); 1183 array_free (fdchange, EMPTY);
1019 array_free (timer, EMPTY); 1184 array_free (timer, EMPTY);
1020#if EV_PERIODIC_ENABLE 1185#if EV_PERIODIC_ENABLE
1021 array_free (periodic, EMPTY); 1186 array_free (periodic, EMPTY);
1022#endif 1187#endif
1188#if EV_FORK_ENABLE
1189 array_free (fork, EMPTY);
1190#endif
1023 array_free (prepare, EMPTY); 1191 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1192 array_free (check, EMPTY);
1193#if EV_ASYNC_ENABLE
1194 array_free (async, EMPTY);
1195#endif
1025 1196
1026 backend = 0; 1197 backend = 0;
1027} 1198}
1028 1199
1029void inline_size infy_fork (EV_P); 1200void inline_size infy_fork (EV_P);
1042#endif 1213#endif
1043#if EV_USE_INOTIFY 1214#if EV_USE_INOTIFY
1044 infy_fork (EV_A); 1215 infy_fork (EV_A);
1045#endif 1216#endif
1046 1217
1047 if (ev_is_active (&sigev)) 1218 if (ev_is_active (&pipeev))
1048 { 1219 {
1049 /* default loop */ 1220 /* this "locks" the handlers against writing to the pipe */
1221 /* while we modify the fd vars */
1222 gotsig = 1;
1223#if EV_ASYNC_ENABLE
1224 gotasync = 1;
1225#endif
1050 1226
1051 ev_ref (EV_A); 1227 ev_ref (EV_A);
1052 ev_io_stop (EV_A_ &sigev); 1228 ev_io_stop (EV_A_ &pipeev);
1053 close (sigpipe [0]); 1229 close (evpipe [0]);
1054 close (sigpipe [1]); 1230 close (evpipe [1]);
1055 1231
1056 while (pipe (sigpipe))
1057 syserr ("(libev) error creating pipe");
1058
1059 siginit (EV_A); 1232 evpipe_init (EV_A);
1233 /* now iterate over everything, in case we missed something */
1234 pipecb (EV_A_ &pipeev, EV_READ);
1060 } 1235 }
1061 1236
1062 postfork = 0; 1237 postfork = 0;
1063} 1238}
1064 1239
1086} 1261}
1087 1262
1088void 1263void
1089ev_loop_fork (EV_P) 1264ev_loop_fork (EV_P)
1090{ 1265{
1091 postfork = 1; 1266 postfork = 1; /* must be in line with ev_default_fork */
1092} 1267}
1093 1268
1094#endif 1269#endif
1095 1270
1096#if EV_MULTIPLICITY 1271#if EV_MULTIPLICITY
1099#else 1274#else
1100int 1275int
1101ev_default_loop (unsigned int flags) 1276ev_default_loop (unsigned int flags)
1102#endif 1277#endif
1103{ 1278{
1104 if (sigpipe [0] == sigpipe [1])
1105 if (pipe (sigpipe))
1106 return 0;
1107
1108 if (!ev_default_loop_ptr) 1279 if (!ev_default_loop_ptr)
1109 { 1280 {
1110#if EV_MULTIPLICITY 1281#if EV_MULTIPLICITY
1111 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1282 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1112#else 1283#else
1115 1286
1116 loop_init (EV_A_ flags); 1287 loop_init (EV_A_ flags);
1117 1288
1118 if (ev_backend (EV_A)) 1289 if (ev_backend (EV_A))
1119 { 1290 {
1120 siginit (EV_A);
1121
1122#ifndef _WIN32 1291#ifndef _WIN32
1123 ev_signal_init (&childev, childcb, SIGCHLD); 1292 ev_signal_init (&childev, childcb, SIGCHLD);
1124 ev_set_priority (&childev, EV_MAXPRI); 1293 ev_set_priority (&childev, EV_MAXPRI);
1125 ev_signal_start (EV_A_ &childev); 1294 ev_signal_start (EV_A_ &childev);
1126 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1295 ev_unref (EV_A); /* child watcher should not keep loop alive */
1143#ifndef _WIN32 1312#ifndef _WIN32
1144 ev_ref (EV_A); /* child watcher */ 1313 ev_ref (EV_A); /* child watcher */
1145 ev_signal_stop (EV_A_ &childev); 1314 ev_signal_stop (EV_A_ &childev);
1146#endif 1315#endif
1147 1316
1148 ev_ref (EV_A); /* signal watcher */
1149 ev_io_stop (EV_A_ &sigev);
1150
1151 close (sigpipe [0]); sigpipe [0] = 0;
1152 close (sigpipe [1]); sigpipe [1] = 0;
1153
1154 loop_destroy (EV_A); 1317 loop_destroy (EV_A);
1155} 1318}
1156 1319
1157void 1320void
1158ev_default_fork (void) 1321ev_default_fork (void)
1160#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1161 struct ev_loop *loop = ev_default_loop_ptr; 1324 struct ev_loop *loop = ev_default_loop_ptr;
1162#endif 1325#endif
1163 1326
1164 if (backend) 1327 if (backend)
1165 postfork = 1; 1328 postfork = 1; /* must be in line with ev_loop_fork */
1166} 1329}
1167 1330
1168/*****************************************************************************/ 1331/*****************************************************************************/
1169 1332
1170void 1333void
1196void inline_size 1359void inline_size
1197timers_reify (EV_P) 1360timers_reify (EV_P)
1198{ 1361{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1362 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1363 {
1201 ev_timer *w = timers [0]; 1364 ev_timer *w = (ev_timer *)timers [0];
1202 1365
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1366 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1367
1205 /* first reschedule or stop timer */ 1368 /* first reschedule or stop timer */
1206 if (w->repeat) 1369 if (w->repeat)
1209 1372
1210 ((WT)w)->at += w->repeat; 1373 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1374 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1375 ((WT)w)->at = mn_now;
1213 1376
1214 downheap ((WT *)timers, timercnt, 0); 1377 downheap (timers, timercnt, 0);
1215 } 1378 }
1216 else 1379 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1380 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1381
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1382 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1224void inline_size 1387void inline_size
1225periodics_reify (EV_P) 1388periodics_reify (EV_P)
1226{ 1389{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1390 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1391 {
1229 ev_periodic *w = periodics [0]; 1392 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1393
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1394 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1395
1233 /* first reschedule or stop timer */ 1396 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1397 if (w->reschedule_cb)
1235 { 1398 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1399 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1400 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1401 downheap (periodics, periodiccnt, 0);
1239 } 1402 }
1240 else if (w->interval) 1403 else if (w->interval)
1241 { 1404 {
1242 ((WT)w)->at = w->offset + floor ((ev_rt_now - w->offset) / w->interval + 1.) * w->interval; 1405 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1406 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1407 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1408 downheap (periodics, periodiccnt, 0);
1245 } 1409 }
1246 else 1410 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1411 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1412
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1413 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1256 int i; 1420 int i;
1257 1421
1258 /* adjust periodics after time jump */ 1422 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1423 for (i = 0; i < periodiccnt; ++i)
1260 { 1424 {
1261 ev_periodic *w = periodics [i]; 1425 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1426
1263 if (w->reschedule_cb) 1427 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1428 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1429 else if (w->interval)
1266 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1430 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1431 }
1268 1432
1269 /* now rebuild the heap */ 1433 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1434 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1435 downheap (periodics, periodiccnt, i);
1272} 1436}
1273#endif 1437#endif
1274 1438
1275#if EV_IDLE_ENABLE 1439#if EV_IDLE_ENABLE
1276void inline_size 1440void inline_size
1293 } 1457 }
1294 } 1458 }
1295} 1459}
1296#endif 1460#endif
1297 1461
1298int inline_size 1462void inline_speed
1299time_update_monotonic (EV_P) 1463time_update (EV_P_ ev_tstamp max_block)
1300{ 1464{
1465 int i;
1466
1467#if EV_USE_MONOTONIC
1468 if (expect_true (have_monotonic))
1469 {
1470 ev_tstamp odiff = rtmn_diff;
1471
1301 mn_now = get_clock (); 1472 mn_now = get_clock ();
1302 1473
1474 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1475 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1476 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1477 {
1305 ev_rt_now = rtmn_diff + mn_now; 1478 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1479 return;
1307 } 1480 }
1308 else 1481
1309 {
1310 now_floor = mn_now; 1482 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1483 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1484
1316void inline_size 1485 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1486 * on the choice of "4": one iteration isn't enough,
1318{ 1487 * in case we get preempted during the calls to
1319 int i; 1488 * ev_time and get_clock. a second call is almost guaranteed
1320 1489 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1490 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1491 * in the unlikely event of having been preempted here.
1323 { 1492 */
1324 if (time_update_monotonic (EV_A)) 1493 for (i = 4; --i; )
1325 { 1494 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1495 rtmn_diff = ev_rt_now - mn_now;
1339 1496
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1497 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1498 return; /* all is well */
1342 1499
1343 ev_rt_now = ev_time (); 1500 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1501 mn_now = get_clock ();
1345 now_floor = mn_now; 1502 now_floor = mn_now;
1346 } 1503 }
1347 1504
1348# if EV_PERIODIC_ENABLE 1505# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1506 periodics_reschedule (EV_A);
1350# endif 1507# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1508 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1509 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1510 }
1355 else 1511 else
1356#endif 1512#endif
1357 { 1513 {
1358 ev_rt_now = ev_time (); 1514 ev_rt_now = ev_time ();
1359 1515
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1516 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1517 {
1362#if EV_PERIODIC_ENABLE 1518#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1519 periodics_reschedule (EV_A);
1364#endif 1520#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1521 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1522 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1523 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1524 }
1370 1525
1387static int loop_done; 1542static int loop_done;
1388 1543
1389void 1544void
1390ev_loop (EV_P_ int flags) 1545ev_loop (EV_P_ int flags)
1391{ 1546{
1392 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1547 loop_done = EVUNLOOP_CANCEL;
1393 ? EVUNLOOP_ONE
1394 : EVUNLOOP_CANCEL;
1395 1548
1396 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1549 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1397 1550
1398 do 1551 do
1399 { 1552 {
1433 /* update fd-related kernel structures */ 1586 /* update fd-related kernel structures */
1434 fd_reify (EV_A); 1587 fd_reify (EV_A);
1435 1588
1436 /* calculate blocking time */ 1589 /* calculate blocking time */
1437 { 1590 {
1438 ev_tstamp block; 1591 ev_tstamp waittime = 0.;
1592 ev_tstamp sleeptime = 0.;
1439 1593
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1594 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1441 block = 0.; /* do not block at all */
1442 else
1443 { 1595 {
1444 /* update time to cancel out callback processing overhead */ 1596 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 1597 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1598
1455 block = MAX_BLOCKTIME; 1599 waittime = MAX_BLOCKTIME;
1456 1600
1457 if (timercnt) 1601 if (timercnt)
1458 { 1602 {
1459 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1603 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1460 if (block > to) block = to; 1604 if (waittime > to) waittime = to;
1461 } 1605 }
1462 1606
1463#if EV_PERIODIC_ENABLE 1607#if EV_PERIODIC_ENABLE
1464 if (periodiccnt) 1608 if (periodiccnt)
1465 { 1609 {
1466 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1610 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1467 if (block > to) block = to; 1611 if (waittime > to) waittime = to;
1468 } 1612 }
1469#endif 1613#endif
1470 1614
1471 if (expect_false (block < 0.)) block = 0.; 1615 if (expect_false (waittime < timeout_blocktime))
1616 waittime = timeout_blocktime;
1617
1618 sleeptime = waittime - backend_fudge;
1619
1620 if (expect_true (sleeptime > io_blocktime))
1621 sleeptime = io_blocktime;
1622
1623 if (sleeptime)
1624 {
1625 ev_sleep (sleeptime);
1626 waittime -= sleeptime;
1627 }
1472 } 1628 }
1473 1629
1474 ++loop_count; 1630 ++loop_count;
1475 backend_poll (EV_A_ block); 1631 backend_poll (EV_A_ waittime);
1632
1633 /* update ev_rt_now, do magic */
1634 time_update (EV_A_ waittime + sleeptime);
1476 } 1635 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1636
1481 /* queue pending timers and reschedule them */ 1637 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1638 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1639#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1640 periodics_reify (EV_A); /* absolute timers called first */
1492 /* queue check watchers, to be executed first */ 1648 /* queue check watchers, to be executed first */
1493 if (expect_false (checkcnt)) 1649 if (expect_false (checkcnt))
1494 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1650 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1495 1651
1496 call_pending (EV_A); 1652 call_pending (EV_A);
1497
1498 } 1653 }
1499 while (expect_true (activecnt && !loop_done)); 1654 while (expect_true (
1655 activecnt
1656 && !loop_done
1657 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1658 ));
1500 1659
1501 if (loop_done == EVUNLOOP_ONE) 1660 if (loop_done == EVUNLOOP_ONE)
1502 loop_done = EVUNLOOP_CANCEL; 1661 loop_done = EVUNLOOP_CANCEL;
1503} 1662}
1504 1663
1595 1754
1596 assert (("ev_io_start called with negative fd", fd >= 0)); 1755 assert (("ev_io_start called with negative fd", fd >= 0));
1597 1756
1598 ev_start (EV_A_ (W)w, 1); 1757 ev_start (EV_A_ (W)w, 1);
1599 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1758 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1600 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1759 wlist_add (&anfds[fd].head, (WL)w);
1601 1760
1602 fd_change (EV_A_ fd); 1761 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1762 w->events &= ~EV_IOFDSET;
1603} 1763}
1604 1764
1605void noinline 1765void noinline
1606ev_io_stop (EV_P_ ev_io *w) 1766ev_io_stop (EV_P_ ev_io *w)
1607{ 1767{
1609 if (expect_false (!ev_is_active (w))) 1769 if (expect_false (!ev_is_active (w)))
1610 return; 1770 return;
1611 1771
1612 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));
1613 1773
1614 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1774 wlist_del (&anfds[w->fd].head, (WL)w);
1615 ev_stop (EV_A_ (W)w); 1775 ev_stop (EV_A_ (W)w);
1616 1776
1617 fd_change (EV_A_ w->fd); 1777 fd_change (EV_A_ w->fd, 1);
1618} 1778}
1619 1779
1620void noinline 1780void noinline
1621ev_timer_start (EV_P_ ev_timer *w) 1781ev_timer_start (EV_P_ ev_timer *w)
1622{ 1782{
1626 ((WT)w)->at += mn_now; 1786 ((WT)w)->at += mn_now;
1627 1787
1628 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.));
1629 1789
1630 ev_start (EV_A_ (W)w, ++timercnt); 1790 ev_start (EV_A_ (W)w, ++timercnt);
1631 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1791 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1632 timers [timercnt - 1] = w; 1792 timers [timercnt - 1] = (WT)w;
1633 upheap ((WT *)timers, timercnt - 1); 1793 upheap (timers, timercnt - 1);
1634 1794
1635 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1795 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1636} 1796}
1637 1797
1638void noinline 1798void noinline
1640{ 1800{
1641 clear_pending (EV_A_ (W)w); 1801 clear_pending (EV_A_ (W)w);
1642 if (expect_false (!ev_is_active (w))) 1802 if (expect_false (!ev_is_active (w)))
1643 return; 1803 return;
1644 1804
1645 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1805 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1646 1806
1647 { 1807 {
1648 int active = ((W)w)->active; 1808 int active = ((W)w)->active;
1649 1809
1650 if (expect_true (--active < --timercnt)) 1810 if (expect_true (--active < --timercnt))
1651 { 1811 {
1652 timers [active] = timers [timercnt]; 1812 timers [active] = timers [timercnt];
1653 adjustheap ((WT *)timers, timercnt, active); 1813 adjustheap (timers, timercnt, active);
1654 } 1814 }
1655 } 1815 }
1656 1816
1657 ((WT)w)->at -= mn_now; 1817 ((WT)w)->at -= mn_now;
1658 1818
1665 if (ev_is_active (w)) 1825 if (ev_is_active (w))
1666 { 1826 {
1667 if (w->repeat) 1827 if (w->repeat)
1668 { 1828 {
1669 ((WT)w)->at = mn_now + w->repeat; 1829 ((WT)w)->at = mn_now + w->repeat;
1670 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1830 adjustheap (timers, timercnt, ((W)w)->active - 1);
1671 } 1831 }
1672 else 1832 else
1673 ev_timer_stop (EV_A_ w); 1833 ev_timer_stop (EV_A_ w);
1674 } 1834 }
1675 else if (w->repeat) 1835 else if (w->repeat)
1696 } 1856 }
1697 else 1857 else
1698 ((WT)w)->at = w->offset; 1858 ((WT)w)->at = w->offset;
1699 1859
1700 ev_start (EV_A_ (W)w, ++periodiccnt); 1860 ev_start (EV_A_ (W)w, ++periodiccnt);
1701 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1861 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1702 periodics [periodiccnt - 1] = w; 1862 periodics [periodiccnt - 1] = (WT)w;
1703 upheap ((WT *)periodics, periodiccnt - 1); 1863 upheap (periodics, periodiccnt - 1);
1704 1864
1705 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1865 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1706} 1866}
1707 1867
1708void noinline 1868void noinline
1710{ 1870{
1711 clear_pending (EV_A_ (W)w); 1871 clear_pending (EV_A_ (W)w);
1712 if (expect_false (!ev_is_active (w))) 1872 if (expect_false (!ev_is_active (w)))
1713 return; 1873 return;
1714 1874
1715 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1875 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1716 1876
1717 { 1877 {
1718 int active = ((W)w)->active; 1878 int active = ((W)w)->active;
1719 1879
1720 if (expect_true (--active < --periodiccnt)) 1880 if (expect_true (--active < --periodiccnt))
1721 { 1881 {
1722 periodics [active] = periodics [periodiccnt]; 1882 periodics [active] = periodics [periodiccnt];
1723 adjustheap ((WT *)periodics, periodiccnt, active); 1883 adjustheap (periodics, periodiccnt, active);
1724 } 1884 }
1725 } 1885 }
1726 1886
1727 ev_stop (EV_A_ (W)w); 1887 ev_stop (EV_A_ (W)w);
1728} 1888}
1749 if (expect_false (ev_is_active (w))) 1909 if (expect_false (ev_is_active (w)))
1750 return; 1910 return;
1751 1911
1752 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));
1753 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
1754 ev_start (EV_A_ (W)w, 1); 1930 ev_start (EV_A_ (W)w, 1);
1755 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1756 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1931 wlist_add (&signals [w->signum - 1].head, (WL)w);
1757 1932
1758 if (!((WL)w)->next) 1933 if (!((WL)w)->next)
1759 { 1934 {
1760#if _WIN32 1935#if _WIN32
1761 signal (w->signum, sighandler); 1936 signal (w->signum, ev_sighandler);
1762#else 1937#else
1763 struct sigaction sa; 1938 struct sigaction sa;
1764 sa.sa_handler = sighandler; 1939 sa.sa_handler = ev_sighandler;
1765 sigfillset (&sa.sa_mask); 1940 sigfillset (&sa.sa_mask);
1766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1941 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1767 sigaction (w->signum, &sa, 0); 1942 sigaction (w->signum, &sa, 0);
1768#endif 1943#endif
1769 } 1944 }
1774{ 1949{
1775 clear_pending (EV_A_ (W)w); 1950 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1951 if (expect_false (!ev_is_active (w)))
1777 return; 1952 return;
1778 1953
1779 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1954 wlist_del (&signals [w->signum - 1].head, (WL)w);
1780 ev_stop (EV_A_ (W)w); 1955 ev_stop (EV_A_ (W)w);
1781 1956
1782 if (!signals [w->signum - 1].head) 1957 if (!signals [w->signum - 1].head)
1783 signal (w->signum, SIG_DFL); 1958 signal (w->signum, SIG_DFL);
1784} 1959}
1791#endif 1966#endif
1792 if (expect_false (ev_is_active (w))) 1967 if (expect_false (ev_is_active (w)))
1793 return; 1968 return;
1794 1969
1795 ev_start (EV_A_ (W)w, 1); 1970 ev_start (EV_A_ (W)w, 1);
1796 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1971 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1797} 1972}
1798 1973
1799void 1974void
1800ev_child_stop (EV_P_ ev_child *w) 1975ev_child_stop (EV_P_ ev_child *w)
1801{ 1976{
1802 clear_pending (EV_A_ (W)w); 1977 clear_pending (EV_A_ (W)w);
1803 if (expect_false (!ev_is_active (w))) 1978 if (expect_false (!ev_is_active (w)))
1804 return; 1979 return;
1805 1980
1806 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1981 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1807 ev_stop (EV_A_ (W)w); 1982 ev_stop (EV_A_ (W)w);
1808} 1983}
1809 1984
1810#if EV_STAT_ENABLE 1985#if EV_STAT_ENABLE
1811 1986
2153 2328
2154#if EV_EMBED_ENABLE 2329#if EV_EMBED_ENABLE
2155void noinline 2330void noinline
2156ev_embed_sweep (EV_P_ ev_embed *w) 2331ev_embed_sweep (EV_P_ ev_embed *w)
2157{ 2332{
2158 ev_loop (w->loop, EVLOOP_NONBLOCK); 2333 ev_loop (w->other, EVLOOP_NONBLOCK);
2159} 2334}
2160 2335
2161static void 2336static void
2162embed_cb (EV_P_ ev_io *io, int revents) 2337embed_io_cb (EV_P_ ev_io *io, int revents)
2163{ 2338{
2164 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2339 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2165 2340
2166 if (ev_cb (w)) 2341 if (ev_cb (w))
2167 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2342 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2168 else 2343 else
2169 ev_embed_sweep (loop, w); 2344 ev_loop (w->other, EVLOOP_NONBLOCK);
2170} 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
2171 2370
2172void 2371void
2173ev_embed_start (EV_P_ ev_embed *w) 2372ev_embed_start (EV_P_ ev_embed *w)
2174{ 2373{
2175 if (expect_false (ev_is_active (w))) 2374 if (expect_false (ev_is_active (w)))
2176 return; 2375 return;
2177 2376
2178 { 2377 {
2179 struct ev_loop *loop = w->loop; 2378 struct ev_loop *loop = w->other;
2180 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 ()));
2181 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2380 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2182 } 2381 }
2183 2382
2184 ev_set_priority (&w->io, ev_priority (w)); 2383 ev_set_priority (&w->io, ev_priority (w));
2185 ev_io_start (EV_A_ &w->io); 2384 ev_io_start (EV_A_ &w->io);
2186 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
2187 ev_start (EV_A_ (W)w, 1); 2392 ev_start (EV_A_ (W)w, 1);
2188} 2393}
2189 2394
2190void 2395void
2191ev_embed_stop (EV_P_ ev_embed *w) 2396ev_embed_stop (EV_P_ ev_embed *w)
2193 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2194 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2195 return; 2400 return;
2196 2401
2197 ev_io_stop (EV_A_ &w->io); 2402 ev_io_stop (EV_A_ &w->io);
2403 ev_prepare_stop (EV_A_ &w->prepare);
2198 2404
2199 ev_stop (EV_A_ (W)w); 2405 ev_stop (EV_A_ (W)w);
2200} 2406}
2201#endif 2407#endif
2202 2408
2227 2433
2228 ev_stop (EV_A_ (W)w); 2434 ev_stop (EV_A_ (W)w);
2229} 2435}
2230#endif 2436#endif
2231 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_ &gotasync);
2473}
2474#endif
2475
2232/*****************************************************************************/ 2476/*****************************************************************************/
2233 2477
2234struct ev_once 2478struct ev_once
2235{ 2479{
2236 ev_io io; 2480 ev_io io;
2291 ev_timer_set (&once->to, timeout, 0.); 2535 ev_timer_set (&once->to, timeout, 0.);
2292 ev_timer_start (EV_A_ &once->to); 2536 ev_timer_start (EV_A_ &once->to);
2293 } 2537 }
2294} 2538}
2295 2539
2540#if EV_MULTIPLICITY
2541 #include "ev_wrap.h"
2542#endif
2543
2296#ifdef __cplusplus 2544#ifdef __cplusplus
2297} 2545}
2298#endif 2546#endif
2299 2547

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines