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.211 by root, Tue Feb 19 17:09:28 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
146 162
147#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
149#endif 165#endif
150 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
151#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
153#endif 173#endif
154 174
155#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
202#ifndef CLOCK_REALTIME 222#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 223# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 224# define EV_USE_REALTIME 0
205#endif 225#endif
206 226
227#if !EV_STAT_ENABLE
228# undef EV_USE_INOTIFY
229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
236#endif
237
238#if EV_USE_INOTIFY
239# include <sys/inotify.h>
240#endif
241
207#if EV_SELECT_IS_WINSOCKET 242#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 243# include <winsock.h>
209#endif 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); /* watcher should not keep loop alive */
816
817 /* in case we received the signal before we had the chance of installing a handler */
818 ev_feed_event (EV_A_ &pipeev, 0);
819 }
820}
821
822void inline_size
823evpipe_write (EV_P_ int sig, int async)
824{
825 if (!(gotasync || gotsig))
826 {
827 int old_errno = errno; /* save errno becaue write might clobber it */
828
829 if (sig) gotsig = 1;
830 if (async) gotasync = 1;
831
832 write (evpipe [1], &old_errno, 1);
833
834 errno = old_errno;
835 }
836}
837
838static void
839pipecb (EV_P_ ev_io *iow, int revents)
840{
841 {
842 int dummy;
843 read (evpipe [0], &dummy, 1);
844 }
845
846 if (gotsig && ev_is_default_loop (EV_A))
847 {
848 int signum;
849 gotsig = 0;
850
851 for (signum = signalmax; signum--; )
852 if (signals [signum].gotsig)
853 ev_feed_signal_event (EV_A_ signum + 1);
854 }
855
856#if EV_ASYNC_ENABLE
857 if (gotasync)
858 {
859 int i;
860 gotasync = 0;
861
862 for (i = asynccnt; i--; )
863 if (asyncs [i]->sent)
864 {
865 asyncs [i]->sent = 0;
866 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
867 }
868 }
869#endif
775} 870}
776 871
777/*****************************************************************************/ 872/*****************************************************************************/
778 873
874static void
875sighandler (int signum)
876{
877#if EV_MULTIPLICITY
878 struct ev_loop *loop = &default_loop_struct;
879#endif
880
881#if _WIN32
882 signal (signum, sighandler);
883#endif
884
885 signals [signum - 1].gotsig = 1;
886 evpipe_write (EV_A_ 1, 0);
887}
888
889void noinline
890ev_feed_signal_event (EV_P_ int signum)
891{
892 WL w;
893
894#if EV_MULTIPLICITY
895 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
896#endif
897
898 --signum;
899
900 if (signum < 0 || signum >= signalmax)
901 return;
902
903 signals [signum].gotsig = 0;
904
905 for (w = signals [signum].head; w; w = w->next)
906 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
907}
908
909/*****************************************************************************/
910
779static ev_child *childs [EV_PID_HASHSIZE]; 911static WL childs [EV_PID_HASHSIZE];
780 912
781#ifndef _WIN32 913#ifndef _WIN32
782 914
783static ev_signal childev; 915static ev_signal childev;
916
917#ifndef WIFCONTINUED
918# define WIFCONTINUED(status) 0
919#endif
784 920
785void inline_speed 921void inline_speed
786child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 922child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
787{ 923{
788 ev_child *w; 924 ev_child *w;
925 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
789 926
790 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 927 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
928 {
791 if (w->pid == pid || !w->pid) 929 if ((w->pid == pid || !w->pid)
930 && (!traced || (w->flags & 1)))
792 { 931 {
793 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 932 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
794 w->rpid = pid; 933 w->rpid = pid;
795 w->rstatus = status; 934 w->rstatus = status;
796 ev_feed_event (EV_A_ (W)w, EV_CHILD); 935 ev_feed_event (EV_A_ (W)w, EV_CHILD);
797 } 936 }
937 }
798} 938}
799 939
800#ifndef WCONTINUED 940#ifndef WCONTINUED
801# define WCONTINUED 0 941# define WCONTINUED 0
802#endif 942#endif
899} 1039}
900 1040
901unsigned int 1041unsigned int
902ev_embeddable_backends (void) 1042ev_embeddable_backends (void)
903{ 1043{
904 return EVBACKEND_EPOLL 1044 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
905 | EVBACKEND_KQUEUE 1045
906 | EVBACKEND_PORT; 1046 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1047 /* please fix it and tell me how to detect the fix */
1048 flags &= ~EVBACKEND_EPOLL;
1049
1050 return flags;
907} 1051}
908 1052
909unsigned int 1053unsigned int
910ev_backend (EV_P) 1054ev_backend (EV_P)
911{ 1055{
914 1058
915unsigned int 1059unsigned int
916ev_loop_count (EV_P) 1060ev_loop_count (EV_P)
917{ 1061{
918 return loop_count; 1062 return loop_count;
1063}
1064
1065void
1066ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1067{
1068 io_blocktime = interval;
1069}
1070
1071void
1072ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1073{
1074 timeout_blocktime = interval;
919} 1075}
920 1076
921static void noinline 1077static void noinline
922loop_init (EV_P_ unsigned int flags) 1078loop_init (EV_P_ unsigned int flags)
923{ 1079{
929 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1085 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
930 have_monotonic = 1; 1086 have_monotonic = 1;
931 } 1087 }
932#endif 1088#endif
933 1089
934 ev_rt_now = ev_time (); 1090 ev_rt_now = ev_time ();
935 mn_now = get_clock (); 1091 mn_now = get_clock ();
936 now_floor = mn_now; 1092 now_floor = mn_now;
937 rtmn_diff = ev_rt_now - mn_now; 1093 rtmn_diff = ev_rt_now - mn_now;
1094
1095 io_blocktime = 0.;
1096 timeout_blocktime = 0.;
1097 backend = 0;
1098 backend_fd = -1;
1099 gotasync = 0;
1100#if EV_USE_INOTIFY
1101 fs_fd = -2;
1102#endif
938 1103
939 /* pid check not overridable via env */ 1104 /* pid check not overridable via env */
940#ifndef _WIN32 1105#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK) 1106 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid (); 1107 curpid = getpid ();
948 flags = atoi (getenv ("LIBEV_FLAGS")); 1113 flags = atoi (getenv ("LIBEV_FLAGS"));
949 1114
950 if (!(flags & 0x0000ffffUL)) 1115 if (!(flags & 0x0000ffffUL))
951 flags |= ev_recommended_backends (); 1116 flags |= ev_recommended_backends ();
952 1117
953 backend = 0;
954 backend_fd = -1;
955#if EV_USE_INOTIFY
956 fs_fd = -2;
957#endif
958
959#if EV_USE_PORT 1118#if EV_USE_PORT
960 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1119 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
961#endif 1120#endif
962#if EV_USE_KQUEUE 1121#if EV_USE_KQUEUE
963 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1122 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
970#endif 1129#endif
971#if EV_USE_SELECT 1130#if EV_USE_SELECT
972 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1131 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
973#endif 1132#endif
974 1133
975 ev_init (&sigev, sigcb); 1134 ev_init (&pipeev, pipecb);
976 ev_set_priority (&sigev, EV_MAXPRI); 1135 ev_set_priority (&pipeev, EV_MAXPRI);
977 } 1136 }
978} 1137}
979 1138
980static void noinline 1139static void noinline
981loop_destroy (EV_P) 1140loop_destroy (EV_P)
982{ 1141{
983 int i; 1142 int i;
1143
1144 if (ev_is_active (&pipeev))
1145 {
1146 ev_ref (EV_A); /* signal watcher */
1147 ev_io_stop (EV_A_ &pipeev);
1148
1149 close (evpipe [0]); evpipe [0] = 0;
1150 close (evpipe [1]); evpipe [1] = 0;
1151 }
984 1152
985#if EV_USE_INOTIFY 1153#if EV_USE_INOTIFY
986 if (fs_fd >= 0) 1154 if (fs_fd >= 0)
987 close (fs_fd); 1155 close (fs_fd);
988#endif 1156#endif
1011 array_free (pending, [i]); 1179 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE 1180#if EV_IDLE_ENABLE
1013 array_free (idle, [i]); 1181 array_free (idle, [i]);
1014#endif 1182#endif
1015 } 1183 }
1184
1185 ev_free (anfds); anfdmax = 0;
1016 1186
1017 /* have to use the microsoft-never-gets-it-right macro */ 1187 /* have to use the microsoft-never-gets-it-right macro */
1018 array_free (fdchange, EMPTY); 1188 array_free (fdchange, EMPTY);
1019 array_free (timer, EMPTY); 1189 array_free (timer, EMPTY);
1020#if EV_PERIODIC_ENABLE 1190#if EV_PERIODIC_ENABLE
1021 array_free (periodic, EMPTY); 1191 array_free (periodic, EMPTY);
1022#endif 1192#endif
1193#if EV_FORK_ENABLE
1194 array_free (fork, EMPTY);
1195#endif
1023 array_free (prepare, EMPTY); 1196 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1197 array_free (check, EMPTY);
1198#if EV_ASYNC_ENABLE
1199 array_free (async, EMPTY);
1200#endif
1025 1201
1026 backend = 0; 1202 backend = 0;
1027} 1203}
1028 1204
1029void inline_size infy_fork (EV_P); 1205void inline_size infy_fork (EV_P);
1042#endif 1218#endif
1043#if EV_USE_INOTIFY 1219#if EV_USE_INOTIFY
1044 infy_fork (EV_A); 1220 infy_fork (EV_A);
1045#endif 1221#endif
1046 1222
1047 if (ev_is_active (&sigev)) 1223 if (ev_is_active (&pipeev))
1048 { 1224 {
1049 /* default loop */ 1225 /* this "locks" the handlers against writing to the pipe */
1226 gotsig = gotasync = 1;
1050 1227
1051 ev_ref (EV_A); 1228 ev_ref (EV_A);
1052 ev_io_stop (EV_A_ &sigev); 1229 ev_io_stop (EV_A_ &pipeev);
1053 close (sigpipe [0]); 1230 close (evpipe [0]);
1054 close (sigpipe [1]); 1231 close (evpipe [1]);
1055 1232
1056 while (pipe (sigpipe))
1057 syserr ("(libev) error creating pipe");
1058
1059 siginit (EV_A); 1233 evpipe_init (EV_A);
1234 /* now iterate over everything, in case we missed something */
1235 pipecb (EV_A_ &pipeev, EV_READ);
1060 } 1236 }
1061 1237
1062 postfork = 0; 1238 postfork = 0;
1063} 1239}
1064 1240
1086} 1262}
1087 1263
1088void 1264void
1089ev_loop_fork (EV_P) 1265ev_loop_fork (EV_P)
1090{ 1266{
1091 postfork = 1; 1267 postfork = 1; /* must be in line with ev_default_fork */
1092} 1268}
1093 1269
1094#endif 1270#endif
1095 1271
1096#if EV_MULTIPLICITY 1272#if EV_MULTIPLICITY
1099#else 1275#else
1100int 1276int
1101ev_default_loop (unsigned int flags) 1277ev_default_loop (unsigned int flags)
1102#endif 1278#endif
1103{ 1279{
1104 if (sigpipe [0] == sigpipe [1])
1105 if (pipe (sigpipe))
1106 return 0;
1107
1108 if (!ev_default_loop_ptr) 1280 if (!ev_default_loop_ptr)
1109 { 1281 {
1110#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1111 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1283 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1112#else 1284#else
1115 1287
1116 loop_init (EV_A_ flags); 1288 loop_init (EV_A_ flags);
1117 1289
1118 if (ev_backend (EV_A)) 1290 if (ev_backend (EV_A))
1119 { 1291 {
1120 siginit (EV_A);
1121
1122#ifndef _WIN32 1292#ifndef _WIN32
1123 ev_signal_init (&childev, childcb, SIGCHLD); 1293 ev_signal_init (&childev, childcb, SIGCHLD);
1124 ev_set_priority (&childev, EV_MAXPRI); 1294 ev_set_priority (&childev, EV_MAXPRI);
1125 ev_signal_start (EV_A_ &childev); 1295 ev_signal_start (EV_A_ &childev);
1126 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1296 ev_unref (EV_A); /* child watcher should not keep loop alive */
1143#ifndef _WIN32 1313#ifndef _WIN32
1144 ev_ref (EV_A); /* child watcher */ 1314 ev_ref (EV_A); /* child watcher */
1145 ev_signal_stop (EV_A_ &childev); 1315 ev_signal_stop (EV_A_ &childev);
1146#endif 1316#endif
1147 1317
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); 1318 loop_destroy (EV_A);
1155} 1319}
1156 1320
1157void 1321void
1158ev_default_fork (void) 1322ev_default_fork (void)
1160#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1161 struct ev_loop *loop = ev_default_loop_ptr; 1325 struct ev_loop *loop = ev_default_loop_ptr;
1162#endif 1326#endif
1163 1327
1164 if (backend) 1328 if (backend)
1165 postfork = 1; 1329 postfork = 1; /* must be in line with ev_loop_fork */
1166} 1330}
1167 1331
1168/*****************************************************************************/ 1332/*****************************************************************************/
1169 1333
1170void 1334void
1196void inline_size 1360void inline_size
1197timers_reify (EV_P) 1361timers_reify (EV_P)
1198{ 1362{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1363 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1364 {
1201 ev_timer *w = timers [0]; 1365 ev_timer *w = (ev_timer *)timers [0];
1202 1366
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1367 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1368
1205 /* first reschedule or stop timer */ 1369 /* first reschedule or stop timer */
1206 if (w->repeat) 1370 if (w->repeat)
1209 1373
1210 ((WT)w)->at += w->repeat; 1374 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1375 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1376 ((WT)w)->at = mn_now;
1213 1377
1214 downheap ((WT *)timers, timercnt, 0); 1378 downheap (timers, timercnt, 0);
1215 } 1379 }
1216 else 1380 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1381 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1382
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1383 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1224void inline_size 1388void inline_size
1225periodics_reify (EV_P) 1389periodics_reify (EV_P)
1226{ 1390{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1391 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1392 {
1229 ev_periodic *w = periodics [0]; 1393 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1394
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1395 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1396
1233 /* first reschedule or stop timer */ 1397 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1398 if (w->reschedule_cb)
1235 { 1399 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1400 ((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)); 1401 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1402 downheap (periodics, periodiccnt, 0);
1239 } 1403 }
1240 else if (w->interval) 1404 else if (w->interval)
1241 { 1405 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1406 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1407 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1408 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1409 downheap (periodics, periodiccnt, 0);
1245 } 1410 }
1246 else 1411 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1412 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1413
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1414 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1256 int i; 1421 int i;
1257 1422
1258 /* adjust periodics after time jump */ 1423 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1424 for (i = 0; i < periodiccnt; ++i)
1260 { 1425 {
1261 ev_periodic *w = periodics [i]; 1426 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1427
1263 if (w->reschedule_cb) 1428 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1429 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1430 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1431 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1432 }
1268 1433
1269 /* now rebuild the heap */ 1434 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1435 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1436 downheap (periodics, periodiccnt, i);
1272} 1437}
1273#endif 1438#endif
1274 1439
1275#if EV_IDLE_ENABLE 1440#if EV_IDLE_ENABLE
1276void inline_size 1441void inline_size
1293 } 1458 }
1294 } 1459 }
1295} 1460}
1296#endif 1461#endif
1297 1462
1298int inline_size 1463void inline_speed
1299time_update_monotonic (EV_P) 1464time_update (EV_P_ ev_tstamp max_block)
1300{ 1465{
1466 int i;
1467
1468#if EV_USE_MONOTONIC
1469 if (expect_true (have_monotonic))
1470 {
1471 ev_tstamp odiff = rtmn_diff;
1472
1301 mn_now = get_clock (); 1473 mn_now = get_clock ();
1302 1474
1475 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1476 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1477 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1478 {
1305 ev_rt_now = rtmn_diff + mn_now; 1479 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1480 return;
1307 } 1481 }
1308 else 1482
1309 {
1310 now_floor = mn_now; 1483 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1484 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1485
1316void inline_size 1486 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1487 * on the choice of "4": one iteration isn't enough,
1318{ 1488 * in case we get preempted during the calls to
1319 int i; 1489 * ev_time and get_clock. a second call is almost guaranteed
1320 1490 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1491 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1492 * in the unlikely event of having been preempted here.
1323 { 1493 */
1324 if (time_update_monotonic (EV_A)) 1494 for (i = 4; --i; )
1325 { 1495 {
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; 1496 rtmn_diff = ev_rt_now - mn_now;
1339 1497
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1498 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1499 return; /* all is well */
1342 1500
1343 ev_rt_now = ev_time (); 1501 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1502 mn_now = get_clock ();
1345 now_floor = mn_now; 1503 now_floor = mn_now;
1346 } 1504 }
1347 1505
1348# if EV_PERIODIC_ENABLE 1506# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1507 periodics_reschedule (EV_A);
1350# endif 1508# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1509 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1510 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1511 }
1355 else 1512 else
1356#endif 1513#endif
1357 { 1514 {
1358 ev_rt_now = ev_time (); 1515 ev_rt_now = ev_time ();
1359 1516
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1517 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1518 {
1362#if EV_PERIODIC_ENABLE 1519#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1520 periodics_reschedule (EV_A);
1364#endif 1521#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1522 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1523 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1524 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1525 }
1370 1526
1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1570 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1415 call_pending (EV_A); 1571 call_pending (EV_A);
1416 } 1572 }
1417#endif 1573#endif
1418 1574
1419 /* queue check watchers (and execute them) */ 1575 /* queue prepare watchers (and execute them) */
1420 if (expect_false (preparecnt)) 1576 if (expect_false (preparecnt))
1421 { 1577 {
1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1578 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1423 call_pending (EV_A); 1579 call_pending (EV_A);
1424 } 1580 }
1433 /* update fd-related kernel structures */ 1589 /* update fd-related kernel structures */
1434 fd_reify (EV_A); 1590 fd_reify (EV_A);
1435 1591
1436 /* calculate blocking time */ 1592 /* calculate blocking time */
1437 { 1593 {
1438 ev_tstamp block; 1594 ev_tstamp waittime = 0.;
1595 ev_tstamp sleeptime = 0.;
1439 1596
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1597 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1441 block = 0.; /* do not block at all */
1442 else
1443 { 1598 {
1444 /* update time to cancel out callback processing overhead */ 1599 /* 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); 1600 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1601
1455 block = MAX_BLOCKTIME; 1602 waittime = MAX_BLOCKTIME;
1456 1603
1457 if (timercnt) 1604 if (timercnt)
1458 { 1605 {
1459 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1606 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1460 if (block > to) block = to; 1607 if (waittime > to) waittime = to;
1461 } 1608 }
1462 1609
1463#if EV_PERIODIC_ENABLE 1610#if EV_PERIODIC_ENABLE
1464 if (periodiccnt) 1611 if (periodiccnt)
1465 { 1612 {
1466 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1613 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1467 if (block > to) block = to; 1614 if (waittime > to) waittime = to;
1468 } 1615 }
1469#endif 1616#endif
1470 1617
1471 if (expect_false (block < 0.)) block = 0.; 1618 if (expect_false (waittime < timeout_blocktime))
1619 waittime = timeout_blocktime;
1620
1621 sleeptime = waittime - backend_fudge;
1622
1623 if (expect_true (sleeptime > io_blocktime))
1624 sleeptime = io_blocktime;
1625
1626 if (sleeptime)
1627 {
1628 ev_sleep (sleeptime);
1629 waittime -= sleeptime;
1630 }
1472 } 1631 }
1473 1632
1474 ++loop_count; 1633 ++loop_count;
1475 backend_poll (EV_A_ block); 1634 backend_poll (EV_A_ waittime);
1635
1636 /* update ev_rt_now, do magic */
1637 time_update (EV_A_ waittime + sleeptime);
1476 } 1638 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1639
1481 /* queue pending timers and reschedule them */ 1640 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1641 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1642#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1643 periodics_reify (EV_A); /* absolute timers called first */
1546ev_clear_pending (EV_P_ void *w) 1705ev_clear_pending (EV_P_ void *w)
1547{ 1706{
1548 W w_ = (W)w; 1707 W w_ = (W)w;
1549 int pending = w_->pending; 1708 int pending = w_->pending;
1550 1709
1551 if (!pending) 1710 if (expect_true (pending))
1711 {
1712 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1713 w_->pending = 0;
1714 p->w = 0;
1715 return p->events;
1716 }
1717 else
1552 return 0; 1718 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} 1719}
1560 1720
1561void inline_size 1721void inline_size
1562pri_adjust (EV_P_ W w) 1722pri_adjust (EV_P_ W w)
1563{ 1723{
1582 w->active = 0; 1742 w->active = 0;
1583} 1743}
1584 1744
1585/*****************************************************************************/ 1745/*****************************************************************************/
1586 1746
1587void 1747void noinline
1588ev_io_start (EV_P_ ev_io *w) 1748ev_io_start (EV_P_ ev_io *w)
1589{ 1749{
1590 int fd = w->fd; 1750 int fd = w->fd;
1591 1751
1592 if (expect_false (ev_is_active (w))) 1752 if (expect_false (ev_is_active (w)))
1594 1754
1595 assert (("ev_io_start called with negative fd", fd >= 0)); 1755 assert (("ev_io_start called with negative fd", fd >= 0));
1596 1756
1597 ev_start (EV_A_ (W)w, 1); 1757 ev_start (EV_A_ (W)w, 1);
1598 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1758 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1759 wlist_add (&anfds[fd].head, (WL)w);
1600 1760
1601 fd_change (EV_A_ fd); 1761 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1762 w->events &= ~EV_IOFDSET;
1602} 1763}
1603 1764
1604void 1765void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1766ev_io_stop (EV_P_ ev_io *w)
1606{ 1767{
1607 clear_pending (EV_A_ (W)w); 1768 clear_pending (EV_A_ (W)w);
1608 if (expect_false (!ev_is_active (w))) 1769 if (expect_false (!ev_is_active (w)))
1609 return; 1770 return;
1610 1771
1611 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));
1612 1773
1613 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1774 wlist_del (&anfds[w->fd].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1775 ev_stop (EV_A_ (W)w);
1615 1776
1616 fd_change (EV_A_ w->fd); 1777 fd_change (EV_A_ w->fd, 1);
1617} 1778}
1618 1779
1619void 1780void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1781ev_timer_start (EV_P_ ev_timer *w)
1621{ 1782{
1622 if (expect_false (ev_is_active (w))) 1783 if (expect_false (ev_is_active (w)))
1623 return; 1784 return;
1624 1785
1625 ((WT)w)->at += mn_now; 1786 ((WT)w)->at += mn_now;
1626 1787
1627 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.));
1628 1789
1629 ev_start (EV_A_ (W)w, ++timercnt); 1790 ev_start (EV_A_ (W)w, ++timercnt);
1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1791 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1631 timers [timercnt - 1] = w; 1792 timers [timercnt - 1] = (WT)w;
1632 upheap ((WT *)timers, timercnt - 1); 1793 upheap (timers, timercnt - 1);
1633 1794
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1795 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1796}
1636 1797
1637void 1798void noinline
1638ev_timer_stop (EV_P_ ev_timer *w) 1799ev_timer_stop (EV_P_ ev_timer *w)
1639{ 1800{
1640 clear_pending (EV_A_ (W)w); 1801 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1802 if (expect_false (!ev_is_active (w)))
1642 return; 1803 return;
1643 1804
1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1805 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1645 1806
1646 { 1807 {
1647 int active = ((W)w)->active; 1808 int active = ((W)w)->active;
1648 1809
1649 if (expect_true (--active < --timercnt)) 1810 if (expect_true (--active < --timercnt))
1650 { 1811 {
1651 timers [active] = timers [timercnt]; 1812 timers [active] = timers [timercnt];
1652 adjustheap ((WT *)timers, timercnt, active); 1813 adjustheap (timers, timercnt, active);
1653 } 1814 }
1654 } 1815 }
1655 1816
1656 ((WT)w)->at -= mn_now; 1817 ((WT)w)->at -= mn_now;
1657 1818
1658 ev_stop (EV_A_ (W)w); 1819 ev_stop (EV_A_ (W)w);
1659} 1820}
1660 1821
1661void 1822void noinline
1662ev_timer_again (EV_P_ ev_timer *w) 1823ev_timer_again (EV_P_ ev_timer *w)
1663{ 1824{
1664 if (ev_is_active (w)) 1825 if (ev_is_active (w))
1665 { 1826 {
1666 if (w->repeat) 1827 if (w->repeat)
1667 { 1828 {
1668 ((WT)w)->at = mn_now + w->repeat; 1829 ((WT)w)->at = mn_now + w->repeat;
1669 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1830 adjustheap (timers, timercnt, ((W)w)->active - 1);
1670 } 1831 }
1671 else 1832 else
1672 ev_timer_stop (EV_A_ w); 1833 ev_timer_stop (EV_A_ w);
1673 } 1834 }
1674 else if (w->repeat) 1835 else if (w->repeat)
1677 ev_timer_start (EV_A_ w); 1838 ev_timer_start (EV_A_ w);
1678 } 1839 }
1679} 1840}
1680 1841
1681#if EV_PERIODIC_ENABLE 1842#if EV_PERIODIC_ENABLE
1682void 1843void noinline
1683ev_periodic_start (EV_P_ ev_periodic *w) 1844ev_periodic_start (EV_P_ ev_periodic *w)
1684{ 1845{
1685 if (expect_false (ev_is_active (w))) 1846 if (expect_false (ev_is_active (w)))
1686 return; 1847 return;
1687 1848
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1850 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1851 else if (w->interval)
1691 { 1852 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1853 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 */ 1854 /* 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; 1855 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1856 }
1857 else
1858 ((WT)w)->at = w->offset;
1696 1859
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1860 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1861 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1862 periodics [periodiccnt - 1] = (WT)w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1863 upheap (periodics, periodiccnt - 1);
1701 1864
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1865 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1866}
1704 1867
1705void 1868void noinline
1706ev_periodic_stop (EV_P_ ev_periodic *w) 1869ev_periodic_stop (EV_P_ ev_periodic *w)
1707{ 1870{
1708 clear_pending (EV_A_ (W)w); 1871 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1872 if (expect_false (!ev_is_active (w)))
1710 return; 1873 return;
1711 1874
1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1875 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1713 1876
1714 { 1877 {
1715 int active = ((W)w)->active; 1878 int active = ((W)w)->active;
1716 1879
1717 if (expect_true (--active < --periodiccnt)) 1880 if (expect_true (--active < --periodiccnt))
1718 { 1881 {
1719 periodics [active] = periodics [periodiccnt]; 1882 periodics [active] = periodics [periodiccnt];
1720 adjustheap ((WT *)periodics, periodiccnt, active); 1883 adjustheap (periodics, periodiccnt, active);
1721 } 1884 }
1722 } 1885 }
1723 1886
1724 ev_stop (EV_A_ (W)w); 1887 ev_stop (EV_A_ (W)w);
1725} 1888}
1726 1889
1727void 1890void noinline
1728ev_periodic_again (EV_P_ ev_periodic *w) 1891ev_periodic_again (EV_P_ ev_periodic *w)
1729{ 1892{
1730 /* TODO: use adjustheap and recalculation */ 1893 /* TODO: use adjustheap and recalculation */
1731 ev_periodic_stop (EV_A_ w); 1894 ev_periodic_stop (EV_A_ w);
1732 ev_periodic_start (EV_A_ w); 1895 ev_periodic_start (EV_A_ w);
1735 1898
1736#ifndef SA_RESTART 1899#ifndef SA_RESTART
1737# define SA_RESTART 0 1900# define SA_RESTART 0
1738#endif 1901#endif
1739 1902
1740void 1903void noinline
1741ev_signal_start (EV_P_ ev_signal *w) 1904ev_signal_start (EV_P_ ev_signal *w)
1742{ 1905{
1743#if EV_MULTIPLICITY 1906#if EV_MULTIPLICITY
1744 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1907 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1745#endif 1908#endif
1746 if (expect_false (ev_is_active (w))) 1909 if (expect_false (ev_is_active (w)))
1747 return; 1910 return;
1748 1911
1749 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));
1750 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
1751 ev_start (EV_A_ (W)w, 1); 1930 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); 1931 wlist_add (&signals [w->signum - 1].head, (WL)w);
1754 1932
1755 if (!((WL)w)->next) 1933 if (!((WL)w)->next)
1756 { 1934 {
1757#if _WIN32 1935#if _WIN32
1758 signal (w->signum, sighandler); 1936 signal (w->signum, sighandler);
1764 sigaction (w->signum, &sa, 0); 1942 sigaction (w->signum, &sa, 0);
1765#endif 1943#endif
1766 } 1944 }
1767} 1945}
1768 1946
1769void 1947void noinline
1770ev_signal_stop (EV_P_ ev_signal *w) 1948ev_signal_stop (EV_P_ ev_signal *w)
1771{ 1949{
1772 clear_pending (EV_A_ (W)w); 1950 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1951 if (expect_false (!ev_is_active (w)))
1774 return; 1952 return;
1775 1953
1776 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1954 wlist_del (&signals [w->signum - 1].head, (WL)w);
1777 ev_stop (EV_A_ (W)w); 1955 ev_stop (EV_A_ (W)w);
1778 1956
1779 if (!signals [w->signum - 1].head) 1957 if (!signals [w->signum - 1].head)
1780 signal (w->signum, SIG_DFL); 1958 signal (w->signum, SIG_DFL);
1781} 1959}
1788#endif 1966#endif
1789 if (expect_false (ev_is_active (w))) 1967 if (expect_false (ev_is_active (w)))
1790 return; 1968 return;
1791 1969
1792 ev_start (EV_A_ (W)w, 1); 1970 ev_start (EV_A_ (W)w, 1);
1793 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1971 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1794} 1972}
1795 1973
1796void 1974void
1797ev_child_stop (EV_P_ ev_child *w) 1975ev_child_stop (EV_P_ ev_child *w)
1798{ 1976{
1799 clear_pending (EV_A_ (W)w); 1977 clear_pending (EV_A_ (W)w);
1800 if (expect_false (!ev_is_active (w))) 1978 if (expect_false (!ev_is_active (w)))
1801 return; 1979 return;
1802 1980
1803 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1981 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1804 ev_stop (EV_A_ (W)w); 1982 ev_stop (EV_A_ (W)w);
1805} 1983}
1806 1984
1807#if EV_STAT_ENABLE 1985#if EV_STAT_ENABLE
1808 1986
2150 2328
2151#if EV_EMBED_ENABLE 2329#if EV_EMBED_ENABLE
2152void noinline 2330void noinline
2153ev_embed_sweep (EV_P_ ev_embed *w) 2331ev_embed_sweep (EV_P_ ev_embed *w)
2154{ 2332{
2155 ev_loop (w->loop, EVLOOP_NONBLOCK); 2333 ev_loop (w->other, EVLOOP_NONBLOCK);
2156} 2334}
2157 2335
2158static void 2336static void
2159embed_cb (EV_P_ ev_io *io, int revents) 2337embed_io_cb (EV_P_ ev_io *io, int revents)
2160{ 2338{
2161 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2339 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2162 2340
2163 if (ev_cb (w)) 2341 if (ev_cb (w))
2164 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2342 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2165 else 2343 else
2166 ev_embed_sweep (loop, w); 2344 ev_loop (w->other, EVLOOP_NONBLOCK);
2167} 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
2168 2370
2169void 2371void
2170ev_embed_start (EV_P_ ev_embed *w) 2372ev_embed_start (EV_P_ ev_embed *w)
2171{ 2373{
2172 if (expect_false (ev_is_active (w))) 2374 if (expect_false (ev_is_active (w)))
2173 return; 2375 return;
2174 2376
2175 { 2377 {
2176 struct ev_loop *loop = w->loop; 2378 struct ev_loop *loop = w->other;
2177 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 ()));
2178 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2380 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2179 } 2381 }
2180 2382
2181 ev_set_priority (&w->io, ev_priority (w)); 2383 ev_set_priority (&w->io, ev_priority (w));
2182 ev_io_start (EV_A_ &w->io); 2384 ev_io_start (EV_A_ &w->io);
2183 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
2184 ev_start (EV_A_ (W)w, 1); 2392 ev_start (EV_A_ (W)w, 1);
2185} 2393}
2186 2394
2187void 2395void
2188ev_embed_stop (EV_P_ ev_embed *w) 2396ev_embed_stop (EV_P_ ev_embed *w)
2190 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2191 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2192 return; 2400 return;
2193 2401
2194 ev_io_stop (EV_A_ &w->io); 2402 ev_io_stop (EV_A_ &w->io);
2403 ev_prepare_stop (EV_A_ &w->prepare);
2195 2404
2196 ev_stop (EV_A_ (W)w); 2405 ev_stop (EV_A_ (W)w);
2197} 2406}
2198#endif 2407#endif
2199 2408
2224 2433
2225 ev_stop (EV_A_ (W)w); 2434 ev_stop (EV_A_ (W)w);
2226} 2435}
2227#endif 2436#endif
2228 2437
2438#if EV_ASYNC_ENABLE
2439void
2440ev_async_start (EV_P_ ev_async *w)
2441{
2442 if (expect_false (ev_is_active (w)))
2443 return;
2444
2445 evpipe_init (EV_A);
2446
2447 ev_start (EV_A_ (W)w, ++asynccnt);
2448 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2449 asyncs [asynccnt - 1] = w;
2450}
2451
2452void
2453ev_async_stop (EV_P_ ev_async *w)
2454{
2455 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w)))
2457 return;
2458
2459 {
2460 int active = ((W)w)->active;
2461 asyncs [active - 1] = asyncs [--asynccnt];
2462 ((W)asyncs [active - 1])->active = active;
2463 }
2464
2465 ev_stop (EV_A_ (W)w);
2466}
2467
2468void
2469ev_async_send (EV_P_ ev_async *w)
2470{
2471 w->sent = 1;
2472 evpipe_write (EV_A_ 0, 1);
2473}
2474#endif
2475
2229/*****************************************************************************/ 2476/*****************************************************************************/
2230 2477
2231struct ev_once 2478struct ev_once
2232{ 2479{
2233 ev_io io; 2480 ev_io io;
2288 ev_timer_set (&once->to, timeout, 0.); 2535 ev_timer_set (&once->to, timeout, 0.);
2289 ev_timer_start (EV_A_ &once->to); 2536 ev_timer_start (EV_A_ &once->to);
2290 } 2537 }
2291} 2538}
2292 2539
2540#if EV_MULTIPLICITY
2541 #include "ev_wrap.h"
2542#endif
2543
2293#ifdef __cplusplus 2544#ifdef __cplusplus
2294} 2545}
2295#endif 2546#endif
2296 2547

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines