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

Comparing libev/ev.c (file contents):
Revision 1.182 by root, Wed Dec 12 01:27:08 2007 UTC vs.
Revision 1.227 by root, Fri May 2 07:20:01 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
759/* towards the root */
638void inline_speed 760void inline_speed
639upheap (WT *heap, int k) 761upheap (WT *heap, int k)
640{ 762{
641 WT w = heap [k]; 763 WT w = heap [k];
642 764
… …
654 776
655 heap [k] = w; 777 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 778 ((W)heap [k])->active = k + 1;
657} 779}
658 780
781/* away from the root */
659void inline_speed 782void inline_speed
660downheap (WT *heap, int N, int k) 783downheap (WT *heap, int N, int k)
661{ 784{
662 WT w = heap [k]; 785 WT w = heap [k];
663 786
… …
694/*****************************************************************************/ 817/*****************************************************************************/
695 818
696typedef struct 819typedef struct
697{ 820{
698 WL head; 821 WL head;
699 sig_atomic_t volatile gotsig; 822 EV_ATOMIC_T gotsig;
700} ANSIG; 823} ANSIG;
701 824
702static ANSIG *signals; 825static ANSIG *signals;
703static int signalmax; 826static int signalmax;
704 827
705static int sigpipe [2]; 828static EV_ATOMIC_T gotsig;
706static sig_atomic_t volatile gotsig;
707static ev_io sigev;
708 829
709void inline_size 830void inline_size
710signals_init (ANSIG *base, int count) 831signals_init (ANSIG *base, int count)
711{ 832{
712 while (count--) 833 while (count--)
… …
716 837
717 ++base; 838 ++base;
718 } 839 }
719} 840}
720 841
721static void 842/*****************************************************************************/
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 843
772void inline_speed 844void inline_speed
773fd_intern (int fd) 845fd_intern (int fd)
774{ 846{
775#ifdef _WIN32 847#ifdef _WIN32
… …
780 fcntl (fd, F_SETFL, O_NONBLOCK); 852 fcntl (fd, F_SETFL, O_NONBLOCK);
781#endif 853#endif
782} 854}
783 855
784static void noinline 856static void noinline
785siginit (EV_P) 857evpipe_init (EV_P)
786{ 858{
859 if (!ev_is_active (&pipeev))
860 {
861#if EV_USE_EVENTFD
862 if ((evfd = eventfd (0, 0)) >= 0)
863 {
864 evpipe [0] = -1;
865 fd_intern (evfd);
866 ev_io_set (&pipeev, evfd, EV_READ);
867 }
868 else
869#endif
870 {
871 while (pipe (evpipe))
872 syserr ("(libev) error creating signal/async pipe");
873
787 fd_intern (sigpipe [0]); 874 fd_intern (evpipe [0]);
788 fd_intern (sigpipe [1]); 875 fd_intern (evpipe [1]);
876 ev_io_set (&pipeev, evpipe [0], EV_READ);
877 }
789 878
790 ev_io_set (&sigev, sigpipe [0], EV_READ);
791 ev_io_start (EV_A_ &sigev); 879 ev_io_start (EV_A_ &pipeev);
792 ev_unref (EV_A); /* child watcher should not keep loop alive */ 880 ev_unref (EV_A); /* watcher should not keep loop alive */
881 }
882}
883
884void inline_size
885evpipe_write (EV_P_ EV_ATOMIC_T *flag)
886{
887 if (!*flag)
888 {
889 int old_errno = errno; /* save errno because write might clobber it */
890
891 *flag = 1;
892
893#if EV_USE_EVENTFD
894 if (evfd >= 0)
895 {
896 uint64_t counter = 1;
897 write (evfd, &counter, sizeof (uint64_t));
898 }
899 else
900#endif
901 write (evpipe [1], &old_errno, 1);
902
903 errno = old_errno;
904 }
905}
906
907static void
908pipecb (EV_P_ ev_io *iow, int revents)
909{
910#if EV_USE_EVENTFD
911 if (evfd >= 0)
912 {
913 uint64_t counter = 1;
914 read (evfd, &counter, sizeof (uint64_t));
915 }
916 else
917#endif
918 {
919 char dummy;
920 read (evpipe [0], &dummy, 1);
921 }
922
923 if (gotsig && ev_is_default_loop (EV_A))
924 {
925 int signum;
926 gotsig = 0;
927
928 for (signum = signalmax; signum--; )
929 if (signals [signum].gotsig)
930 ev_feed_signal_event (EV_A_ signum + 1);
931 }
932
933#if EV_ASYNC_ENABLE
934 if (gotasync)
935 {
936 int i;
937 gotasync = 0;
938
939 for (i = asynccnt; i--; )
940 if (asyncs [i]->sent)
941 {
942 asyncs [i]->sent = 0;
943 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
944 }
945 }
946#endif
793} 947}
794 948
795/*****************************************************************************/ 949/*****************************************************************************/
796 950
951static void
952ev_sighandler (int signum)
953{
954#if EV_MULTIPLICITY
955 struct ev_loop *loop = &default_loop_struct;
956#endif
957
958#if _WIN32
959 signal (signum, ev_sighandler);
960#endif
961
962 signals [signum - 1].gotsig = 1;
963 evpipe_write (EV_A_ &gotsig);
964}
965
966void noinline
967ev_feed_signal_event (EV_P_ int signum)
968{
969 WL w;
970
971#if EV_MULTIPLICITY
972 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
973#endif
974
975 --signum;
976
977 if (signum < 0 || signum >= signalmax)
978 return;
979
980 signals [signum].gotsig = 0;
981
982 for (w = signals [signum].head; w; w = w->next)
983 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
984}
985
986/*****************************************************************************/
987
797static WL childs [EV_PID_HASHSIZE]; 988static WL childs [EV_PID_HASHSIZE];
798 989
799#ifndef _WIN32 990#ifndef _WIN32
800 991
801static ev_signal childev; 992static ev_signal childev;
802 993
994#ifndef WIFCONTINUED
995# define WIFCONTINUED(status) 0
996#endif
997
803void inline_speed 998void inline_speed
804child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 999child_reap (EV_P_ int chain, int pid, int status)
805{ 1000{
806 ev_child *w; 1001 ev_child *w;
1002 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
807 1003
808 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1004 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1005 {
809 if (w->pid == pid || !w->pid) 1006 if ((w->pid == pid || !w->pid)
1007 && (!traced || (w->flags & 1)))
810 { 1008 {
811 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1009 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; 1010 w->rpid = pid;
813 w->rstatus = status; 1011 w->rstatus = status;
814 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1012 ev_feed_event (EV_A_ (W)w, EV_CHILD);
815 } 1013 }
1014 }
816} 1015}
817 1016
818#ifndef WCONTINUED 1017#ifndef WCONTINUED
819# define WCONTINUED 0 1018# define WCONTINUED 0
820#endif 1019#endif
… …
829 if (!WCONTINUED 1028 if (!WCONTINUED
830 || errno != EINVAL 1029 || errno != EINVAL
831 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1030 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
832 return; 1031 return;
833 1032
834 /* make sure we are called again until all childs have been reaped */ 1033 /* 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 */ 1034 /* 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); 1035 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
837 1036
838 child_reap (EV_A_ sw, pid, pid, status); 1037 child_reap (EV_A_ pid, pid, status);
839 if (EV_PID_HASHSIZE > 1) 1038 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 */ 1039 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
841} 1040}
842 1041
843#endif 1042#endif
844 1043
845/*****************************************************************************/ 1044/*****************************************************************************/
… …
917} 1116}
918 1117
919unsigned int 1118unsigned int
920ev_embeddable_backends (void) 1119ev_embeddable_backends (void)
921{ 1120{
922 return EVBACKEND_EPOLL 1121 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
923 | EVBACKEND_KQUEUE 1122
924 | EVBACKEND_PORT; 1123 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1124 /* please fix it and tell me how to detect the fix */
1125 flags &= ~EVBACKEND_EPOLL;
1126
1127 return flags;
925} 1128}
926 1129
927unsigned int 1130unsigned int
928ev_backend (EV_P) 1131ev_backend (EV_P)
929{ 1132{
… …
932 1135
933unsigned int 1136unsigned int
934ev_loop_count (EV_P) 1137ev_loop_count (EV_P)
935{ 1138{
936 return loop_count; 1139 return loop_count;
1140}
1141
1142void
1143ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1144{
1145 io_blocktime = interval;
1146}
1147
1148void
1149ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1150{
1151 timeout_blocktime = interval;
937} 1152}
938 1153
939static void noinline 1154static void noinline
940loop_init (EV_P_ unsigned int flags) 1155loop_init (EV_P_ unsigned int flags)
941{ 1156{
… …
947 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1162 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
948 have_monotonic = 1; 1163 have_monotonic = 1;
949 } 1164 }
950#endif 1165#endif
951 1166
952 ev_rt_now = ev_time (); 1167 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1168 mn_now = get_clock ();
954 now_floor = mn_now; 1169 now_floor = mn_now;
955 rtmn_diff = ev_rt_now - mn_now; 1170 rtmn_diff = ev_rt_now - mn_now;
1171
1172 io_blocktime = 0.;
1173 timeout_blocktime = 0.;
1174 backend = 0;
1175 backend_fd = -1;
1176 gotasync = 0;
1177#if EV_USE_INOTIFY
1178 fs_fd = -2;
1179#endif
956 1180
957 /* pid check not overridable via env */ 1181 /* pid check not overridable via env */
958#ifndef _WIN32 1182#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1183 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1184 curpid = getpid ();
… …
963 if (!(flags & EVFLAG_NOENV) 1187 if (!(flags & EVFLAG_NOENV)
964 && !enable_secure () 1188 && !enable_secure ()
965 && getenv ("LIBEV_FLAGS")) 1189 && getenv ("LIBEV_FLAGS"))
966 flags = atoi (getenv ("LIBEV_FLAGS")); 1190 flags = atoi (getenv ("LIBEV_FLAGS"));
967 1191
968 if (!(flags & 0x0000ffffUL)) 1192 if (!(flags & 0x0000ffffU))
969 flags |= ev_recommended_backends (); 1193 flags |= ev_recommended_backends ();
970
971 backend = 0;
972 backend_fd = -1;
973#if EV_USE_INOTIFY
974 fs_fd = -2;
975#endif
976 1194
977#if EV_USE_PORT 1195#if EV_USE_PORT
978 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1196 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
979#endif 1197#endif
980#if EV_USE_KQUEUE 1198#if EV_USE_KQUEUE
… …
988#endif 1206#endif
989#if EV_USE_SELECT 1207#if EV_USE_SELECT
990 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1208 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
991#endif 1209#endif
992 1210
993 ev_init (&sigev, sigcb); 1211 ev_init (&pipeev, pipecb);
994 ev_set_priority (&sigev, EV_MAXPRI); 1212 ev_set_priority (&pipeev, EV_MAXPRI);
995 } 1213 }
996} 1214}
997 1215
998static void noinline 1216static void noinline
999loop_destroy (EV_P) 1217loop_destroy (EV_P)
1000{ 1218{
1001 int i; 1219 int i;
1220
1221 if (ev_is_active (&pipeev))
1222 {
1223 ev_ref (EV_A); /* signal watcher */
1224 ev_io_stop (EV_A_ &pipeev);
1225
1226#if EV_USE_EVENTFD
1227 if (evfd >= 0)
1228 close (evfd);
1229#endif
1230
1231 if (evpipe [0] >= 0)
1232 {
1233 close (evpipe [0]);
1234 close (evpipe [1]);
1235 }
1236 }
1002 1237
1003#if EV_USE_INOTIFY 1238#if EV_USE_INOTIFY
1004 if (fs_fd >= 0) 1239 if (fs_fd >= 0)
1005 close (fs_fd); 1240 close (fs_fd);
1006#endif 1241#endif
… …
1029 array_free (pending, [i]); 1264 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1265#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1266 array_free (idle, [i]);
1032#endif 1267#endif
1033 } 1268 }
1269
1270 ev_free (anfds); anfdmax = 0;
1034 1271
1035 /* have to use the microsoft-never-gets-it-right macro */ 1272 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1273 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1274 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1275#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1276 array_free (periodic, EMPTY);
1040#endif 1277#endif
1278#if EV_FORK_ENABLE
1279 array_free (fork, EMPTY);
1280#endif
1041 array_free (prepare, EMPTY); 1281 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1282 array_free (check, EMPTY);
1283#if EV_ASYNC_ENABLE
1284 array_free (async, EMPTY);
1285#endif
1043 1286
1044 backend = 0; 1287 backend = 0;
1045} 1288}
1046 1289
1290#if EV_USE_INOTIFY
1047void inline_size infy_fork (EV_P); 1291void inline_size infy_fork (EV_P);
1292#endif
1048 1293
1049void inline_size 1294void inline_size
1050loop_fork (EV_P) 1295loop_fork (EV_P)
1051{ 1296{
1052#if EV_USE_PORT 1297#if EV_USE_PORT
… …
1060#endif 1305#endif
1061#if EV_USE_INOTIFY 1306#if EV_USE_INOTIFY
1062 infy_fork (EV_A); 1307 infy_fork (EV_A);
1063#endif 1308#endif
1064 1309
1065 if (ev_is_active (&sigev)) 1310 if (ev_is_active (&pipeev))
1066 { 1311 {
1067 /* default loop */ 1312 /* this "locks" the handlers against writing to the pipe */
1313 /* while we modify the fd vars */
1314 gotsig = 1;
1315#if EV_ASYNC_ENABLE
1316 gotasync = 1;
1317#endif
1068 1318
1069 ev_ref (EV_A); 1319 ev_ref (EV_A);
1070 ev_io_stop (EV_A_ &sigev); 1320 ev_io_stop (EV_A_ &pipeev);
1321
1322#if EV_USE_EVENTFD
1323 if (evfd >= 0)
1324 close (evfd);
1325#endif
1326
1327 if (evpipe [0] >= 0)
1328 {
1071 close (sigpipe [0]); 1329 close (evpipe [0]);
1072 close (sigpipe [1]); 1330 close (evpipe [1]);
1331 }
1073 1332
1074 while (pipe (sigpipe))
1075 syserr ("(libev) error creating pipe");
1076
1077 siginit (EV_A); 1333 evpipe_init (EV_A);
1334 /* now iterate over everything, in case we missed something */
1335 pipecb (EV_A_ &pipeev, EV_READ);
1078 } 1336 }
1079 1337
1080 postfork = 0; 1338 postfork = 0;
1081} 1339}
1082 1340
… …
1104} 1362}
1105 1363
1106void 1364void
1107ev_loop_fork (EV_P) 1365ev_loop_fork (EV_P)
1108{ 1366{
1109 postfork = 1; 1367 postfork = 1; /* must be in line with ev_default_fork */
1110} 1368}
1111 1369
1112#endif 1370#endif
1113 1371
1114#if EV_MULTIPLICITY 1372#if EV_MULTIPLICITY
… …
1117#else 1375#else
1118int 1376int
1119ev_default_loop (unsigned int flags) 1377ev_default_loop (unsigned int flags)
1120#endif 1378#endif
1121{ 1379{
1122 if (sigpipe [0] == sigpipe [1])
1123 if (pipe (sigpipe))
1124 return 0;
1125
1126 if (!ev_default_loop_ptr) 1380 if (!ev_default_loop_ptr)
1127 { 1381 {
1128#if EV_MULTIPLICITY 1382#if EV_MULTIPLICITY
1129 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1383 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1130#else 1384#else
… …
1133 1387
1134 loop_init (EV_A_ flags); 1388 loop_init (EV_A_ flags);
1135 1389
1136 if (ev_backend (EV_A)) 1390 if (ev_backend (EV_A))
1137 { 1391 {
1138 siginit (EV_A);
1139
1140#ifndef _WIN32 1392#ifndef _WIN32
1141 ev_signal_init (&childev, childcb, SIGCHLD); 1393 ev_signal_init (&childev, childcb, SIGCHLD);
1142 ev_set_priority (&childev, EV_MAXPRI); 1394 ev_set_priority (&childev, EV_MAXPRI);
1143 ev_signal_start (EV_A_ &childev); 1395 ev_signal_start (EV_A_ &childev);
1144 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1396 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1161#ifndef _WIN32 1413#ifndef _WIN32
1162 ev_ref (EV_A); /* child watcher */ 1414 ev_ref (EV_A); /* child watcher */
1163 ev_signal_stop (EV_A_ &childev); 1415 ev_signal_stop (EV_A_ &childev);
1164#endif 1416#endif
1165 1417
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); 1418 loop_destroy (EV_A);
1173} 1419}
1174 1420
1175void 1421void
1176ev_default_fork (void) 1422ev_default_fork (void)
… …
1178#if EV_MULTIPLICITY 1424#if EV_MULTIPLICITY
1179 struct ev_loop *loop = ev_default_loop_ptr; 1425 struct ev_loop *loop = ev_default_loop_ptr;
1180#endif 1426#endif
1181 1427
1182 if (backend) 1428 if (backend)
1183 postfork = 1; 1429 postfork = 1; /* must be in line with ev_loop_fork */
1184} 1430}
1185 1431
1186/*****************************************************************************/ 1432/*****************************************************************************/
1187 1433
1188void 1434void
… …
1397static int loop_done; 1643static int loop_done;
1398 1644
1399void 1645void
1400ev_loop (EV_P_ int flags) 1646ev_loop (EV_P_ int flags)
1401{ 1647{
1402 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1648 loop_done = EVUNLOOP_CANCEL;
1403 ? EVUNLOOP_ONE
1404 : EVUNLOOP_CANCEL;
1405 1649
1406 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1650 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1407 1651
1408 do 1652 do
1409 { 1653 {
… …
1443 /* update fd-related kernel structures */ 1687 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1688 fd_reify (EV_A);
1445 1689
1446 /* calculate blocking time */ 1690 /* calculate blocking time */
1447 { 1691 {
1448 ev_tstamp block; 1692 ev_tstamp waittime = 0.;
1693 ev_tstamp sleeptime = 0.;
1449 1694
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1695 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1696 {
1454 /* update time to cancel out callback processing overhead */ 1697 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 1698 time_update (EV_A_ 1e100);
1456 1699
1457 block = MAX_BLOCKTIME; 1700 waittime = MAX_BLOCKTIME;
1458 1701
1459 if (timercnt) 1702 if (timercnt)
1460 { 1703 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1704 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1462 if (block > to) block = to; 1705 if (waittime > to) waittime = to;
1463 } 1706 }
1464 1707
1465#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 1709 if (periodiccnt)
1467 { 1710 {
1468 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1711 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1469 if (block > to) block = to; 1712 if (waittime > to) waittime = to;
1470 } 1713 }
1471#endif 1714#endif
1472 1715
1473 if (expect_false (block < 0.)) block = 0.; 1716 if (expect_false (waittime < timeout_blocktime))
1717 waittime = timeout_blocktime;
1718
1719 sleeptime = waittime - backend_fudge;
1720
1721 if (expect_true (sleeptime > io_blocktime))
1722 sleeptime = io_blocktime;
1723
1724 if (sleeptime)
1725 {
1726 ev_sleep (sleeptime);
1727 waittime -= sleeptime;
1728 }
1474 } 1729 }
1475 1730
1476 ++loop_count; 1731 ++loop_count;
1477 backend_poll (EV_A_ block); 1732 backend_poll (EV_A_ waittime);
1478 1733
1479 /* update ev_rt_now, do magic */ 1734 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 1735 time_update (EV_A_ waittime + sleeptime);
1481 } 1736 }
1482 1737
1483 /* queue pending timers and reschedule them */ 1738 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 1739 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 1740#if EV_PERIODIC_ENABLE
… …
1494 /* queue check watchers, to be executed first */ 1749 /* queue check watchers, to be executed first */
1495 if (expect_false (checkcnt)) 1750 if (expect_false (checkcnt))
1496 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1751 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1497 1752
1498 call_pending (EV_A); 1753 call_pending (EV_A);
1499
1500 } 1754 }
1501 while (expect_true (activecnt && !loop_done)); 1755 while (expect_true (
1756 activecnt
1757 && !loop_done
1758 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1759 ));
1502 1760
1503 if (loop_done == EVUNLOOP_ONE) 1761 if (loop_done == EVUNLOOP_ONE)
1504 loop_done = EVUNLOOP_CANCEL; 1762 loop_done = EVUNLOOP_CANCEL;
1505} 1763}
1506 1764
… …
1599 1857
1600 ev_start (EV_A_ (W)w, 1); 1858 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1859 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1602 wlist_add (&anfds[fd].head, (WL)w); 1860 wlist_add (&anfds[fd].head, (WL)w);
1603 1861
1604 fd_change (EV_A_ fd); 1862 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1863 w->events &= ~EV_IOFDSET;
1605} 1864}
1606 1865
1607void noinline 1866void noinline
1608ev_io_stop (EV_P_ ev_io *w) 1867ev_io_stop (EV_P_ ev_io *w)
1609{ 1868{
… …
1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1873 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1615 1874
1616 wlist_del (&anfds[w->fd].head, (WL)w); 1875 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 1876 ev_stop (EV_A_ (W)w);
1618 1877
1619 fd_change (EV_A_ w->fd); 1878 fd_change (EV_A_ w->fd, 1);
1620} 1879}
1621 1880
1622void noinline 1881void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 1882ev_timer_start (EV_P_ ev_timer *w)
1624{ 1883{
… …
1751 if (expect_false (ev_is_active (w))) 2010 if (expect_false (ev_is_active (w)))
1752 return; 2011 return;
1753 2012
1754 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2013 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1755 2014
2015 evpipe_init (EV_A);
2016
1756 { 2017 {
1757#ifndef _WIN32 2018#ifndef _WIN32
1758 sigset_t full, prev; 2019 sigset_t full, prev;
1759 sigfillset (&full); 2020 sigfillset (&full);
1760 sigprocmask (SIG_SETMASK, &full, &prev); 2021 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1771 wlist_add (&signals [w->signum - 1].head, (WL)w); 2032 wlist_add (&signals [w->signum - 1].head, (WL)w);
1772 2033
1773 if (!((WL)w)->next) 2034 if (!((WL)w)->next)
1774 { 2035 {
1775#if _WIN32 2036#if _WIN32
1776 signal (w->signum, sighandler); 2037 signal (w->signum, ev_sighandler);
1777#else 2038#else
1778 struct sigaction sa; 2039 struct sigaction sa;
1779 sa.sa_handler = sighandler; 2040 sa.sa_handler = ev_sighandler;
1780 sigfillset (&sa.sa_mask); 2041 sigfillset (&sa.sa_mask);
1781 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2042 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1782 sigaction (w->signum, &sa, 0); 2043 sigaction (w->signum, &sa, 0);
1783#endif 2044#endif
1784 } 2045 }
… …
2168 2429
2169#if EV_EMBED_ENABLE 2430#if EV_EMBED_ENABLE
2170void noinline 2431void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2432ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2433{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2434 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2435}
2175 2436
2176static void 2437static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2438embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2439{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2440 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2441
2181 if (ev_cb (w)) 2442 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2443 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2444 else
2184 ev_embed_sweep (loop, w); 2445 ev_loop (w->other, EVLOOP_NONBLOCK);
2185} 2446}
2447
2448static void
2449embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2450{
2451 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2452
2453 {
2454 struct ev_loop *loop = w->other;
2455
2456 while (fdchangecnt)
2457 {
2458 fd_reify (EV_A);
2459 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2460 }
2461 }
2462}
2463
2464#if 0
2465static void
2466embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2467{
2468 ev_idle_stop (EV_A_ idle);
2469}
2470#endif
2186 2471
2187void 2472void
2188ev_embed_start (EV_P_ ev_embed *w) 2473ev_embed_start (EV_P_ ev_embed *w)
2189{ 2474{
2190 if (expect_false (ev_is_active (w))) 2475 if (expect_false (ev_is_active (w)))
2191 return; 2476 return;
2192 2477
2193 { 2478 {
2194 struct ev_loop *loop = w->loop; 2479 struct ev_loop *loop = w->other;
2195 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2480 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2481 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2482 }
2198 2483
2199 ev_set_priority (&w->io, ev_priority (w)); 2484 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2485 ev_io_start (EV_A_ &w->io);
2201 2486
2487 ev_prepare_init (&w->prepare, embed_prepare_cb);
2488 ev_set_priority (&w->prepare, EV_MINPRI);
2489 ev_prepare_start (EV_A_ &w->prepare);
2490
2491 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2492
2202 ev_start (EV_A_ (W)w, 1); 2493 ev_start (EV_A_ (W)w, 1);
2203} 2494}
2204 2495
2205void 2496void
2206ev_embed_stop (EV_P_ ev_embed *w) 2497ev_embed_stop (EV_P_ ev_embed *w)
… …
2208 clear_pending (EV_A_ (W)w); 2499 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2500 if (expect_false (!ev_is_active (w)))
2210 return; 2501 return;
2211 2502
2212 ev_io_stop (EV_A_ &w->io); 2503 ev_io_stop (EV_A_ &w->io);
2504 ev_prepare_stop (EV_A_ &w->prepare);
2213 2505
2214 ev_stop (EV_A_ (W)w); 2506 ev_stop (EV_A_ (W)w);
2215} 2507}
2216#endif 2508#endif
2217 2509
… …
2242 2534
2243 ev_stop (EV_A_ (W)w); 2535 ev_stop (EV_A_ (W)w);
2244} 2536}
2245#endif 2537#endif
2246 2538
2539#if EV_ASYNC_ENABLE
2540void
2541ev_async_start (EV_P_ ev_async *w)
2542{
2543 if (expect_false (ev_is_active (w)))
2544 return;
2545
2546 evpipe_init (EV_A);
2547
2548 ev_start (EV_A_ (W)w, ++asynccnt);
2549 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2550 asyncs [asynccnt - 1] = w;
2551}
2552
2553void
2554ev_async_stop (EV_P_ ev_async *w)
2555{
2556 clear_pending (EV_A_ (W)w);
2557 if (expect_false (!ev_is_active (w)))
2558 return;
2559
2560 {
2561 int active = ((W)w)->active;
2562 asyncs [active - 1] = asyncs [--asynccnt];
2563 ((W)asyncs [active - 1])->active = active;
2564 }
2565
2566 ev_stop (EV_A_ (W)w);
2567}
2568
2569void
2570ev_async_send (EV_P_ ev_async *w)
2571{
2572 w->sent = 1;
2573 evpipe_write (EV_A_ &gotasync);
2574}
2575#endif
2576
2247/*****************************************************************************/ 2577/*****************************************************************************/
2248 2578
2249struct ev_once 2579struct ev_once
2250{ 2580{
2251 ev_io io; 2581 ev_io io;
… …
2306 ev_timer_set (&once->to, timeout, 0.); 2636 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 2637 ev_timer_start (EV_A_ &once->to);
2308 } 2638 }
2309} 2639}
2310 2640
2641#if EV_MULTIPLICITY
2642 #include "ev_wrap.h"
2643#endif
2644
2311#ifdef __cplusplus 2645#ifdef __cplusplus
2312} 2646}
2313#endif 2647#endif
2314 2648

Diff Legend

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