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

Comparing libev/ev.c (file contents):
Revision 1.181 by root, Wed Dec 12 00:17:08 2007 UTC vs.
Revision 1.221 by root, Sun Apr 6 12:44:49 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
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
… …
51# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 61# define EV_USE_MONOTONIC 0
53# endif 62# endif
54# ifndef EV_USE_REALTIME 63# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 64# define EV_USE_REALTIME 0
65# endif
66# endif
67
68# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1
71# else
72# define EV_USE_NANOSLEEP 0
56# endif 73# endif
57# endif 74# endif
58 75
59# ifndef EV_USE_SELECT 76# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 77# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
102# else 119# else
103# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
104# endif 121# endif
105# endif 122# endif
106 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
107#endif 132#endif
108 133
109#include <math.h> 134#include <math.h>
110#include <stdlib.h> 135#include <stdlib.h>
111#include <fcntl.h> 136#include <fcntl.h>
… …
136# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
138# endif 163# endif
139#endif 164#endif
140 165
141/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
142 167
143#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
144# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
145#endif 170#endif
146 171
147#ifndef EV_USE_REALTIME 172#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 173# define EV_USE_REALTIME 0
174#endif
175
176#ifndef EV_USE_NANOSLEEP
177# define EV_USE_NANOSLEEP 0
149#endif 178#endif
150 179
151#ifndef EV_USE_SELECT 180#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 181# define EV_USE_SELECT 1
153#endif 182#endif
… …
159# define EV_USE_POLL 1 188# define EV_USE_POLL 1
160# endif 189# endif
161#endif 190#endif
162 191
163#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
164# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
165#endif 198#endif
166 199
167#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
169#endif 202#endif
… …
171#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
172# define EV_USE_PORT 0 205# define EV_USE_PORT 0
173#endif 206#endif
174 207
175#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
176# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
177#endif 214#endif
178 215
179#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL 217# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
190# else 227# else
191# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
192# endif 229# endif
193#endif 230#endif
194 231
195/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 241
197#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
200#endif 245#endif
… …
202#ifndef CLOCK_REALTIME 247#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 248# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 249# define EV_USE_REALTIME 0
205#endif 250#endif
206 251
252#if !EV_STAT_ENABLE
253# undef EV_USE_INOTIFY
254# define EV_USE_INOTIFY 0
255#endif
256
257#if !EV_USE_NANOSLEEP
258# ifndef _WIN32
259# include <sys/select.h>
260# endif
261#endif
262
263#if EV_USE_INOTIFY
264# include <sys/inotify.h>
265#endif
266
207#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 268# include <winsock.h>
209#endif 269#endif
210 270
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY 271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
216# include <sys/inotify.h> 273# include <stdint.h>
274int eventfd (unsigned int initval, int flags);
217#endif 275#endif
218 276
219/**/ 277/**/
220 278
221/* 279/*
… …
230 288
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 289#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 290#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 291/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 292
235#if __GNUC__ >= 3 293#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 294# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 295# define noinline __attribute__ ((noinline))
238#else 296#else
239# define expect(expr,value) (expr) 297# define expect(expr,value) (expr)
240# define noinline 298# define noinline
… …
261 319
262typedef ev_watcher *W; 320typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 321typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 322typedef ev_watcher_time *WT;
265 323
324#if EV_USE_MONOTONIC
325/* sig_atomic_t is used to avoid per-thread variables or locking but still */
326/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 327static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
328#endif
267 329
268#ifdef _WIN32 330#ifdef _WIN32
269# include "ev_win32.c" 331# include "ev_win32.c"
270#endif 332#endif
271 333
… …
407{ 469{
408 return ev_rt_now; 470 return ev_rt_now;
409} 471}
410#endif 472#endif
411 473
474void
475ev_sleep (ev_tstamp delay)
476{
477 if (delay > 0.)
478 {
479#if EV_USE_NANOSLEEP
480 struct timespec ts;
481
482 ts.tv_sec = (time_t)delay;
483 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
484
485 nanosleep (&ts, 0);
486#elif defined(_WIN32)
487 Sleep ((unsigned long)(delay * 1e3));
488#else
489 struct timeval tv;
490
491 tv.tv_sec = (time_t)delay;
492 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
493
494 select (0, 0, 0, 0, &tv);
495#endif
496 }
497}
498
499/*****************************************************************************/
500
412int inline_size 501int inline_size
413array_nextsize (int elem, int cur, int cnt) 502array_nextsize (int elem, int cur, int cnt)
414{ 503{
415 int ncur = cur + 1; 504 int ncur = cur + 1;
416 505
… …
533 { 622 {
534 int fd = fdchanges [i]; 623 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 624 ANFD *anfd = anfds + fd;
536 ev_io *w; 625 ev_io *w;
537 626
538 int events = 0; 627 unsigned char events = 0;
539 628
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 629 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 630 events |= (unsigned char)w->events;
542 631
543#if EV_SELECT_IS_WINSOCKET 632#if EV_SELECT_IS_WINSOCKET
544 if (events) 633 if (events)
545 { 634 {
546 unsigned long argp; 635 unsigned long argp;
636 #ifdef EV_FD_TO_WIN32_HANDLE
637 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
638 #else
547 anfd->handle = _get_osfhandle (fd); 639 anfd->handle = _get_osfhandle (fd);
640 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 641 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 642 }
550#endif 643#endif
551 644
645 {
646 unsigned char o_events = anfd->events;
647 unsigned char o_reify = anfd->reify;
648
552 anfd->reify = 0; 649 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 650 anfd->events = events;
651
652 if (o_events != events || o_reify & EV_IOFDSET)
653 backend_modify (EV_A_ fd, o_events, events);
654 }
556 } 655 }
557 656
558 fdchangecnt = 0; 657 fdchangecnt = 0;
559} 658}
560 659
561void inline_size 660void inline_size
562fd_change (EV_P_ int fd) 661fd_change (EV_P_ int fd, int flags)
563{ 662{
564 if (expect_false (anfds [fd].reify)) 663 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 664 anfds [fd].reify |= flags;
568 665
666 if (expect_true (!reify))
667 {
569 ++fdchangecnt; 668 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 669 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 670 fdchanges [fdchangecnt - 1] = fd;
671 }
572} 672}
573 673
574void inline_speed 674void inline_speed
575fd_kill (EV_P_ int fd) 675fd_kill (EV_P_ int fd)
576{ 676{
… …
627 727
628 for (fd = 0; fd < anfdmax; ++fd) 728 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 729 if (anfds [fd].events)
630 { 730 {
631 anfds [fd].events = 0; 731 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 732 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 733 }
634} 734}
635 735
636/*****************************************************************************/ 736/*****************************************************************************/
637 737
… …
694/*****************************************************************************/ 794/*****************************************************************************/
695 795
696typedef struct 796typedef struct
697{ 797{
698 WL head; 798 WL head;
699 sig_atomic_t volatile gotsig; 799 EV_ATOMIC_T gotsig;
700} ANSIG; 800} ANSIG;
701 801
702static ANSIG *signals; 802static ANSIG *signals;
703static int signalmax; 803static int signalmax;
704 804
705static int sigpipe [2]; 805static EV_ATOMIC_T gotsig;
706static sig_atomic_t volatile gotsig;
707static ev_io sigev;
708 806
709void inline_size 807void inline_size
710signals_init (ANSIG *base, int count) 808signals_init (ANSIG *base, int count)
711{ 809{
712 while (count--) 810 while (count--)
… …
716 814
717 ++base; 815 ++base;
718 } 816 }
719} 817}
720 818
721static void 819/*****************************************************************************/
722sighandler (int signum)
723{
724#if _WIN32
725 signal (signum, sighandler);
726#endif
727
728 signals [signum - 1].gotsig = 1;
729
730 if (!gotsig)
731 {
732 int old_errno = errno;
733 gotsig = 1;
734 write (sigpipe [1], &signum, 1);
735 errno = old_errno;
736 }
737}
738
739void noinline
740ev_feed_signal_event (EV_P_ int signum)
741{
742 WL w;
743
744#if EV_MULTIPLICITY
745 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
746#endif
747
748 --signum;
749
750 if (signum < 0 || signum >= signalmax)
751 return;
752
753 signals [signum].gotsig = 0;
754
755 for (w = signals [signum].head; w; w = w->next)
756 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
757}
758
759static void
760sigcb (EV_P_ ev_io *iow, int revents)
761{
762 int signum;
763
764 read (sigpipe [0], &revents, 1);
765 gotsig = 0;
766
767 for (signum = signalmax; signum--; )
768 if (signals [signum].gotsig)
769 ev_feed_signal_event (EV_A_ signum + 1);
770}
771 820
772void inline_speed 821void inline_speed
773fd_intern (int fd) 822fd_intern (int fd)
774{ 823{
775#ifdef _WIN32 824#ifdef _WIN32
… …
780 fcntl (fd, F_SETFL, O_NONBLOCK); 829 fcntl (fd, F_SETFL, O_NONBLOCK);
781#endif 830#endif
782} 831}
783 832
784static void noinline 833static void noinline
785siginit (EV_P) 834evpipe_init (EV_P)
786{ 835{
836 if (!ev_is_active (&pipeev))
837 {
838#if EV_USE_EVENTFD
839 if ((evfd = eventfd (0, 0)) >= 0)
840 {
841 evpipe [0] = -1;
842 fd_intern (evfd);
843 ev_io_set (&pipeev, evfd, EV_READ);
844 }
845 else
846#endif
847 {
848 while (pipe (evpipe))
849 syserr ("(libev) error creating signal/async pipe");
850
787 fd_intern (sigpipe [0]); 851 fd_intern (evpipe [0]);
788 fd_intern (sigpipe [1]); 852 fd_intern (evpipe [1]);
853 ev_io_set (&pipeev, evpipe [0], EV_READ);
854 }
789 855
790 ev_io_set (&sigev, sigpipe [0], EV_READ);
791 ev_io_start (EV_A_ &sigev); 856 ev_io_start (EV_A_ &pipeev);
792 ev_unref (EV_A); /* child watcher should not keep loop alive */ 857 ev_unref (EV_A); /* watcher should not keep loop alive */
858 }
859}
860
861void inline_size
862evpipe_write (EV_P_ EV_ATOMIC_T *flag)
863{
864 if (!*flag)
865 {
866 int old_errno = errno; /* save errno because write might clobber it */
867
868 *flag = 1;
869
870#if EV_USE_EVENTFD
871 if (evfd >= 0)
872 {
873 uint64_t counter = 1;
874 write (evfd, &counter, sizeof (uint64_t));
875 }
876 else
877#endif
878 write (evpipe [1], &old_errno, 1);
879
880 errno = old_errno;
881 }
882}
883
884static void
885pipecb (EV_P_ ev_io *iow, int revents)
886{
887#if EV_USE_EVENTFD
888 if (evfd >= 0)
889 {
890 uint64_t counter = 1;
891 read (evfd, &counter, sizeof (uint64_t));
892 }
893 else
894#endif
895 {
896 char dummy;
897 read (evpipe [0], &dummy, 1);
898 }
899
900 if (gotsig && ev_is_default_loop (EV_A))
901 {
902 int signum;
903 gotsig = 0;
904
905 for (signum = signalmax; signum--; )
906 if (signals [signum].gotsig)
907 ev_feed_signal_event (EV_A_ signum + 1);
908 }
909
910#if EV_ASYNC_ENABLE
911 if (gotasync)
912 {
913 int i;
914 gotasync = 0;
915
916 for (i = asynccnt; i--; )
917 if (asyncs [i]->sent)
918 {
919 asyncs [i]->sent = 0;
920 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
921 }
922 }
923#endif
793} 924}
794 925
795/*****************************************************************************/ 926/*****************************************************************************/
796 927
928static void
929ev_sighandler (int signum)
930{
931#if EV_MULTIPLICITY
932 struct ev_loop *loop = &default_loop_struct;
933#endif
934
935#if _WIN32
936 signal (signum, ev_sighandler);
937#endif
938
939 signals [signum - 1].gotsig = 1;
940 evpipe_write (EV_A_ &gotsig);
941}
942
943void noinline
944ev_feed_signal_event (EV_P_ int signum)
945{
946 WL w;
947
948#if EV_MULTIPLICITY
949 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
950#endif
951
952 --signum;
953
954 if (signum < 0 || signum >= signalmax)
955 return;
956
957 signals [signum].gotsig = 0;
958
959 for (w = signals [signum].head; w; w = w->next)
960 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
961}
962
963/*****************************************************************************/
964
797static ev_child *childs [EV_PID_HASHSIZE]; 965static WL childs [EV_PID_HASHSIZE];
798 966
799#ifndef _WIN32 967#ifndef _WIN32
800 968
801static ev_signal childev; 969static ev_signal childev;
802 970
971#ifndef WIFCONTINUED
972# define WIFCONTINUED(status) 0
973#endif
974
803void inline_speed 975void inline_speed
804child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 976child_reap (EV_P_ int chain, int pid, int status)
805{ 977{
806 ev_child *w; 978 ev_child *w;
979 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
807 980
808 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 981 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
982 {
809 if (w->pid == pid || !w->pid) 983 if ((w->pid == pid || !w->pid)
984 && (!traced || (w->flags & 1)))
810 { 985 {
811 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 986 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
812 w->rpid = pid; 987 w->rpid = pid;
813 w->rstatus = status; 988 w->rstatus = status;
814 ev_feed_event (EV_A_ (W)w, EV_CHILD); 989 ev_feed_event (EV_A_ (W)w, EV_CHILD);
815 } 990 }
991 }
816} 992}
817 993
818#ifndef WCONTINUED 994#ifndef WCONTINUED
819# define WCONTINUED 0 995# define WCONTINUED 0
820#endif 996#endif
… …
829 if (!WCONTINUED 1005 if (!WCONTINUED
830 || errno != EINVAL 1006 || errno != EINVAL
831 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1007 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
832 return; 1008 return;
833 1009
834 /* make sure we are called again until all childs have been reaped */ 1010 /* make sure we are called again until all children have been reaped */
835 /* we need to do it this way so that the callback gets called before we continue */ 1011 /* we need to do it this way so that the callback gets called before we continue */
836 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1012 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
837 1013
838 child_reap (EV_A_ sw, pid, pid, status); 1014 child_reap (EV_A_ pid, pid, status);
839 if (EV_PID_HASHSIZE > 1) 1015 if (EV_PID_HASHSIZE > 1)
840 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1016 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
841} 1017}
842 1018
843#endif 1019#endif
844 1020
845/*****************************************************************************/ 1021/*****************************************************************************/
… …
917} 1093}
918 1094
919unsigned int 1095unsigned int
920ev_embeddable_backends (void) 1096ev_embeddable_backends (void)
921{ 1097{
922 return EVBACKEND_EPOLL 1098 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
923 | EVBACKEND_KQUEUE 1099
924 | EVBACKEND_PORT; 1100 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1101 /* please fix it and tell me how to detect the fix */
1102 flags &= ~EVBACKEND_EPOLL;
1103
1104 return flags;
925} 1105}
926 1106
927unsigned int 1107unsigned int
928ev_backend (EV_P) 1108ev_backend (EV_P)
929{ 1109{
… …
932 1112
933unsigned int 1113unsigned int
934ev_loop_count (EV_P) 1114ev_loop_count (EV_P)
935{ 1115{
936 return loop_count; 1116 return loop_count;
1117}
1118
1119void
1120ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1121{
1122 io_blocktime = interval;
1123}
1124
1125void
1126ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1127{
1128 timeout_blocktime = interval;
937} 1129}
938 1130
939static void noinline 1131static void noinline
940loop_init (EV_P_ unsigned int flags) 1132loop_init (EV_P_ unsigned int flags)
941{ 1133{
… …
947 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1139 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
948 have_monotonic = 1; 1140 have_monotonic = 1;
949 } 1141 }
950#endif 1142#endif
951 1143
952 ev_rt_now = ev_time (); 1144 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1145 mn_now = get_clock ();
954 now_floor = mn_now; 1146 now_floor = mn_now;
955 rtmn_diff = ev_rt_now - mn_now; 1147 rtmn_diff = ev_rt_now - mn_now;
1148
1149 io_blocktime = 0.;
1150 timeout_blocktime = 0.;
1151 backend = 0;
1152 backend_fd = -1;
1153 gotasync = 0;
1154#if EV_USE_INOTIFY
1155 fs_fd = -2;
1156#endif
956 1157
957 /* pid check not overridable via env */ 1158 /* pid check not overridable via env */
958#ifndef _WIN32 1159#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1160 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1161 curpid = getpid ();
… …
966 flags = atoi (getenv ("LIBEV_FLAGS")); 1167 flags = atoi (getenv ("LIBEV_FLAGS"));
967 1168
968 if (!(flags & 0x0000ffffUL)) 1169 if (!(flags & 0x0000ffffUL))
969 flags |= ev_recommended_backends (); 1170 flags |= ev_recommended_backends ();
970 1171
971 backend = 0;
972 backend_fd = -1;
973#if EV_USE_INOTIFY
974 fs_fd = -2;
975#endif
976
977#if EV_USE_PORT 1172#if EV_USE_PORT
978 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1173 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
979#endif 1174#endif
980#if EV_USE_KQUEUE 1175#if EV_USE_KQUEUE
981 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1176 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
988#endif 1183#endif
989#if EV_USE_SELECT 1184#if EV_USE_SELECT
990 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1185 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
991#endif 1186#endif
992 1187
993 ev_init (&sigev, sigcb); 1188 ev_init (&pipeev, pipecb);
994 ev_set_priority (&sigev, EV_MAXPRI); 1189 ev_set_priority (&pipeev, EV_MAXPRI);
995 } 1190 }
996} 1191}
997 1192
998static void noinline 1193static void noinline
999loop_destroy (EV_P) 1194loop_destroy (EV_P)
1000{ 1195{
1001 int i; 1196 int i;
1197
1198 if (ev_is_active (&pipeev))
1199 {
1200 ev_ref (EV_A); /* signal watcher */
1201 ev_io_stop (EV_A_ &pipeev);
1202
1203#if EV_USE_EVENTFD
1204 if (evfd >= 0)
1205 close (evfd);
1206#endif
1207
1208 if (evpipe [0] >= 0)
1209 {
1210 close (evpipe [0]);
1211 close (evpipe [1]);
1212 }
1213 }
1002 1214
1003#if EV_USE_INOTIFY 1215#if EV_USE_INOTIFY
1004 if (fs_fd >= 0) 1216 if (fs_fd >= 0)
1005 close (fs_fd); 1217 close (fs_fd);
1006#endif 1218#endif
… …
1029 array_free (pending, [i]); 1241 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1242#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1243 array_free (idle, [i]);
1032#endif 1244#endif
1033 } 1245 }
1246
1247 ev_free (anfds); anfdmax = 0;
1034 1248
1035 /* have to use the microsoft-never-gets-it-right macro */ 1249 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1250 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1251 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1252#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1253 array_free (periodic, EMPTY);
1040#endif 1254#endif
1255#if EV_FORK_ENABLE
1256 array_free (fork, EMPTY);
1257#endif
1041 array_free (prepare, EMPTY); 1258 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1259 array_free (check, EMPTY);
1260#if EV_ASYNC_ENABLE
1261 array_free (async, EMPTY);
1262#endif
1043 1263
1044 backend = 0; 1264 backend = 0;
1045} 1265}
1046 1266
1047void inline_size infy_fork (EV_P); 1267void inline_size infy_fork (EV_P);
… …
1060#endif 1280#endif
1061#if EV_USE_INOTIFY 1281#if EV_USE_INOTIFY
1062 infy_fork (EV_A); 1282 infy_fork (EV_A);
1063#endif 1283#endif
1064 1284
1065 if (ev_is_active (&sigev)) 1285 if (ev_is_active (&pipeev))
1066 { 1286 {
1067 /* default loop */ 1287 /* this "locks" the handlers against writing to the pipe */
1288 /* while we modify the fd vars */
1289 gotsig = 1;
1290#if EV_ASYNC_ENABLE
1291 gotasync = 1;
1292#endif
1068 1293
1069 ev_ref (EV_A); 1294 ev_ref (EV_A);
1070 ev_io_stop (EV_A_ &sigev); 1295 ev_io_stop (EV_A_ &pipeev);
1296
1297#if EV_USE_EVENTFD
1298 if (evfd >= 0)
1299 close (evfd);
1300#endif
1301
1302 if (evpipe [0] >= 0)
1303 {
1071 close (sigpipe [0]); 1304 close (evpipe [0]);
1072 close (sigpipe [1]); 1305 close (evpipe [1]);
1306 }
1073 1307
1074 while (pipe (sigpipe))
1075 syserr ("(libev) error creating pipe");
1076
1077 siginit (EV_A); 1308 evpipe_init (EV_A);
1309 /* now iterate over everything, in case we missed something */
1310 pipecb (EV_A_ &pipeev, EV_READ);
1078 } 1311 }
1079 1312
1080 postfork = 0; 1313 postfork = 0;
1081} 1314}
1082 1315
… …
1104} 1337}
1105 1338
1106void 1339void
1107ev_loop_fork (EV_P) 1340ev_loop_fork (EV_P)
1108{ 1341{
1109 postfork = 1; 1342 postfork = 1; /* must be in line with ev_default_fork */
1110} 1343}
1111 1344
1112#endif 1345#endif
1113 1346
1114#if EV_MULTIPLICITY 1347#if EV_MULTIPLICITY
… …
1117#else 1350#else
1118int 1351int
1119ev_default_loop (unsigned int flags) 1352ev_default_loop (unsigned int flags)
1120#endif 1353#endif
1121{ 1354{
1122 if (sigpipe [0] == sigpipe [1])
1123 if (pipe (sigpipe))
1124 return 0;
1125
1126 if (!ev_default_loop_ptr) 1355 if (!ev_default_loop_ptr)
1127 { 1356 {
1128#if EV_MULTIPLICITY 1357#if EV_MULTIPLICITY
1129 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1358 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1130#else 1359#else
… …
1133 1362
1134 loop_init (EV_A_ flags); 1363 loop_init (EV_A_ flags);
1135 1364
1136 if (ev_backend (EV_A)) 1365 if (ev_backend (EV_A))
1137 { 1366 {
1138 siginit (EV_A);
1139
1140#ifndef _WIN32 1367#ifndef _WIN32
1141 ev_signal_init (&childev, childcb, SIGCHLD); 1368 ev_signal_init (&childev, childcb, SIGCHLD);
1142 ev_set_priority (&childev, EV_MAXPRI); 1369 ev_set_priority (&childev, EV_MAXPRI);
1143 ev_signal_start (EV_A_ &childev); 1370 ev_signal_start (EV_A_ &childev);
1144 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1371 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1161#ifndef _WIN32 1388#ifndef _WIN32
1162 ev_ref (EV_A); /* child watcher */ 1389 ev_ref (EV_A); /* child watcher */
1163 ev_signal_stop (EV_A_ &childev); 1390 ev_signal_stop (EV_A_ &childev);
1164#endif 1391#endif
1165 1392
1166 ev_ref (EV_A); /* signal watcher */
1167 ev_io_stop (EV_A_ &sigev);
1168
1169 close (sigpipe [0]); sigpipe [0] = 0;
1170 close (sigpipe [1]); sigpipe [1] = 0;
1171
1172 loop_destroy (EV_A); 1393 loop_destroy (EV_A);
1173} 1394}
1174 1395
1175void 1396void
1176ev_default_fork (void) 1397ev_default_fork (void)
… …
1178#if EV_MULTIPLICITY 1399#if EV_MULTIPLICITY
1179 struct ev_loop *loop = ev_default_loop_ptr; 1400 struct ev_loop *loop = ev_default_loop_ptr;
1180#endif 1401#endif
1181 1402
1182 if (backend) 1403 if (backend)
1183 postfork = 1; 1404 postfork = 1; /* must be in line with ev_loop_fork */
1184} 1405}
1185 1406
1186/*****************************************************************************/ 1407/*****************************************************************************/
1187 1408
1188void 1409void
… …
1397static int loop_done; 1618static int loop_done;
1398 1619
1399void 1620void
1400ev_loop (EV_P_ int flags) 1621ev_loop (EV_P_ int flags)
1401{ 1622{
1402 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1623 loop_done = EVUNLOOP_CANCEL;
1403 ? EVUNLOOP_ONE
1404 : EVUNLOOP_CANCEL;
1405 1624
1406 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1625 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1407 1626
1408 do 1627 do
1409 { 1628 {
… …
1443 /* update fd-related kernel structures */ 1662 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1663 fd_reify (EV_A);
1445 1664
1446 /* calculate blocking time */ 1665 /* calculate blocking time */
1447 { 1666 {
1448 ev_tstamp block; 1667 ev_tstamp waittime = 0.;
1668 ev_tstamp sleeptime = 0.;
1449 1669
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1670 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1671 {
1454 /* update time to cancel out callback processing overhead */ 1672 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 1673 time_update (EV_A_ 1e100);
1456 1674
1457 block = MAX_BLOCKTIME; 1675 waittime = MAX_BLOCKTIME;
1458 1676
1459 if (timercnt) 1677 if (timercnt)
1460 { 1678 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1679 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1462 if (block > to) block = to; 1680 if (waittime > to) waittime = to;
1463 } 1681 }
1464 1682
1465#if EV_PERIODIC_ENABLE 1683#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 1684 if (periodiccnt)
1467 { 1685 {
1468 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1686 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1469 if (block > to) block = to; 1687 if (waittime > to) waittime = to;
1470 } 1688 }
1471#endif 1689#endif
1472 1690
1473 if (expect_false (block < 0.)) block = 0.; 1691 if (expect_false (waittime < timeout_blocktime))
1692 waittime = timeout_blocktime;
1693
1694 sleeptime = waittime - backend_fudge;
1695
1696 if (expect_true (sleeptime > io_blocktime))
1697 sleeptime = io_blocktime;
1698
1699 if (sleeptime)
1700 {
1701 ev_sleep (sleeptime);
1702 waittime -= sleeptime;
1703 }
1474 } 1704 }
1475 1705
1476 ++loop_count; 1706 ++loop_count;
1477 backend_poll (EV_A_ block); 1707 backend_poll (EV_A_ waittime);
1478 1708
1479 /* update ev_rt_now, do magic */ 1709 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 1710 time_update (EV_A_ waittime + sleeptime);
1481 } 1711 }
1482 1712
1483 /* queue pending timers and reschedule them */ 1713 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 1714 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 1715#if EV_PERIODIC_ENABLE
… …
1494 /* queue check watchers, to be executed first */ 1724 /* queue check watchers, to be executed first */
1495 if (expect_false (checkcnt)) 1725 if (expect_false (checkcnt))
1496 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1726 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1497 1727
1498 call_pending (EV_A); 1728 call_pending (EV_A);
1499
1500 } 1729 }
1501 while (expect_true (activecnt && !loop_done)); 1730 while (expect_true (
1731 activecnt
1732 && !loop_done
1733 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1734 ));
1502 1735
1503 if (loop_done == EVUNLOOP_ONE) 1736 if (loop_done == EVUNLOOP_ONE)
1504 loop_done = EVUNLOOP_CANCEL; 1737 loop_done = EVUNLOOP_CANCEL;
1505} 1738}
1506 1739
… …
1597 1830
1598 assert (("ev_io_start called with negative fd", fd >= 0)); 1831 assert (("ev_io_start called with negative fd", fd >= 0));
1599 1832
1600 ev_start (EV_A_ (W)w, 1); 1833 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1834 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1602 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1835 wlist_add (&anfds[fd].head, (WL)w);
1603 1836
1604 fd_change (EV_A_ fd); 1837 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1838 w->events &= ~EV_IOFDSET;
1605} 1839}
1606 1840
1607void noinline 1841void noinline
1608ev_io_stop (EV_P_ ev_io *w) 1842ev_io_stop (EV_P_ ev_io *w)
1609{ 1843{
… …
1611 if (expect_false (!ev_is_active (w))) 1845 if (expect_false (!ev_is_active (w)))
1612 return; 1846 return;
1613 1847
1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1848 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1615 1849
1616 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1850 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 1851 ev_stop (EV_A_ (W)w);
1618 1852
1619 fd_change (EV_A_ w->fd); 1853 fd_change (EV_A_ w->fd, 1);
1620} 1854}
1621 1855
1622void noinline 1856void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 1857ev_timer_start (EV_P_ ev_timer *w)
1624{ 1858{
… …
1751 if (expect_false (ev_is_active (w))) 1985 if (expect_false (ev_is_active (w)))
1752 return; 1986 return;
1753 1987
1754 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1988 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1755 1989
1990 evpipe_init (EV_A);
1991
1756 { 1992 {
1757#ifndef _WIN32 1993#ifndef _WIN32
1758 sigset_t full, prev; 1994 sigset_t full, prev;
1759 sigfillset (&full); 1995 sigfillset (&full);
1760 sigprocmask (SIG_SETMASK, &full, &prev); 1996 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1766 sigprocmask (SIG_SETMASK, &prev, 0); 2002 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif 2003#endif
1768 } 2004 }
1769 2005
1770 ev_start (EV_A_ (W)w, 1); 2006 ev_start (EV_A_ (W)w, 1);
1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2007 wlist_add (&signals [w->signum - 1].head, (WL)w);
1772 2008
1773 if (!((WL)w)->next) 2009 if (!((WL)w)->next)
1774 { 2010 {
1775#if _WIN32 2011#if _WIN32
1776 signal (w->signum, sighandler); 2012 signal (w->signum, ev_sighandler);
1777#else 2013#else
1778 struct sigaction sa; 2014 struct sigaction sa;
1779 sa.sa_handler = sighandler; 2015 sa.sa_handler = ev_sighandler;
1780 sigfillset (&sa.sa_mask); 2016 sigfillset (&sa.sa_mask);
1781 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2017 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1782 sigaction (w->signum, &sa, 0); 2018 sigaction (w->signum, &sa, 0);
1783#endif 2019#endif
1784 } 2020 }
… …
1789{ 2025{
1790 clear_pending (EV_A_ (W)w); 2026 clear_pending (EV_A_ (W)w);
1791 if (expect_false (!ev_is_active (w))) 2027 if (expect_false (!ev_is_active (w)))
1792 return; 2028 return;
1793 2029
1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2030 wlist_del (&signals [w->signum - 1].head, (WL)w);
1795 ev_stop (EV_A_ (W)w); 2031 ev_stop (EV_A_ (W)w);
1796 2032
1797 if (!signals [w->signum - 1].head) 2033 if (!signals [w->signum - 1].head)
1798 signal (w->signum, SIG_DFL); 2034 signal (w->signum, SIG_DFL);
1799} 2035}
… …
1806#endif 2042#endif
1807 if (expect_false (ev_is_active (w))) 2043 if (expect_false (ev_is_active (w)))
1808 return; 2044 return;
1809 2045
1810 ev_start (EV_A_ (W)w, 1); 2046 ev_start (EV_A_ (W)w, 1);
1811 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2047 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1812} 2048}
1813 2049
1814void 2050void
1815ev_child_stop (EV_P_ ev_child *w) 2051ev_child_stop (EV_P_ ev_child *w)
1816{ 2052{
1817 clear_pending (EV_A_ (W)w); 2053 clear_pending (EV_A_ (W)w);
1818 if (expect_false (!ev_is_active (w))) 2054 if (expect_false (!ev_is_active (w)))
1819 return; 2055 return;
1820 2056
1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2057 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1822 ev_stop (EV_A_ (W)w); 2058 ev_stop (EV_A_ (W)w);
1823} 2059}
1824 2060
1825#if EV_STAT_ENABLE 2061#if EV_STAT_ENABLE
1826 2062
… …
2168 2404
2169#if EV_EMBED_ENABLE 2405#if EV_EMBED_ENABLE
2170void noinline 2406void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2407ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2408{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2409 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2410}
2175 2411
2176static void 2412static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2413embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2414{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2415 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2416
2181 if (ev_cb (w)) 2417 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2418 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2419 else
2184 ev_embed_sweep (loop, w); 2420 ev_loop (w->other, EVLOOP_NONBLOCK);
2185} 2421}
2422
2423static void
2424embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2425{
2426 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2427
2428 {
2429 struct ev_loop *loop = w->other;
2430
2431 while (fdchangecnt)
2432 {
2433 fd_reify (EV_A);
2434 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2435 }
2436 }
2437}
2438
2439#if 0
2440static void
2441embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2442{
2443 ev_idle_stop (EV_A_ idle);
2444}
2445#endif
2186 2446
2187void 2447void
2188ev_embed_start (EV_P_ ev_embed *w) 2448ev_embed_start (EV_P_ ev_embed *w)
2189{ 2449{
2190 if (expect_false (ev_is_active (w))) 2450 if (expect_false (ev_is_active (w)))
2191 return; 2451 return;
2192 2452
2193 { 2453 {
2194 struct ev_loop *loop = w->loop; 2454 struct ev_loop *loop = w->other;
2195 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2455 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2456 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2457 }
2198 2458
2199 ev_set_priority (&w->io, ev_priority (w)); 2459 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2460 ev_io_start (EV_A_ &w->io);
2201 2461
2462 ev_prepare_init (&w->prepare, embed_prepare_cb);
2463 ev_set_priority (&w->prepare, EV_MINPRI);
2464 ev_prepare_start (EV_A_ &w->prepare);
2465
2466 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2467
2202 ev_start (EV_A_ (W)w, 1); 2468 ev_start (EV_A_ (W)w, 1);
2203} 2469}
2204 2470
2205void 2471void
2206ev_embed_stop (EV_P_ ev_embed *w) 2472ev_embed_stop (EV_P_ ev_embed *w)
… …
2208 clear_pending (EV_A_ (W)w); 2474 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2475 if (expect_false (!ev_is_active (w)))
2210 return; 2476 return;
2211 2477
2212 ev_io_stop (EV_A_ &w->io); 2478 ev_io_stop (EV_A_ &w->io);
2479 ev_prepare_stop (EV_A_ &w->prepare);
2213 2480
2214 ev_stop (EV_A_ (W)w); 2481 ev_stop (EV_A_ (W)w);
2215} 2482}
2216#endif 2483#endif
2217 2484
… …
2242 2509
2243 ev_stop (EV_A_ (W)w); 2510 ev_stop (EV_A_ (W)w);
2244} 2511}
2245#endif 2512#endif
2246 2513
2514#if EV_ASYNC_ENABLE
2515void
2516ev_async_start (EV_P_ ev_async *w)
2517{
2518 if (expect_false (ev_is_active (w)))
2519 return;
2520
2521 evpipe_init (EV_A);
2522
2523 ev_start (EV_A_ (W)w, ++asynccnt);
2524 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2525 asyncs [asynccnt - 1] = w;
2526}
2527
2528void
2529ev_async_stop (EV_P_ ev_async *w)
2530{
2531 clear_pending (EV_A_ (W)w);
2532 if (expect_false (!ev_is_active (w)))
2533 return;
2534
2535 {
2536 int active = ((W)w)->active;
2537 asyncs [active - 1] = asyncs [--asynccnt];
2538 ((W)asyncs [active - 1])->active = active;
2539 }
2540
2541 ev_stop (EV_A_ (W)w);
2542}
2543
2544void
2545ev_async_send (EV_P_ ev_async *w)
2546{
2547 w->sent = 1;
2548 evpipe_write (EV_A_ &gotasync);
2549}
2550#endif
2551
2247/*****************************************************************************/ 2552/*****************************************************************************/
2248 2553
2249struct ev_once 2554struct ev_once
2250{ 2555{
2251 ev_io io; 2556 ev_io io;
… …
2306 ev_timer_set (&once->to, timeout, 0.); 2611 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 2612 ev_timer_start (EV_A_ &once->to);
2308 } 2613 }
2309} 2614}
2310 2615
2616#if EV_MULTIPLICITY
2617 #include "ev_wrap.h"
2618#endif
2619
2311#ifdef __cplusplus 2620#ifdef __cplusplus
2312} 2621}
2313#endif 2622#endif
2314 2623

Diff Legend

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