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.226 by root, Fri Apr 18 17:16:44 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 271#if EV_USE_EVENTFD
212# define EV_USE_INOTIFY 0 272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
213#endif 276# endif
214 277int eventfd (unsigned int initval, int flags);
215#if EV_USE_INOTIFY 278# ifdef __cplusplus
216# include <sys/inotify.h> 279}
280# endif
217#endif 281#endif
218 282
219/**/ 283/**/
220 284
221/* 285/*
… …
230 294
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 295#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) */ 296#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 */ 297/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 298
235#if __GNUC__ >= 3 299#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
238#else 302#else
239# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
240# define noinline 304# define noinline
241# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
242# define inline 306# define inline
243# endif 307# endif
244#endif 308#endif
245 309
246#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
261 325
262typedef ev_watcher *W; 326typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
265 329
330#if EV_USE_MONOTONIC
331/* sig_atomic_t is used to avoid per-thread variables or locking but still */
332/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif
267 335
268#ifdef _WIN32 336#ifdef _WIN32
269# include "ev_win32.c" 337# include "ev_win32.c"
270#endif 338#endif
271 339
… …
292 perror (msg); 360 perror (msg);
293 abort (); 361 abort ();
294 } 362 }
295} 363}
296 364
365static void *
366ev_realloc_emul (void *ptr, long size)
367{
368 /* some systems, notably openbsd and darwin, fail to properly
369 * implement realloc (x, 0) (as required by both ansi c-98 and
370 * the single unix specification, so work around them here.
371 */
372
373 if (size)
374 return realloc (ptr, size);
375
376 free (ptr);
377 return 0;
378}
379
297static void *(*alloc)(void *ptr, long size); 380static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
298 381
299void 382void
300ev_set_allocator (void *(*cb)(void *ptr, long size)) 383ev_set_allocator (void *(*cb)(void *ptr, long size))
301{ 384{
302 alloc = cb; 385 alloc = cb;
303} 386}
304 387
305inline_speed void * 388inline_speed void *
306ev_realloc (void *ptr, long size) 389ev_realloc (void *ptr, long size)
307{ 390{
308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 391 ptr = alloc (ptr, size);
309 392
310 if (!ptr && size) 393 if (!ptr && size)
311 { 394 {
312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 395 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
313 abort (); 396 abort ();
… …
407{ 490{
408 return ev_rt_now; 491 return ev_rt_now;
409} 492}
410#endif 493#endif
411 494
495void
496ev_sleep (ev_tstamp delay)
497{
498 if (delay > 0.)
499 {
500#if EV_USE_NANOSLEEP
501 struct timespec ts;
502
503 ts.tv_sec = (time_t)delay;
504 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
505
506 nanosleep (&ts, 0);
507#elif defined(_WIN32)
508 Sleep ((unsigned long)(delay * 1e3));
509#else
510 struct timeval tv;
511
512 tv.tv_sec = (time_t)delay;
513 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
514
515 select (0, 0, 0, 0, &tv);
516#endif
517 }
518}
519
520/*****************************************************************************/
521
412int inline_size 522int inline_size
413array_nextsize (int elem, int cur, int cnt) 523array_nextsize (int elem, int cur, int cnt)
414{ 524{
415 int ncur = cur + 1; 525 int ncur = cur + 1;
416 526
… …
533 { 643 {
534 int fd = fdchanges [i]; 644 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 645 ANFD *anfd = anfds + fd;
536 ev_io *w; 646 ev_io *w;
537 647
538 int events = 0; 648 unsigned char events = 0;
539 649
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 650 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 651 events |= (unsigned char)w->events;
542 652
543#if EV_SELECT_IS_WINSOCKET 653#if EV_SELECT_IS_WINSOCKET
544 if (events) 654 if (events)
545 { 655 {
546 unsigned long argp; 656 unsigned long argp;
657 #ifdef EV_FD_TO_WIN32_HANDLE
658 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
659 #else
547 anfd->handle = _get_osfhandle (fd); 660 anfd->handle = _get_osfhandle (fd);
661 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 662 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 663 }
550#endif 664#endif
551 665
666 {
667 unsigned char o_events = anfd->events;
668 unsigned char o_reify = anfd->reify;
669
552 anfd->reify = 0; 670 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 671 anfd->events = events;
672
673 if (o_events != events || o_reify & EV_IOFDSET)
674 backend_modify (EV_A_ fd, o_events, events);
675 }
556 } 676 }
557 677
558 fdchangecnt = 0; 678 fdchangecnt = 0;
559} 679}
560 680
561void inline_size 681void inline_size
562fd_change (EV_P_ int fd) 682fd_change (EV_P_ int fd, int flags)
563{ 683{
564 if (expect_false (anfds [fd].reify)) 684 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 685 anfds [fd].reify |= flags;
568 686
687 if (expect_true (!reify))
688 {
569 ++fdchangecnt; 689 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 690 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 691 fdchanges [fdchangecnt - 1] = fd;
692 }
572} 693}
573 694
574void inline_speed 695void inline_speed
575fd_kill (EV_P_ int fd) 696fd_kill (EV_P_ int fd)
576{ 697{
… …
627 748
628 for (fd = 0; fd < anfdmax; ++fd) 749 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 750 if (anfds [fd].events)
630 { 751 {
631 anfds [fd].events = 0; 752 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 753 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 754 }
634} 755}
635 756
636/*****************************************************************************/ 757/*****************************************************************************/
637 758
… …
694/*****************************************************************************/ 815/*****************************************************************************/
695 816
696typedef struct 817typedef struct
697{ 818{
698 WL head; 819 WL head;
699 sig_atomic_t volatile gotsig; 820 EV_ATOMIC_T gotsig;
700} ANSIG; 821} ANSIG;
701 822
702static ANSIG *signals; 823static ANSIG *signals;
703static int signalmax; 824static int signalmax;
704 825
705static int sigpipe [2]; 826static EV_ATOMIC_T gotsig;
706static sig_atomic_t volatile gotsig;
707static ev_io sigev;
708 827
709void inline_size 828void inline_size
710signals_init (ANSIG *base, int count) 829signals_init (ANSIG *base, int count)
711{ 830{
712 while (count--) 831 while (count--)
… …
716 835
717 ++base; 836 ++base;
718 } 837 }
719} 838}
720 839
721static void 840/*****************************************************************************/
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 841
772void inline_speed 842void inline_speed
773fd_intern (int fd) 843fd_intern (int fd)
774{ 844{
775#ifdef _WIN32 845#ifdef _WIN32
… …
780 fcntl (fd, F_SETFL, O_NONBLOCK); 850 fcntl (fd, F_SETFL, O_NONBLOCK);
781#endif 851#endif
782} 852}
783 853
784static void noinline 854static void noinline
785siginit (EV_P) 855evpipe_init (EV_P)
786{ 856{
857 if (!ev_is_active (&pipeev))
858 {
859#if EV_USE_EVENTFD
860 if ((evfd = eventfd (0, 0)) >= 0)
861 {
862 evpipe [0] = -1;
863 fd_intern (evfd);
864 ev_io_set (&pipeev, evfd, EV_READ);
865 }
866 else
867#endif
868 {
869 while (pipe (evpipe))
870 syserr ("(libev) error creating signal/async pipe");
871
787 fd_intern (sigpipe [0]); 872 fd_intern (evpipe [0]);
788 fd_intern (sigpipe [1]); 873 fd_intern (evpipe [1]);
874 ev_io_set (&pipeev, evpipe [0], EV_READ);
875 }
789 876
790 ev_io_set (&sigev, sigpipe [0], EV_READ);
791 ev_io_start (EV_A_ &sigev); 877 ev_io_start (EV_A_ &pipeev);
792 ev_unref (EV_A); /* child watcher should not keep loop alive */ 878 ev_unref (EV_A); /* watcher should not keep loop alive */
879 }
880}
881
882void inline_size
883evpipe_write (EV_P_ EV_ATOMIC_T *flag)
884{
885 if (!*flag)
886 {
887 int old_errno = errno; /* save errno because write might clobber it */
888
889 *flag = 1;
890
891#if EV_USE_EVENTFD
892 if (evfd >= 0)
893 {
894 uint64_t counter = 1;
895 write (evfd, &counter, sizeof (uint64_t));
896 }
897 else
898#endif
899 write (evpipe [1], &old_errno, 1);
900
901 errno = old_errno;
902 }
903}
904
905static void
906pipecb (EV_P_ ev_io *iow, int revents)
907{
908#if EV_USE_EVENTFD
909 if (evfd >= 0)
910 {
911 uint64_t counter = 1;
912 read (evfd, &counter, sizeof (uint64_t));
913 }
914 else
915#endif
916 {
917 char dummy;
918 read (evpipe [0], &dummy, 1);
919 }
920
921 if (gotsig && ev_is_default_loop (EV_A))
922 {
923 int signum;
924 gotsig = 0;
925
926 for (signum = signalmax; signum--; )
927 if (signals [signum].gotsig)
928 ev_feed_signal_event (EV_A_ signum + 1);
929 }
930
931#if EV_ASYNC_ENABLE
932 if (gotasync)
933 {
934 int i;
935 gotasync = 0;
936
937 for (i = asynccnt; i--; )
938 if (asyncs [i]->sent)
939 {
940 asyncs [i]->sent = 0;
941 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
942 }
943 }
944#endif
793} 945}
794 946
795/*****************************************************************************/ 947/*****************************************************************************/
796 948
949static void
950ev_sighandler (int signum)
951{
952#if EV_MULTIPLICITY
953 struct ev_loop *loop = &default_loop_struct;
954#endif
955
956#if _WIN32
957 signal (signum, ev_sighandler);
958#endif
959
960 signals [signum - 1].gotsig = 1;
961 evpipe_write (EV_A_ &gotsig);
962}
963
964void noinline
965ev_feed_signal_event (EV_P_ int signum)
966{
967 WL w;
968
969#if EV_MULTIPLICITY
970 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
971#endif
972
973 --signum;
974
975 if (signum < 0 || signum >= signalmax)
976 return;
977
978 signals [signum].gotsig = 0;
979
980 for (w = signals [signum].head; w; w = w->next)
981 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
982}
983
984/*****************************************************************************/
985
797static ev_child *childs [EV_PID_HASHSIZE]; 986static WL childs [EV_PID_HASHSIZE];
798 987
799#ifndef _WIN32 988#ifndef _WIN32
800 989
801static ev_signal childev; 990static ev_signal childev;
802 991
992#ifndef WIFCONTINUED
993# define WIFCONTINUED(status) 0
994#endif
995
803void inline_speed 996void inline_speed
804child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 997child_reap (EV_P_ int chain, int pid, int status)
805{ 998{
806 ev_child *w; 999 ev_child *w;
1000 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
807 1001
808 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1002 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1003 {
809 if (w->pid == pid || !w->pid) 1004 if ((w->pid == pid || !w->pid)
1005 && (!traced || (w->flags & 1)))
810 { 1006 {
811 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1007 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; 1008 w->rpid = pid;
813 w->rstatus = status; 1009 w->rstatus = status;
814 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1010 ev_feed_event (EV_A_ (W)w, EV_CHILD);
815 } 1011 }
1012 }
816} 1013}
817 1014
818#ifndef WCONTINUED 1015#ifndef WCONTINUED
819# define WCONTINUED 0 1016# define WCONTINUED 0
820#endif 1017#endif
… …
829 if (!WCONTINUED 1026 if (!WCONTINUED
830 || errno != EINVAL 1027 || errno != EINVAL
831 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1028 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
832 return; 1029 return;
833 1030
834 /* make sure we are called again until all childs have been reaped */ 1031 /* 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 */ 1032 /* 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); 1033 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
837 1034
838 child_reap (EV_A_ sw, pid, pid, status); 1035 child_reap (EV_A_ pid, pid, status);
839 if (EV_PID_HASHSIZE > 1) 1036 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 */ 1037 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
841} 1038}
842 1039
843#endif 1040#endif
844 1041
845/*****************************************************************************/ 1042/*****************************************************************************/
… …
917} 1114}
918 1115
919unsigned int 1116unsigned int
920ev_embeddable_backends (void) 1117ev_embeddable_backends (void)
921{ 1118{
922 return EVBACKEND_EPOLL 1119 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
923 | EVBACKEND_KQUEUE 1120
924 | EVBACKEND_PORT; 1121 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1122 /* please fix it and tell me how to detect the fix */
1123 flags &= ~EVBACKEND_EPOLL;
1124
1125 return flags;
925} 1126}
926 1127
927unsigned int 1128unsigned int
928ev_backend (EV_P) 1129ev_backend (EV_P)
929{ 1130{
… …
932 1133
933unsigned int 1134unsigned int
934ev_loop_count (EV_P) 1135ev_loop_count (EV_P)
935{ 1136{
936 return loop_count; 1137 return loop_count;
1138}
1139
1140void
1141ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1142{
1143 io_blocktime = interval;
1144}
1145
1146void
1147ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1148{
1149 timeout_blocktime = interval;
937} 1150}
938 1151
939static void noinline 1152static void noinline
940loop_init (EV_P_ unsigned int flags) 1153loop_init (EV_P_ unsigned int flags)
941{ 1154{
… …
947 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1160 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
948 have_monotonic = 1; 1161 have_monotonic = 1;
949 } 1162 }
950#endif 1163#endif
951 1164
952 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1166 mn_now = get_clock ();
954 now_floor = mn_now; 1167 now_floor = mn_now;
955 rtmn_diff = ev_rt_now - mn_now; 1168 rtmn_diff = ev_rt_now - mn_now;
1169
1170 io_blocktime = 0.;
1171 timeout_blocktime = 0.;
1172 backend = 0;
1173 backend_fd = -1;
1174 gotasync = 0;
1175#if EV_USE_INOTIFY
1176 fs_fd = -2;
1177#endif
956 1178
957 /* pid check not overridable via env */ 1179 /* pid check not overridable via env */
958#ifndef _WIN32 1180#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1181 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1182 curpid = getpid ();
… …
963 if (!(flags & EVFLAG_NOENV) 1185 if (!(flags & EVFLAG_NOENV)
964 && !enable_secure () 1186 && !enable_secure ()
965 && getenv ("LIBEV_FLAGS")) 1187 && getenv ("LIBEV_FLAGS"))
966 flags = atoi (getenv ("LIBEV_FLAGS")); 1188 flags = atoi (getenv ("LIBEV_FLAGS"));
967 1189
968 if (!(flags & 0x0000ffffUL)) 1190 if (!(flags & 0x0000ffffU))
969 flags |= ev_recommended_backends (); 1191 flags |= ev_recommended_backends ();
970
971 backend = 0;
972 backend_fd = -1;
973#if EV_USE_INOTIFY
974 fs_fd = -2;
975#endif
976 1192
977#if EV_USE_PORT 1193#if EV_USE_PORT
978 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1194 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
979#endif 1195#endif
980#if EV_USE_KQUEUE 1196#if EV_USE_KQUEUE
… …
988#endif 1204#endif
989#if EV_USE_SELECT 1205#if EV_USE_SELECT
990 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1206 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
991#endif 1207#endif
992 1208
993 ev_init (&sigev, sigcb); 1209 ev_init (&pipeev, pipecb);
994 ev_set_priority (&sigev, EV_MAXPRI); 1210 ev_set_priority (&pipeev, EV_MAXPRI);
995 } 1211 }
996} 1212}
997 1213
998static void noinline 1214static void noinline
999loop_destroy (EV_P) 1215loop_destroy (EV_P)
1000{ 1216{
1001 int i; 1217 int i;
1218
1219 if (ev_is_active (&pipeev))
1220 {
1221 ev_ref (EV_A); /* signal watcher */
1222 ev_io_stop (EV_A_ &pipeev);
1223
1224#if EV_USE_EVENTFD
1225 if (evfd >= 0)
1226 close (evfd);
1227#endif
1228
1229 if (evpipe [0] >= 0)
1230 {
1231 close (evpipe [0]);
1232 close (evpipe [1]);
1233 }
1234 }
1002 1235
1003#if EV_USE_INOTIFY 1236#if EV_USE_INOTIFY
1004 if (fs_fd >= 0) 1237 if (fs_fd >= 0)
1005 close (fs_fd); 1238 close (fs_fd);
1006#endif 1239#endif
… …
1029 array_free (pending, [i]); 1262 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1263#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1264 array_free (idle, [i]);
1032#endif 1265#endif
1033 } 1266 }
1267
1268 ev_free (anfds); anfdmax = 0;
1034 1269
1035 /* have to use the microsoft-never-gets-it-right macro */ 1270 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1271 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1272 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1273#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1274 array_free (periodic, EMPTY);
1040#endif 1275#endif
1276#if EV_FORK_ENABLE
1277 array_free (fork, EMPTY);
1278#endif
1041 array_free (prepare, EMPTY); 1279 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1280 array_free (check, EMPTY);
1281#if EV_ASYNC_ENABLE
1282 array_free (async, EMPTY);
1283#endif
1043 1284
1044 backend = 0; 1285 backend = 0;
1045} 1286}
1046 1287
1288#if EV_USE_INOTIFY
1047void inline_size infy_fork (EV_P); 1289void inline_size infy_fork (EV_P);
1290#endif
1048 1291
1049void inline_size 1292void inline_size
1050loop_fork (EV_P) 1293loop_fork (EV_P)
1051{ 1294{
1052#if EV_USE_PORT 1295#if EV_USE_PORT
… …
1060#endif 1303#endif
1061#if EV_USE_INOTIFY 1304#if EV_USE_INOTIFY
1062 infy_fork (EV_A); 1305 infy_fork (EV_A);
1063#endif 1306#endif
1064 1307
1065 if (ev_is_active (&sigev)) 1308 if (ev_is_active (&pipeev))
1066 { 1309 {
1067 /* default loop */ 1310 /* this "locks" the handlers against writing to the pipe */
1311 /* while we modify the fd vars */
1312 gotsig = 1;
1313#if EV_ASYNC_ENABLE
1314 gotasync = 1;
1315#endif
1068 1316
1069 ev_ref (EV_A); 1317 ev_ref (EV_A);
1070 ev_io_stop (EV_A_ &sigev); 1318 ev_io_stop (EV_A_ &pipeev);
1319
1320#if EV_USE_EVENTFD
1321 if (evfd >= 0)
1322 close (evfd);
1323#endif
1324
1325 if (evpipe [0] >= 0)
1326 {
1071 close (sigpipe [0]); 1327 close (evpipe [0]);
1072 close (sigpipe [1]); 1328 close (evpipe [1]);
1329 }
1073 1330
1074 while (pipe (sigpipe))
1075 syserr ("(libev) error creating pipe");
1076
1077 siginit (EV_A); 1331 evpipe_init (EV_A);
1332 /* now iterate over everything, in case we missed something */
1333 pipecb (EV_A_ &pipeev, EV_READ);
1078 } 1334 }
1079 1335
1080 postfork = 0; 1336 postfork = 0;
1081} 1337}
1082 1338
… …
1104} 1360}
1105 1361
1106void 1362void
1107ev_loop_fork (EV_P) 1363ev_loop_fork (EV_P)
1108{ 1364{
1109 postfork = 1; 1365 postfork = 1; /* must be in line with ev_default_fork */
1110} 1366}
1111 1367
1112#endif 1368#endif
1113 1369
1114#if EV_MULTIPLICITY 1370#if EV_MULTIPLICITY
… …
1117#else 1373#else
1118int 1374int
1119ev_default_loop (unsigned int flags) 1375ev_default_loop (unsigned int flags)
1120#endif 1376#endif
1121{ 1377{
1122 if (sigpipe [0] == sigpipe [1])
1123 if (pipe (sigpipe))
1124 return 0;
1125
1126 if (!ev_default_loop_ptr) 1378 if (!ev_default_loop_ptr)
1127 { 1379 {
1128#if EV_MULTIPLICITY 1380#if EV_MULTIPLICITY
1129 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1381 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1130#else 1382#else
… …
1133 1385
1134 loop_init (EV_A_ flags); 1386 loop_init (EV_A_ flags);
1135 1387
1136 if (ev_backend (EV_A)) 1388 if (ev_backend (EV_A))
1137 { 1389 {
1138 siginit (EV_A);
1139
1140#ifndef _WIN32 1390#ifndef _WIN32
1141 ev_signal_init (&childev, childcb, SIGCHLD); 1391 ev_signal_init (&childev, childcb, SIGCHLD);
1142 ev_set_priority (&childev, EV_MAXPRI); 1392 ev_set_priority (&childev, EV_MAXPRI);
1143 ev_signal_start (EV_A_ &childev); 1393 ev_signal_start (EV_A_ &childev);
1144 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1394 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1161#ifndef _WIN32 1411#ifndef _WIN32
1162 ev_ref (EV_A); /* child watcher */ 1412 ev_ref (EV_A); /* child watcher */
1163 ev_signal_stop (EV_A_ &childev); 1413 ev_signal_stop (EV_A_ &childev);
1164#endif 1414#endif
1165 1415
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); 1416 loop_destroy (EV_A);
1173} 1417}
1174 1418
1175void 1419void
1176ev_default_fork (void) 1420ev_default_fork (void)
… …
1178#if EV_MULTIPLICITY 1422#if EV_MULTIPLICITY
1179 struct ev_loop *loop = ev_default_loop_ptr; 1423 struct ev_loop *loop = ev_default_loop_ptr;
1180#endif 1424#endif
1181 1425
1182 if (backend) 1426 if (backend)
1183 postfork = 1; 1427 postfork = 1; /* must be in line with ev_loop_fork */
1184} 1428}
1185 1429
1186/*****************************************************************************/ 1430/*****************************************************************************/
1187 1431
1188void 1432void
… …
1397static int loop_done; 1641static int loop_done;
1398 1642
1399void 1643void
1400ev_loop (EV_P_ int flags) 1644ev_loop (EV_P_ int flags)
1401{ 1645{
1402 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1646 loop_done = EVUNLOOP_CANCEL;
1403 ? EVUNLOOP_ONE
1404 : EVUNLOOP_CANCEL;
1405 1647
1406 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1648 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1407 1649
1408 do 1650 do
1409 { 1651 {
… …
1443 /* update fd-related kernel structures */ 1685 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1686 fd_reify (EV_A);
1445 1687
1446 /* calculate blocking time */ 1688 /* calculate blocking time */
1447 { 1689 {
1448 ev_tstamp block; 1690 ev_tstamp waittime = 0.;
1691 ev_tstamp sleeptime = 0.;
1449 1692
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1693 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1694 {
1454 /* update time to cancel out callback processing overhead */ 1695 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 1696 time_update (EV_A_ 1e100);
1456 1697
1457 block = MAX_BLOCKTIME; 1698 waittime = MAX_BLOCKTIME;
1458 1699
1459 if (timercnt) 1700 if (timercnt)
1460 { 1701 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1702 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1462 if (block > to) block = to; 1703 if (waittime > to) waittime = to;
1463 } 1704 }
1464 1705
1465#if EV_PERIODIC_ENABLE 1706#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 1707 if (periodiccnt)
1467 { 1708 {
1468 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1709 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1469 if (block > to) block = to; 1710 if (waittime > to) waittime = to;
1470 } 1711 }
1471#endif 1712#endif
1472 1713
1473 if (expect_false (block < 0.)) block = 0.; 1714 if (expect_false (waittime < timeout_blocktime))
1715 waittime = timeout_blocktime;
1716
1717 sleeptime = waittime - backend_fudge;
1718
1719 if (expect_true (sleeptime > io_blocktime))
1720 sleeptime = io_blocktime;
1721
1722 if (sleeptime)
1723 {
1724 ev_sleep (sleeptime);
1725 waittime -= sleeptime;
1726 }
1474 } 1727 }
1475 1728
1476 ++loop_count; 1729 ++loop_count;
1477 backend_poll (EV_A_ block); 1730 backend_poll (EV_A_ waittime);
1478 1731
1479 /* update ev_rt_now, do magic */ 1732 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 1733 time_update (EV_A_ waittime + sleeptime);
1481 } 1734 }
1482 1735
1483 /* queue pending timers and reschedule them */ 1736 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 1737 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 1738#if EV_PERIODIC_ENABLE
… …
1494 /* queue check watchers, to be executed first */ 1747 /* queue check watchers, to be executed first */
1495 if (expect_false (checkcnt)) 1748 if (expect_false (checkcnt))
1496 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1749 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1497 1750
1498 call_pending (EV_A); 1751 call_pending (EV_A);
1499
1500 } 1752 }
1501 while (expect_true (activecnt && !loop_done)); 1753 while (expect_true (
1754 activecnt
1755 && !loop_done
1756 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1757 ));
1502 1758
1503 if (loop_done == EVUNLOOP_ONE) 1759 if (loop_done == EVUNLOOP_ONE)
1504 loop_done = EVUNLOOP_CANCEL; 1760 loop_done = EVUNLOOP_CANCEL;
1505} 1761}
1506 1762
… …
1597 1853
1598 assert (("ev_io_start called with negative fd", fd >= 0)); 1854 assert (("ev_io_start called with negative fd", fd >= 0));
1599 1855
1600 ev_start (EV_A_ (W)w, 1); 1856 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1857 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1602 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1858 wlist_add (&anfds[fd].head, (WL)w);
1603 1859
1604 fd_change (EV_A_ fd); 1860 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1861 w->events &= ~EV_IOFDSET;
1605} 1862}
1606 1863
1607void noinline 1864void noinline
1608ev_io_stop (EV_P_ ev_io *w) 1865ev_io_stop (EV_P_ ev_io *w)
1609{ 1866{
… …
1611 if (expect_false (!ev_is_active (w))) 1868 if (expect_false (!ev_is_active (w)))
1612 return; 1869 return;
1613 1870
1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1871 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1615 1872
1616 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1873 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 1874 ev_stop (EV_A_ (W)w);
1618 1875
1619 fd_change (EV_A_ w->fd); 1876 fd_change (EV_A_ w->fd, 1);
1620} 1877}
1621 1878
1622void noinline 1879void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 1880ev_timer_start (EV_P_ ev_timer *w)
1624{ 1881{
… …
1751 if (expect_false (ev_is_active (w))) 2008 if (expect_false (ev_is_active (w)))
1752 return; 2009 return;
1753 2010
1754 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2011 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1755 2012
2013 evpipe_init (EV_A);
2014
1756 { 2015 {
1757#ifndef _WIN32 2016#ifndef _WIN32
1758 sigset_t full, prev; 2017 sigset_t full, prev;
1759 sigfillset (&full); 2018 sigfillset (&full);
1760 sigprocmask (SIG_SETMASK, &full, &prev); 2019 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1766 sigprocmask (SIG_SETMASK, &prev, 0); 2025 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif 2026#endif
1768 } 2027 }
1769 2028
1770 ev_start (EV_A_ (W)w, 1); 2029 ev_start (EV_A_ (W)w, 1);
1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2030 wlist_add (&signals [w->signum - 1].head, (WL)w);
1772 2031
1773 if (!((WL)w)->next) 2032 if (!((WL)w)->next)
1774 { 2033 {
1775#if _WIN32 2034#if _WIN32
1776 signal (w->signum, sighandler); 2035 signal (w->signum, ev_sighandler);
1777#else 2036#else
1778 struct sigaction sa; 2037 struct sigaction sa;
1779 sa.sa_handler = sighandler; 2038 sa.sa_handler = ev_sighandler;
1780 sigfillset (&sa.sa_mask); 2039 sigfillset (&sa.sa_mask);
1781 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2040 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1782 sigaction (w->signum, &sa, 0); 2041 sigaction (w->signum, &sa, 0);
1783#endif 2042#endif
1784 } 2043 }
… …
1789{ 2048{
1790 clear_pending (EV_A_ (W)w); 2049 clear_pending (EV_A_ (W)w);
1791 if (expect_false (!ev_is_active (w))) 2050 if (expect_false (!ev_is_active (w)))
1792 return; 2051 return;
1793 2052
1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2053 wlist_del (&signals [w->signum - 1].head, (WL)w);
1795 ev_stop (EV_A_ (W)w); 2054 ev_stop (EV_A_ (W)w);
1796 2055
1797 if (!signals [w->signum - 1].head) 2056 if (!signals [w->signum - 1].head)
1798 signal (w->signum, SIG_DFL); 2057 signal (w->signum, SIG_DFL);
1799} 2058}
… …
1806#endif 2065#endif
1807 if (expect_false (ev_is_active (w))) 2066 if (expect_false (ev_is_active (w)))
1808 return; 2067 return;
1809 2068
1810 ev_start (EV_A_ (W)w, 1); 2069 ev_start (EV_A_ (W)w, 1);
1811 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2070 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1812} 2071}
1813 2072
1814void 2073void
1815ev_child_stop (EV_P_ ev_child *w) 2074ev_child_stop (EV_P_ ev_child *w)
1816{ 2075{
1817 clear_pending (EV_A_ (W)w); 2076 clear_pending (EV_A_ (W)w);
1818 if (expect_false (!ev_is_active (w))) 2077 if (expect_false (!ev_is_active (w)))
1819 return; 2078 return;
1820 2079
1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2080 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1822 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1823} 2082}
1824 2083
1825#if EV_STAT_ENABLE 2084#if EV_STAT_ENABLE
1826 2085
… …
2168 2427
2169#if EV_EMBED_ENABLE 2428#if EV_EMBED_ENABLE
2170void noinline 2429void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2430ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2431{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2432 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2433}
2175 2434
2176static void 2435static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2436embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2437{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2439
2181 if (ev_cb (w)) 2440 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2441 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2442 else
2184 ev_embed_sweep (loop, w); 2443 ev_loop (w->other, EVLOOP_NONBLOCK);
2185} 2444}
2445
2446static void
2447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2448{
2449 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2450
2451 {
2452 struct ev_loop *loop = w->other;
2453
2454 while (fdchangecnt)
2455 {
2456 fd_reify (EV_A);
2457 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2458 }
2459 }
2460}
2461
2462#if 0
2463static void
2464embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2465{
2466 ev_idle_stop (EV_A_ idle);
2467}
2468#endif
2186 2469
2187void 2470void
2188ev_embed_start (EV_P_ ev_embed *w) 2471ev_embed_start (EV_P_ ev_embed *w)
2189{ 2472{
2190 if (expect_false (ev_is_active (w))) 2473 if (expect_false (ev_is_active (w)))
2191 return; 2474 return;
2192 2475
2193 { 2476 {
2194 struct ev_loop *loop = w->loop; 2477 struct ev_loop *loop = w->other;
2195 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2478 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2479 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2480 }
2198 2481
2199 ev_set_priority (&w->io, ev_priority (w)); 2482 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2483 ev_io_start (EV_A_ &w->io);
2201 2484
2485 ev_prepare_init (&w->prepare, embed_prepare_cb);
2486 ev_set_priority (&w->prepare, EV_MINPRI);
2487 ev_prepare_start (EV_A_ &w->prepare);
2488
2489 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2490
2202 ev_start (EV_A_ (W)w, 1); 2491 ev_start (EV_A_ (W)w, 1);
2203} 2492}
2204 2493
2205void 2494void
2206ev_embed_stop (EV_P_ ev_embed *w) 2495ev_embed_stop (EV_P_ ev_embed *w)
… …
2208 clear_pending (EV_A_ (W)w); 2497 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2498 if (expect_false (!ev_is_active (w)))
2210 return; 2499 return;
2211 2500
2212 ev_io_stop (EV_A_ &w->io); 2501 ev_io_stop (EV_A_ &w->io);
2502 ev_prepare_stop (EV_A_ &w->prepare);
2213 2503
2214 ev_stop (EV_A_ (W)w); 2504 ev_stop (EV_A_ (W)w);
2215} 2505}
2216#endif 2506#endif
2217 2507
… …
2242 2532
2243 ev_stop (EV_A_ (W)w); 2533 ev_stop (EV_A_ (W)w);
2244} 2534}
2245#endif 2535#endif
2246 2536
2537#if EV_ASYNC_ENABLE
2538void
2539ev_async_start (EV_P_ ev_async *w)
2540{
2541 if (expect_false (ev_is_active (w)))
2542 return;
2543
2544 evpipe_init (EV_A);
2545
2546 ev_start (EV_A_ (W)w, ++asynccnt);
2547 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2548 asyncs [asynccnt - 1] = w;
2549}
2550
2551void
2552ev_async_stop (EV_P_ ev_async *w)
2553{
2554 clear_pending (EV_A_ (W)w);
2555 if (expect_false (!ev_is_active (w)))
2556 return;
2557
2558 {
2559 int active = ((W)w)->active;
2560 asyncs [active - 1] = asyncs [--asynccnt];
2561 ((W)asyncs [active - 1])->active = active;
2562 }
2563
2564 ev_stop (EV_A_ (W)w);
2565}
2566
2567void
2568ev_async_send (EV_P_ ev_async *w)
2569{
2570 w->sent = 1;
2571 evpipe_write (EV_A_ &gotasync);
2572}
2573#endif
2574
2247/*****************************************************************************/ 2575/*****************************************************************************/
2248 2576
2249struct ev_once 2577struct ev_once
2250{ 2578{
2251 ev_io io; 2579 ev_io io;
… …
2306 ev_timer_set (&once->to, timeout, 0.); 2634 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 2635 ev_timer_start (EV_A_ &once->to);
2308 } 2636 }
2309} 2637}
2310 2638
2639#if EV_MULTIPLICITY
2640 #include "ev_wrap.h"
2641#endif
2642
2311#ifdef __cplusplus 2643#ifdef __cplusplus
2312} 2644}
2313#endif 2645#endif
2314 2646

Diff Legend

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