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

Comparing libev/ev.c (file contents):
Revision 1.169 by root, Sat Dec 8 14:27:39 2007 UTC vs.
Revision 1.209 by root, Tue Feb 5 23:56:33 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 (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
418 } 486 }
419 487
420 return ncur; 488 return ncur;
421} 489}
422 490
423inline_speed void * 491static noinline void *
424array_realloc (int elem, void *base, int *cur, int cnt) 492array_realloc (int elem, void *base, int *cur, int cnt)
425{ 493{
426 *cur = array_nextsize (elem, *cur, cnt); 494 *cur = array_nextsize (elem, *cur, cnt);
427 return ev_realloc (base, elem * *cur); 495 return ev_realloc (base, elem * *cur);
428} 496}
453 521
454void noinline 522void noinline
455ev_feed_event (EV_P_ void *w, int revents) 523ev_feed_event (EV_P_ void *w, int revents)
456{ 524{
457 W w_ = (W)w; 525 W w_ = (W)w;
526 int pri = ABSPRI (w_);
458 527
459 if (expect_false (w_->pending)) 528 if (expect_false (w_->pending))
529 pendings [pri][w_->pending - 1].events |= revents;
530 else
460 { 531 {
532 w_->pending = ++pendingcnt [pri];
533 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
534 pendings [pri][w_->pending - 1].w = w_;
461 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 535 pendings [pri][w_->pending - 1].events = revents;
462 return;
463 } 536 }
464
465 w_->pending = ++pendingcnt [ABSPRI (w_)];
466 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
467 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
468 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
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 789
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
754void inline_size 790void inline_speed
755fd_intern (int fd) 791fd_intern (int fd)
756{ 792{
757#ifdef _WIN32 793#ifdef _WIN32
758 int arg = 1; 794 int arg = 1;
759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 795 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
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); /* child watcher should not keep loop alive */
816 }
817}
818
819void inline_size
820evpipe_write (EV_P_ int sig, int async)
821{
822 if (!(gotasync || gotsig))
823 {
824 int old_errno = errno;
825
826 if (sig) gotsig = 1;
827 if (async) gotasync = 1;
828
829 write (evpipe [1], &old_errno, 1);
830 errno = old_errno;
831 }
832}
833
834static void
835pipecb (EV_P_ ev_io *iow, int revents)
836{
837 {
838 int dummy;
839 read (evpipe [0], &dummy, 1);
840 }
841
842 if (gotsig)
843 {
844 int signum;
845 gotsig = 0;
846
847 for (signum = signalmax; signum--; )
848 if (signals [signum].gotsig)
849 ev_feed_signal_event (EV_A_ signum + 1);
850 }
851
852#if EV_ASYNC_ENABLE
853 if (gotasync)
854 {
855 int i;
856 gotasync = 0;
857
858 for (i = asynccnt; i--; )
859 if (asyncs [i]->sent)
860 {
861 asyncs [i]->sent = 0;
862 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
863 }
864 }
865#endif
775} 866}
776 867
777/*****************************************************************************/ 868/*****************************************************************************/
778 869
870static void
871sighandler (int signum)
872{
873#if EV_MULTIPLICITY
874 struct ev_loop *loop = &default_loop_struct;
875#endif
876
877#if _WIN32
878 signal (signum, sighandler);
879#endif
880
881 signals [signum - 1].gotsig = 1;
882 evpipe_write (EV_A_ 1, 0);
883}
884
885void noinline
886ev_feed_signal_event (EV_P_ int signum)
887{
888 WL w;
889
890#if EV_MULTIPLICITY
891 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
892#endif
893
894 --signum;
895
896 if (signum < 0 || signum >= signalmax)
897 return;
898
899 signals [signum].gotsig = 0;
900
901 for (w = signals [signum].head; w; w = w->next)
902 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
903}
904
905/*****************************************************************************/
906
779static ev_child *childs [EV_PID_HASHSIZE]; 907static WL childs [EV_PID_HASHSIZE];
780 908
781#ifndef _WIN32 909#ifndef _WIN32
782 910
783static ev_signal childev; 911static ev_signal childev;
912
913#ifndef WIFCONTINUED
914# define WIFCONTINUED(status) 0
915#endif
784 916
785void inline_speed 917void inline_speed
786child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 918child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
787{ 919{
788 ev_child *w; 920 ev_child *w;
921 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
789 922
790 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 923 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
924 {
791 if (w->pid == pid || !w->pid) 925 if ((w->pid == pid || !w->pid)
926 && (!traced || (w->flags & 1)))
792 { 927 {
793 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 928 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
794 w->rpid = pid; 929 w->rpid = pid;
795 w->rstatus = status; 930 w->rstatus = status;
796 ev_feed_event (EV_A_ (W)w, EV_CHILD); 931 ev_feed_event (EV_A_ (W)w, EV_CHILD);
797 } 932 }
933 }
798} 934}
799 935
800#ifndef WCONTINUED 936#ifndef WCONTINUED
801# define WCONTINUED 0 937# define WCONTINUED 0
802#endif 938#endif
899} 1035}
900 1036
901unsigned int 1037unsigned int
902ev_embeddable_backends (void) 1038ev_embeddable_backends (void)
903{ 1039{
904 return EVBACKEND_EPOLL 1040 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
905 | EVBACKEND_KQUEUE 1041
906 | EVBACKEND_PORT; 1042 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1043 /* please fix it and tell me how to detect the fix */
1044 flags &= ~EVBACKEND_EPOLL;
1045
1046 return flags;
907} 1047}
908 1048
909unsigned int 1049unsigned int
910ev_backend (EV_P) 1050ev_backend (EV_P)
911{ 1051{
914 1054
915unsigned int 1055unsigned int
916ev_loop_count (EV_P) 1056ev_loop_count (EV_P)
917{ 1057{
918 return loop_count; 1058 return loop_count;
1059}
1060
1061void
1062ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1063{
1064 io_blocktime = interval;
1065}
1066
1067void
1068ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1069{
1070 timeout_blocktime = interval;
919} 1071}
920 1072
921static void noinline 1073static void noinline
922loop_init (EV_P_ unsigned int flags) 1074loop_init (EV_P_ unsigned int flags)
923{ 1075{
929 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1081 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
930 have_monotonic = 1; 1082 have_monotonic = 1;
931 } 1083 }
932#endif 1084#endif
933 1085
934 ev_rt_now = ev_time (); 1086 ev_rt_now = ev_time ();
935 mn_now = get_clock (); 1087 mn_now = get_clock ();
936 now_floor = mn_now; 1088 now_floor = mn_now;
937 rtmn_diff = ev_rt_now - mn_now; 1089 rtmn_diff = ev_rt_now - mn_now;
1090
1091 io_blocktime = 0.;
1092 timeout_blocktime = 0.;
1093 backend = 0;
1094 backend_fd = -1;
1095 gotasync = 0;
1096#if EV_USE_INOTIFY
1097 fs_fd = -2;
1098#endif
938 1099
939 /* pid check not overridable via env */ 1100 /* pid check not overridable via env */
940#ifndef _WIN32 1101#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK) 1102 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid (); 1103 curpid = getpid ();
948 flags = atoi (getenv ("LIBEV_FLAGS")); 1109 flags = atoi (getenv ("LIBEV_FLAGS"));
949 1110
950 if (!(flags & 0x0000ffffUL)) 1111 if (!(flags & 0x0000ffffUL))
951 flags |= ev_recommended_backends (); 1112 flags |= ev_recommended_backends ();
952 1113
953 backend = 0;
954 backend_fd = -1;
955#if EV_USE_INOTIFY
956 fs_fd = -2;
957#endif
958
959#if EV_USE_PORT 1114#if EV_USE_PORT
960 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1115 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
961#endif 1116#endif
962#if EV_USE_KQUEUE 1117#if EV_USE_KQUEUE
963 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1118 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
970#endif 1125#endif
971#if EV_USE_SELECT 1126#if EV_USE_SELECT
972 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1127 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
973#endif 1128#endif
974 1129
975 ev_init (&sigev, sigcb); 1130 ev_init (&pipeev, pipecb);
976 ev_set_priority (&sigev, EV_MAXPRI); 1131 ev_set_priority (&pipeev, EV_MAXPRI);
977 } 1132 }
978} 1133}
979 1134
980static void noinline 1135static void noinline
981loop_destroy (EV_P) 1136loop_destroy (EV_P)
982{ 1137{
983 int i; 1138 int i;
1139
1140 if (ev_is_active (&pipeev))
1141 {
1142 ev_ref (EV_A); /* signal watcher */
1143 ev_io_stop (EV_A_ &pipeev);
1144
1145 close (evpipe [0]); evpipe [0] = 0;
1146 close (evpipe [1]); evpipe [1] = 0;
1147 }
984 1148
985#if EV_USE_INOTIFY 1149#if EV_USE_INOTIFY
986 if (fs_fd >= 0) 1150 if (fs_fd >= 0)
987 close (fs_fd); 1151 close (fs_fd);
988#endif 1152#endif
1011 array_free (pending, [i]); 1175 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE 1176#if EV_IDLE_ENABLE
1013 array_free (idle, [i]); 1177 array_free (idle, [i]);
1014#endif 1178#endif
1015 } 1179 }
1180
1181 ev_free (anfds); anfdmax = 0;
1016 1182
1017 /* have to use the microsoft-never-gets-it-right macro */ 1183 /* have to use the microsoft-never-gets-it-right macro */
1018 array_free (fdchange, EMPTY); 1184 array_free (fdchange, EMPTY);
1019 array_free (timer, EMPTY); 1185 array_free (timer, EMPTY);
1020#if EV_PERIODIC_ENABLE 1186#if EV_PERIODIC_ENABLE
1021 array_free (periodic, EMPTY); 1187 array_free (periodic, EMPTY);
1022#endif 1188#endif
1189#if EV_FORK_ENABLE
1190 array_free (fork, EMPTY);
1191#endif
1023 array_free (prepare, EMPTY); 1192 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1193 array_free (check, EMPTY);
1194#if EV_ASYNC_ENABLE
1195 array_free (async, EMPTY);
1196#endif
1025 1197
1026 backend = 0; 1198 backend = 0;
1027} 1199}
1028 1200
1029void inline_size infy_fork (EV_P); 1201void inline_size infy_fork (EV_P);
1042#endif 1214#endif
1043#if EV_USE_INOTIFY 1215#if EV_USE_INOTIFY
1044 infy_fork (EV_A); 1216 infy_fork (EV_A);
1045#endif 1217#endif
1046 1218
1047 if (ev_is_active (&sigev)) 1219 if (ev_is_active (&pipeev))
1048 { 1220 {
1049 /* default loop */ 1221 /* this "locks" the handlers against writing to the pipe */
1222 gotsig = gotasync = 1;
1050 1223
1051 ev_ref (EV_A); 1224 ev_ref (EV_A);
1052 ev_io_stop (EV_A_ &sigev); 1225 ev_io_stop (EV_A_ &pipeev);
1053 close (sigpipe [0]); 1226 close (evpipe [0]);
1054 close (sigpipe [1]); 1227 close (evpipe [1]);
1055 1228
1056 while (pipe (sigpipe))
1057 syserr ("(libev) error creating pipe");
1058
1059 siginit (EV_A); 1229 evpipe_init (EV_A);
1230 /* now iterate over everything, in case we missed something */
1231 pipecb (EV_A_ &pipeev, EV_READ);
1060 } 1232 }
1061 1233
1062 postfork = 0; 1234 postfork = 0;
1063} 1235}
1064 1236
1086} 1258}
1087 1259
1088void 1260void
1089ev_loop_fork (EV_P) 1261ev_loop_fork (EV_P)
1090{ 1262{
1091 postfork = 1; 1263 postfork = 1; /* must be in line with ev_default_fork */
1092} 1264}
1093 1265
1094#endif 1266#endif
1095 1267
1096#if EV_MULTIPLICITY 1268#if EV_MULTIPLICITY
1099#else 1271#else
1100int 1272int
1101ev_default_loop (unsigned int flags) 1273ev_default_loop (unsigned int flags)
1102#endif 1274#endif
1103{ 1275{
1104 if (sigpipe [0] == sigpipe [1])
1105 if (pipe (sigpipe))
1106 return 0;
1107
1108 if (!ev_default_loop_ptr) 1276 if (!ev_default_loop_ptr)
1109 { 1277 {
1110#if EV_MULTIPLICITY 1278#if EV_MULTIPLICITY
1111 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1279 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1112#else 1280#else
1115 1283
1116 loop_init (EV_A_ flags); 1284 loop_init (EV_A_ flags);
1117 1285
1118 if (ev_backend (EV_A)) 1286 if (ev_backend (EV_A))
1119 { 1287 {
1120 siginit (EV_A);
1121
1122#ifndef _WIN32 1288#ifndef _WIN32
1123 ev_signal_init (&childev, childcb, SIGCHLD); 1289 ev_signal_init (&childev, childcb, SIGCHLD);
1124 ev_set_priority (&childev, EV_MAXPRI); 1290 ev_set_priority (&childev, EV_MAXPRI);
1125 ev_signal_start (EV_A_ &childev); 1291 ev_signal_start (EV_A_ &childev);
1126 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1292 ev_unref (EV_A); /* child watcher should not keep loop alive */
1143#ifndef _WIN32 1309#ifndef _WIN32
1144 ev_ref (EV_A); /* child watcher */ 1310 ev_ref (EV_A); /* child watcher */
1145 ev_signal_stop (EV_A_ &childev); 1311 ev_signal_stop (EV_A_ &childev);
1146#endif 1312#endif
1147 1313
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); 1314 loop_destroy (EV_A);
1155} 1315}
1156 1316
1157void 1317void
1158ev_default_fork (void) 1318ev_default_fork (void)
1160#if EV_MULTIPLICITY 1320#if EV_MULTIPLICITY
1161 struct ev_loop *loop = ev_default_loop_ptr; 1321 struct ev_loop *loop = ev_default_loop_ptr;
1162#endif 1322#endif
1163 1323
1164 if (backend) 1324 if (backend)
1165 postfork = 1; 1325 postfork = 1; /* must be in line with ev_loop_fork */
1166} 1326}
1167 1327
1168/*****************************************************************************/ 1328/*****************************************************************************/
1169 1329
1170void 1330void
1196void inline_size 1356void inline_size
1197timers_reify (EV_P) 1357timers_reify (EV_P)
1198{ 1358{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1359 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1360 {
1201 ev_timer *w = timers [0]; 1361 ev_timer *w = (ev_timer *)timers [0];
1202 1362
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1363 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1364
1205 /* first reschedule or stop timer */ 1365 /* first reschedule or stop timer */
1206 if (w->repeat) 1366 if (w->repeat)
1209 1369
1210 ((WT)w)->at += w->repeat; 1370 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1371 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1372 ((WT)w)->at = mn_now;
1213 1373
1214 downheap ((WT *)timers, timercnt, 0); 1374 downheap (timers, timercnt, 0);
1215 } 1375 }
1216 else 1376 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1377 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1378
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1379 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1224void inline_size 1384void inline_size
1225periodics_reify (EV_P) 1385periodics_reify (EV_P)
1226{ 1386{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1387 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1388 {
1229 ev_periodic *w = periodics [0]; 1389 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1390
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1391 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1392
1233 /* first reschedule or stop timer */ 1393 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1394 if (w->reschedule_cb)
1235 { 1395 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1396 ((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)); 1397 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1398 downheap (periodics, periodiccnt, 0);
1239 } 1399 }
1240 else if (w->interval) 1400 else if (w->interval)
1241 { 1401 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1402 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1403 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)); 1404 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); 1405 downheap (periodics, periodiccnt, 0);
1245 } 1406 }
1246 else 1407 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1408 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1409
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1410 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1256 int i; 1417 int i;
1257 1418
1258 /* adjust periodics after time jump */ 1419 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1420 for (i = 0; i < periodiccnt; ++i)
1260 { 1421 {
1261 ev_periodic *w = periodics [i]; 1422 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1423
1263 if (w->reschedule_cb) 1424 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1426 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1427 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1428 }
1268 1429
1269 /* now rebuild the heap */ 1430 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1431 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1432 downheap (periodics, periodiccnt, i);
1272} 1433}
1273#endif 1434#endif
1274 1435
1275#if EV_IDLE_ENABLE 1436#if EV_IDLE_ENABLE
1276void inline_size 1437void inline_size
1293 } 1454 }
1294 } 1455 }
1295} 1456}
1296#endif 1457#endif
1297 1458
1298int inline_size 1459void inline_speed
1299time_update_monotonic (EV_P) 1460time_update (EV_P_ ev_tstamp max_block)
1300{ 1461{
1462 int i;
1463
1464#if EV_USE_MONOTONIC
1465 if (expect_true (have_monotonic))
1466 {
1467 ev_tstamp odiff = rtmn_diff;
1468
1301 mn_now = get_clock (); 1469 mn_now = get_clock ();
1302 1470
1471 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1472 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1473 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1474 {
1305 ev_rt_now = rtmn_diff + mn_now; 1475 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1476 return;
1307 } 1477 }
1308 else 1478
1309 {
1310 now_floor = mn_now; 1479 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1480 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1481
1316void inline_size 1482 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1483 * on the choice of "4": one iteration isn't enough,
1318{ 1484 * in case we get preempted during the calls to
1319 int i; 1485 * ev_time and get_clock. a second call is almost guaranteed
1320 1486 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1487 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1488 * in the unlikely event of having been preempted here.
1323 { 1489 */
1324 if (time_update_monotonic (EV_A)) 1490 for (i = 4; --i; )
1325 { 1491 {
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; 1492 rtmn_diff = ev_rt_now - mn_now;
1339 1493
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1494 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1495 return; /* all is well */
1342 1496
1343 ev_rt_now = ev_time (); 1497 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1498 mn_now = get_clock ();
1345 now_floor = mn_now; 1499 now_floor = mn_now;
1346 } 1500 }
1347 1501
1348# if EV_PERIODIC_ENABLE 1502# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1503 periodics_reschedule (EV_A);
1350# endif 1504# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1505 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1506 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1507 }
1355 else 1508 else
1356#endif 1509#endif
1357 { 1510 {
1358 ev_rt_now = ev_time (); 1511 ev_rt_now = ev_time ();
1359 1512
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1513 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1514 {
1362#if EV_PERIODIC_ENABLE 1515#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1516 periodics_reschedule (EV_A);
1364#endif 1517#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1518 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1519 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1520 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1521 }
1370 1522
1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1566 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1415 call_pending (EV_A); 1567 call_pending (EV_A);
1416 } 1568 }
1417#endif 1569#endif
1418 1570
1419 /* queue check watchers (and execute them) */ 1571 /* queue prepare watchers (and execute them) */
1420 if (expect_false (preparecnt)) 1572 if (expect_false (preparecnt))
1421 { 1573 {
1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1574 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1423 call_pending (EV_A); 1575 call_pending (EV_A);
1424 } 1576 }
1433 /* update fd-related kernel structures */ 1585 /* update fd-related kernel structures */
1434 fd_reify (EV_A); 1586 fd_reify (EV_A);
1435 1587
1436 /* calculate blocking time */ 1588 /* calculate blocking time */
1437 { 1589 {
1438 ev_tstamp block; 1590 ev_tstamp waittime = 0.;
1591 ev_tstamp sleeptime = 0.;
1439 1592
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1593 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1441 block = 0.; /* do not block at all */
1442 else
1443 { 1594 {
1444 /* update time to cancel out callback processing overhead */ 1595 /* 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); 1596 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1597
1455 block = MAX_BLOCKTIME; 1598 waittime = MAX_BLOCKTIME;
1456 1599
1457 if (timercnt) 1600 if (timercnt)
1458 { 1601 {
1459 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1602 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1460 if (block > to) block = to; 1603 if (waittime > to) waittime = to;
1461 } 1604 }
1462 1605
1463#if EV_PERIODIC_ENABLE 1606#if EV_PERIODIC_ENABLE
1464 if (periodiccnt) 1607 if (periodiccnt)
1465 { 1608 {
1466 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1609 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1467 if (block > to) block = to; 1610 if (waittime > to) waittime = to;
1468 } 1611 }
1469#endif 1612#endif
1470 1613
1471 if (expect_false (block < 0.)) block = 0.; 1614 if (expect_false (waittime < timeout_blocktime))
1615 waittime = timeout_blocktime;
1616
1617 sleeptime = waittime - backend_fudge;
1618
1619 if (expect_true (sleeptime > io_blocktime))
1620 sleeptime = io_blocktime;
1621
1622 if (sleeptime)
1623 {
1624 ev_sleep (sleeptime);
1625 waittime -= sleeptime;
1626 }
1472 } 1627 }
1473 1628
1474 ++loop_count; 1629 ++loop_count;
1475 backend_poll (EV_A_ block); 1630 backend_poll (EV_A_ waittime);
1631
1632 /* update ev_rt_now, do magic */
1633 time_update (EV_A_ waittime + sleeptime);
1476 } 1634 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1635
1481 /* queue pending timers and reschedule them */ 1636 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1637 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1638#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1639 periodics_reify (EV_A); /* absolute timers called first */
1546ev_clear_pending (EV_P_ void *w) 1701ev_clear_pending (EV_P_ void *w)
1547{ 1702{
1548 W w_ = (W)w; 1703 W w_ = (W)w;
1549 int pending = w_->pending; 1704 int pending = w_->pending;
1550 1705
1551 if (!pending) 1706 if (expect_true (pending))
1707 {
1708 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1709 w_->pending = 0;
1710 p->w = 0;
1711 return p->events;
1712 }
1713 else
1552 return 0; 1714 return 0;
1553
1554 w_->pending = 0;
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 p->w = 0;
1557
1558 return p->events;
1559} 1715}
1560 1716
1561void inline_size 1717void inline_size
1562pri_adjust (EV_P_ W w) 1718pri_adjust (EV_P_ W w)
1563{ 1719{
1582 w->active = 0; 1738 w->active = 0;
1583} 1739}
1584 1740
1585/*****************************************************************************/ 1741/*****************************************************************************/
1586 1742
1587void 1743void noinline
1588ev_io_start (EV_P_ ev_io *w) 1744ev_io_start (EV_P_ ev_io *w)
1589{ 1745{
1590 int fd = w->fd; 1746 int fd = w->fd;
1591 1747
1592 if (expect_false (ev_is_active (w))) 1748 if (expect_false (ev_is_active (w)))
1594 1750
1595 assert (("ev_io_start called with negative fd", fd >= 0)); 1751 assert (("ev_io_start called with negative fd", fd >= 0));
1596 1752
1597 ev_start (EV_A_ (W)w, 1); 1753 ev_start (EV_A_ (W)w, 1);
1598 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1754 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1755 wlist_add (&anfds[fd].head, (WL)w);
1600 1756
1601 fd_change (EV_A_ fd); 1757 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1758 w->events &= ~EV_IOFDSET;
1602} 1759}
1603 1760
1604void 1761void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1762ev_io_stop (EV_P_ ev_io *w)
1606{ 1763{
1607 clear_pending (EV_A_ (W)w); 1764 clear_pending (EV_A_ (W)w);
1608 if (expect_false (!ev_is_active (w))) 1765 if (expect_false (!ev_is_active (w)))
1609 return; 1766 return;
1610 1767
1611 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1768 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1612 1769
1613 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1770 wlist_del (&anfds[w->fd].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1771 ev_stop (EV_A_ (W)w);
1615 1772
1616 fd_change (EV_A_ w->fd); 1773 fd_change (EV_A_ w->fd, 1);
1617} 1774}
1618 1775
1619void 1776void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1777ev_timer_start (EV_P_ ev_timer *w)
1621{ 1778{
1622 if (expect_false (ev_is_active (w))) 1779 if (expect_false (ev_is_active (w)))
1623 return; 1780 return;
1624 1781
1625 ((WT)w)->at += mn_now; 1782 ((WT)w)->at += mn_now;
1626 1783
1627 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1784 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1628 1785
1629 ev_start (EV_A_ (W)w, ++timercnt); 1786 ev_start (EV_A_ (W)w, ++timercnt);
1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1787 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1631 timers [timercnt - 1] = w; 1788 timers [timercnt - 1] = (WT)w;
1632 upheap ((WT *)timers, timercnt - 1); 1789 upheap (timers, timercnt - 1);
1633 1790
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1791 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1792}
1636 1793
1637void 1794void noinline
1638ev_timer_stop (EV_P_ ev_timer *w) 1795ev_timer_stop (EV_P_ ev_timer *w)
1639{ 1796{
1640 clear_pending (EV_A_ (W)w); 1797 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1798 if (expect_false (!ev_is_active (w)))
1642 return; 1799 return;
1643 1800
1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1801 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1645 1802
1646 { 1803 {
1647 int active = ((W)w)->active; 1804 int active = ((W)w)->active;
1648 1805
1649 if (expect_true (--active < --timercnt)) 1806 if (expect_true (--active < --timercnt))
1650 { 1807 {
1651 timers [active] = timers [timercnt]; 1808 timers [active] = timers [timercnt];
1652 adjustheap ((WT *)timers, timercnt, active); 1809 adjustheap (timers, timercnt, active);
1653 } 1810 }
1654 } 1811 }
1655 1812
1656 ((WT)w)->at -= mn_now; 1813 ((WT)w)->at -= mn_now;
1657 1814
1658 ev_stop (EV_A_ (W)w); 1815 ev_stop (EV_A_ (W)w);
1659} 1816}
1660 1817
1661void 1818void noinline
1662ev_timer_again (EV_P_ ev_timer *w) 1819ev_timer_again (EV_P_ ev_timer *w)
1663{ 1820{
1664 if (ev_is_active (w)) 1821 if (ev_is_active (w))
1665 { 1822 {
1666 if (w->repeat) 1823 if (w->repeat)
1667 { 1824 {
1668 ((WT)w)->at = mn_now + w->repeat; 1825 ((WT)w)->at = mn_now + w->repeat;
1669 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1826 adjustheap (timers, timercnt, ((W)w)->active - 1);
1670 } 1827 }
1671 else 1828 else
1672 ev_timer_stop (EV_A_ w); 1829 ev_timer_stop (EV_A_ w);
1673 } 1830 }
1674 else if (w->repeat) 1831 else if (w->repeat)
1677 ev_timer_start (EV_A_ w); 1834 ev_timer_start (EV_A_ w);
1678 } 1835 }
1679} 1836}
1680 1837
1681#if EV_PERIODIC_ENABLE 1838#if EV_PERIODIC_ENABLE
1682void 1839void noinline
1683ev_periodic_start (EV_P_ ev_periodic *w) 1840ev_periodic_start (EV_P_ ev_periodic *w)
1684{ 1841{
1685 if (expect_false (ev_is_active (w))) 1842 if (expect_false (ev_is_active (w)))
1686 return; 1843 return;
1687 1844
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1846 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1847 else if (w->interval)
1691 { 1848 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1849 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1693 /* this formula differs from the one in periodic_reify because we do not always round up */ 1850 /* this formula differs from the one in periodic_reify because we do not always round up */
1694 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1851 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1852 }
1853 else
1854 ((WT)w)->at = w->offset;
1696 1855
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1856 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1857 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1858 periodics [periodiccnt - 1] = (WT)w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1859 upheap (periodics, periodiccnt - 1);
1701 1860
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1861 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1862}
1704 1863
1705void 1864void noinline
1706ev_periodic_stop (EV_P_ ev_periodic *w) 1865ev_periodic_stop (EV_P_ ev_periodic *w)
1707{ 1866{
1708 clear_pending (EV_A_ (W)w); 1867 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1868 if (expect_false (!ev_is_active (w)))
1710 return; 1869 return;
1711 1870
1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1871 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1713 1872
1714 { 1873 {
1715 int active = ((W)w)->active; 1874 int active = ((W)w)->active;
1716 1875
1717 if (expect_true (--active < --periodiccnt)) 1876 if (expect_true (--active < --periodiccnt))
1718 { 1877 {
1719 periodics [active] = periodics [periodiccnt]; 1878 periodics [active] = periodics [periodiccnt];
1720 adjustheap ((WT *)periodics, periodiccnt, active); 1879 adjustheap (periodics, periodiccnt, active);
1721 } 1880 }
1722 } 1881 }
1723 1882
1724 ev_stop (EV_A_ (W)w); 1883 ev_stop (EV_A_ (W)w);
1725} 1884}
1726 1885
1727void 1886void noinline
1728ev_periodic_again (EV_P_ ev_periodic *w) 1887ev_periodic_again (EV_P_ ev_periodic *w)
1729{ 1888{
1730 /* TODO: use adjustheap and recalculation */ 1889 /* TODO: use adjustheap and recalculation */
1731 ev_periodic_stop (EV_A_ w); 1890 ev_periodic_stop (EV_A_ w);
1732 ev_periodic_start (EV_A_ w); 1891 ev_periodic_start (EV_A_ w);
1735 1894
1736#ifndef SA_RESTART 1895#ifndef SA_RESTART
1737# define SA_RESTART 0 1896# define SA_RESTART 0
1738#endif 1897#endif
1739 1898
1740void 1899void noinline
1741ev_signal_start (EV_P_ ev_signal *w) 1900ev_signal_start (EV_P_ ev_signal *w)
1742{ 1901{
1743#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1744 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1903 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1745#endif 1904#endif
1746 if (expect_false (ev_is_active (w))) 1905 if (expect_false (ev_is_active (w)))
1747 return; 1906 return;
1748 1907
1749 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1908 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1750 1909
1910 evpipe_init (EV_A);
1911
1912 {
1913#ifndef _WIN32
1914 sigset_t full, prev;
1915 sigfillset (&full);
1916 sigprocmask (SIG_SETMASK, &full, &prev);
1917#endif
1918
1919 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1920
1921#ifndef _WIN32
1922 sigprocmask (SIG_SETMASK, &prev, 0);
1923#endif
1924 }
1925
1751 ev_start (EV_A_ (W)w, 1); 1926 ev_start (EV_A_ (W)w, 1);
1752 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1753 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1927 wlist_add (&signals [w->signum - 1].head, (WL)w);
1754 1928
1755 if (!((WL)w)->next) 1929 if (!((WL)w)->next)
1756 { 1930 {
1757#if _WIN32 1931#if _WIN32
1758 signal (w->signum, sighandler); 1932 signal (w->signum, sighandler);
1764 sigaction (w->signum, &sa, 0); 1938 sigaction (w->signum, &sa, 0);
1765#endif 1939#endif
1766 } 1940 }
1767} 1941}
1768 1942
1769void 1943void noinline
1770ev_signal_stop (EV_P_ ev_signal *w) 1944ev_signal_stop (EV_P_ ev_signal *w)
1771{ 1945{
1772 clear_pending (EV_A_ (W)w); 1946 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1947 if (expect_false (!ev_is_active (w)))
1774 return; 1948 return;
1775 1949
1776 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1950 wlist_del (&signals [w->signum - 1].head, (WL)w);
1777 ev_stop (EV_A_ (W)w); 1951 ev_stop (EV_A_ (W)w);
1778 1952
1779 if (!signals [w->signum - 1].head) 1953 if (!signals [w->signum - 1].head)
1780 signal (w->signum, SIG_DFL); 1954 signal (w->signum, SIG_DFL);
1781} 1955}
1788#endif 1962#endif
1789 if (expect_false (ev_is_active (w))) 1963 if (expect_false (ev_is_active (w)))
1790 return; 1964 return;
1791 1965
1792 ev_start (EV_A_ (W)w, 1); 1966 ev_start (EV_A_ (W)w, 1);
1793 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1967 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1794} 1968}
1795 1969
1796void 1970void
1797ev_child_stop (EV_P_ ev_child *w) 1971ev_child_stop (EV_P_ ev_child *w)
1798{ 1972{
1799 clear_pending (EV_A_ (W)w); 1973 clear_pending (EV_A_ (W)w);
1800 if (expect_false (!ev_is_active (w))) 1974 if (expect_false (!ev_is_active (w)))
1801 return; 1975 return;
1802 1976
1803 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1977 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1804 ev_stop (EV_A_ (W)w); 1978 ev_stop (EV_A_ (W)w);
1805} 1979}
1806 1980
1807#if EV_STAT_ENABLE 1981#if EV_STAT_ENABLE
1808 1982
2150 2324
2151#if EV_EMBED_ENABLE 2325#if EV_EMBED_ENABLE
2152void noinline 2326void noinline
2153ev_embed_sweep (EV_P_ ev_embed *w) 2327ev_embed_sweep (EV_P_ ev_embed *w)
2154{ 2328{
2155 ev_loop (w->loop, EVLOOP_NONBLOCK); 2329 ev_loop (w->other, EVLOOP_NONBLOCK);
2156} 2330}
2157 2331
2158static void 2332static void
2159embed_cb (EV_P_ ev_io *io, int revents) 2333embed_io_cb (EV_P_ ev_io *io, int revents)
2160{ 2334{
2161 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2335 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2162 2336
2163 if (ev_cb (w)) 2337 if (ev_cb (w))
2164 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2338 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2165 else 2339 else
2166 ev_embed_sweep (loop, w); 2340 ev_loop (w->other, EVLOOP_NONBLOCK);
2167} 2341}
2342
2343static void
2344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2345{
2346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2347
2348 {
2349 struct ev_loop *loop = w->other;
2350
2351 while (fdchangecnt)
2352 {
2353 fd_reify (EV_A);
2354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2355 }
2356 }
2357}
2358
2359#if 0
2360static void
2361embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2362{
2363 ev_idle_stop (EV_A_ idle);
2364}
2365#endif
2168 2366
2169void 2367void
2170ev_embed_start (EV_P_ ev_embed *w) 2368ev_embed_start (EV_P_ ev_embed *w)
2171{ 2369{
2172 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2173 return; 2371 return;
2174 2372
2175 { 2373 {
2176 struct ev_loop *loop = w->loop; 2374 struct ev_loop *loop = w->other;
2177 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2375 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2178 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2376 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2179 } 2377 }
2180 2378
2181 ev_set_priority (&w->io, ev_priority (w)); 2379 ev_set_priority (&w->io, ev_priority (w));
2182 ev_io_start (EV_A_ &w->io); 2380 ev_io_start (EV_A_ &w->io);
2183 2381
2382 ev_prepare_init (&w->prepare, embed_prepare_cb);
2383 ev_set_priority (&w->prepare, EV_MINPRI);
2384 ev_prepare_start (EV_A_ &w->prepare);
2385
2386 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2387
2184 ev_start (EV_A_ (W)w, 1); 2388 ev_start (EV_A_ (W)w, 1);
2185} 2389}
2186 2390
2187void 2391void
2188ev_embed_stop (EV_P_ ev_embed *w) 2392ev_embed_stop (EV_P_ ev_embed *w)
2190 clear_pending (EV_A_ (W)w); 2394 clear_pending (EV_A_ (W)w);
2191 if (expect_false (!ev_is_active (w))) 2395 if (expect_false (!ev_is_active (w)))
2192 return; 2396 return;
2193 2397
2194 ev_io_stop (EV_A_ &w->io); 2398 ev_io_stop (EV_A_ &w->io);
2399 ev_prepare_stop (EV_A_ &w->prepare);
2195 2400
2196 ev_stop (EV_A_ (W)w); 2401 ev_stop (EV_A_ (W)w);
2197} 2402}
2198#endif 2403#endif
2199 2404
2224 2429
2225 ev_stop (EV_A_ (W)w); 2430 ev_stop (EV_A_ (W)w);
2226} 2431}
2227#endif 2432#endif
2228 2433
2434#if EV_ASYNC_ENABLE
2435void
2436ev_async_start (EV_P_ ev_async *w)
2437{
2438 if (expect_false (ev_is_active (w)))
2439 return;
2440
2441 evpipe_init (EV_A);
2442
2443 ev_start (EV_A_ (W)w, ++asynccnt);
2444 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2445 asyncs [asynccnt - 1] = w;
2446}
2447
2448void
2449ev_async_stop (EV_P_ ev_async *w)
2450{
2451 clear_pending (EV_A_ (W)w);
2452 if (expect_false (!ev_is_active (w)))
2453 return;
2454
2455 {
2456 int active = ((W)w)->active;
2457 asyncs [active - 1] = asyncs [--asynccnt];
2458 ((W)asyncs [active - 1])->active = active;
2459 }
2460
2461 ev_stop (EV_A_ (W)w);
2462}
2463
2464void
2465ev_async_send (EV_P_ ev_async *w)
2466{
2467 w->sent = 1;
2468 evpipe_write (EV_A_ 0, 1);
2469}
2470#endif
2471
2229/*****************************************************************************/ 2472/*****************************************************************************/
2230 2473
2231struct ev_once 2474struct ev_once
2232{ 2475{
2233 ev_io io; 2476 ev_io io;
2288 ev_timer_set (&once->to, timeout, 0.); 2531 ev_timer_set (&once->to, timeout, 0.);
2289 ev_timer_start (EV_A_ &once->to); 2532 ev_timer_start (EV_A_ &once->to);
2290 } 2533 }
2291} 2534}
2292 2535
2536#if EV_MULTIPLICITY
2537 #include "ev_wrap.h"
2538#endif
2539
2293#ifdef __cplusplus 2540#ifdef __cplusplus
2294} 2541}
2295#endif 2542#endif
2296 2543

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines