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

Comparing libev/ev.c (file contents):
Revision 1.190 by root, Fri Dec 21 01:26:04 2007 UTC vs.
Revision 1.247 by root, Wed May 21 21:22:10 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#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL
242#endif
243
244#ifndef EV_HEAP_CACHE_AT
245# define EV_HEAP_CACHE_AT !EV_MINIMAL
246#endif
247
248/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 249
197#ifndef CLOCK_MONOTONIC 250#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 251# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 252# define EV_USE_MONOTONIC 0
200#endif 253#endif
207#if !EV_STAT_ENABLE 260#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY 261# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0 262# define EV_USE_INOTIFY 0
210#endif 263#endif
211 264
265#if !EV_USE_NANOSLEEP
266# ifndef _WIN32
267# include <sys/select.h>
268# endif
269#endif
270
212#if EV_USE_INOTIFY 271#if EV_USE_INOTIFY
213# include <sys/inotify.h> 272# include <sys/inotify.h>
214#endif 273#endif
215 274
216#if EV_SELECT_IS_WINSOCKET 275#if EV_SELECT_IS_WINSOCKET
217# include <winsock.h> 276# include <winsock.h>
277#endif
278
279#if EV_USE_EVENTFD
280/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
281# include <stdint.h>
282# ifdef __cplusplus
283extern "C" {
284# endif
285int eventfd (unsigned int initval, int flags);
286# ifdef __cplusplus
287}
288# endif
218#endif 289#endif
219 290
220/**/ 291/**/
221 292
222/* 293/*
237# define expect(expr,value) __builtin_expect ((expr),(value)) 308# define expect(expr,value) __builtin_expect ((expr),(value))
238# define noinline __attribute__ ((noinline)) 309# define noinline __attribute__ ((noinline))
239#else 310#else
240# define expect(expr,value) (expr) 311# define expect(expr,value) (expr)
241# define noinline 312# define noinline
242# if __STDC_VERSION__ < 199901L 313# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
243# define inline 314# define inline
244# endif 315# endif
245#endif 316#endif
246 317
247#define expect_false(expr) expect ((expr) != 0, 0) 318#define expect_false(expr) expect ((expr) != 0, 0)
262 333
263typedef ev_watcher *W; 334typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 335typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 336typedef ev_watcher_time *WT;
266 337
338#define ev_active(w) ((W)(w))->active
339#define ev_at(w) ((WT)(w))->at
340
341#if EV_USE_MONOTONIC
342/* sig_atomic_t is used to avoid per-thread variables or locking but still */
343/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 344static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
345#endif
268 346
269#ifdef _WIN32 347#ifdef _WIN32
270# include "ev_win32.c" 348# include "ev_win32.c"
271#endif 349#endif
272 350
293 perror (msg); 371 perror (msg);
294 abort (); 372 abort ();
295 } 373 }
296} 374}
297 375
376static void *
377ev_realloc_emul (void *ptr, long size)
378{
379 /* some systems, notably openbsd and darwin, fail to properly
380 * implement realloc (x, 0) (as required by both ansi c-98 and
381 * the single unix specification, so work around them here.
382 */
383
384 if (size)
385 return realloc (ptr, size);
386
387 free (ptr);
388 return 0;
389}
390
298static void *(*alloc)(void *ptr, long size); 391static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
299 392
300void 393void
301ev_set_allocator (void *(*cb)(void *ptr, long size)) 394ev_set_allocator (void *(*cb)(void *ptr, long size))
302{ 395{
303 alloc = cb; 396 alloc = cb;
304} 397}
305 398
306inline_speed void * 399inline_speed void *
307ev_realloc (void *ptr, long size) 400ev_realloc (void *ptr, long size)
308{ 401{
309 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 402 ptr = alloc (ptr, size);
310 403
311 if (!ptr && size) 404 if (!ptr && size)
312 { 405 {
313 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 406 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
314 abort (); 407 abort ();
337 W w; 430 W w;
338 int events; 431 int events;
339} ANPENDING; 432} ANPENDING;
340 433
341#if EV_USE_INOTIFY 434#if EV_USE_INOTIFY
435/* hash table entry per inotify-id */
342typedef struct 436typedef struct
343{ 437{
344 WL head; 438 WL head;
345} ANFS; 439} ANFS;
440#endif
441
442/* Heap Entry */
443#if EV_HEAP_CACHE_AT
444 typedef struct {
445 ev_tstamp at;
446 WT w;
447 } ANHE;
448
449 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */
452#else
453 typedef WT ANHE;
454
455 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he)
346#endif 458#endif
347 459
348#if EV_MULTIPLICITY 460#if EV_MULTIPLICITY
349 461
350 struct ev_loop 462 struct ev_loop
408{ 520{
409 return ev_rt_now; 521 return ev_rt_now;
410} 522}
411#endif 523#endif
412 524
525void
526ev_sleep (ev_tstamp delay)
527{
528 if (delay > 0.)
529 {
530#if EV_USE_NANOSLEEP
531 struct timespec ts;
532
533 ts.tv_sec = (time_t)delay;
534 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
535
536 nanosleep (&ts, 0);
537#elif defined(_WIN32)
538 Sleep ((unsigned long)(delay * 1e3));
539#else
540 struct timeval tv;
541
542 tv.tv_sec = (time_t)delay;
543 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544
545 select (0, 0, 0, 0, &tv);
546#endif
547 }
548}
549
550/*****************************************************************************/
551
552#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
553
413int inline_size 554int inline_size
414array_nextsize (int elem, int cur, int cnt) 555array_nextsize (int elem, int cur, int cnt)
415{ 556{
416 int ncur = cur + 1; 557 int ncur = cur + 1;
417 558
418 do 559 do
419 ncur <<= 1; 560 ncur <<= 1;
420 while (cnt > ncur); 561 while (cnt > ncur);
421 562
422 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 563 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
423 if (elem * ncur > 4096) 564 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
424 { 565 {
425 ncur *= elem; 566 ncur *= elem;
426 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 567 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
427 ncur = ncur - sizeof (void *) * 4; 568 ncur = ncur - sizeof (void *) * 4;
428 ncur /= elem; 569 ncur /= elem;
429 } 570 }
430 571
431 return ncur; 572 return ncur;
543 684
544#if EV_SELECT_IS_WINSOCKET 685#if EV_SELECT_IS_WINSOCKET
545 if (events) 686 if (events)
546 { 687 {
547 unsigned long argp; 688 unsigned long argp;
689 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else
548 anfd->handle = _get_osfhandle (fd); 692 anfd->handle = _get_osfhandle (fd);
693 #endif
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 694 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
550 } 695 }
551#endif 696#endif
552 697
553 { 698 {
641 } 786 }
642} 787}
643 788
644/*****************************************************************************/ 789/*****************************************************************************/
645 790
791/*
792 * the heap functions want a real array index. array index 0 uis guaranteed to not
793 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
794 * the branching factor of the d-tree.
795 */
796
797/*
798 * at the moment we allow libev the luxury of two heaps,
799 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
800 * which is more cache-efficient.
801 * the difference is about 5% with 50000+ watchers.
802 */
803#if EV_USE_4HEAP
804
805#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808
809/* towards the root */
646void inline_speed 810void inline_speed
647upheap (WT *heap, int k) 811upheap (ANHE *heap, int k)
648{ 812{
649 WT w = heap [k]; 813 ANHE he = heap [k];
650 814
651 while (k) 815 for (;;)
652 { 816 {
653 int p = (k - 1) >> 1; 817 int p = HPARENT (k);
654 818
655 if (heap [p]->at <= w->at) 819 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
656 break; 820 break;
657 821
658 heap [k] = heap [p]; 822 heap [k] = heap [p];
659 ((W)heap [k])->active = k + 1; 823 ev_active (ANHE_w (heap [k])) = k;
660 k = p; 824 k = p;
661 } 825 }
662 826
663 heap [k] = w; 827 heap [k] = he;
664 ((W)heap [k])->active = k + 1; 828 ev_active (ANHE_w (he)) = k;
665} 829}
666 830
831/* away from the root */
667void inline_speed 832void inline_speed
668downheap (WT *heap, int N, int k) 833downheap (ANHE *heap, int N, int k)
669{ 834{
670 WT w = heap [k]; 835 ANHE he = heap [k];
836 ANHE *E = heap + N + HEAP0;
671 837
672 for (;;) 838 for (;;)
673 { 839 {
674 int c = (k << 1) + 1; 840 ev_tstamp minat;
841 ANHE *minpos;
842 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
675 843
676 if (c >= N) 844 // find minimum child
845 if (expect_true (pos + DHEAP - 1 < E))
846 {
847 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
849 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
850 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
851 }
852 else if (pos < E)
853 {
854 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
855 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
856 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
857 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
858 }
859 else
677 break; 860 break;
678 861
862 if (ANHE_at (he) <= minat)
863 break;
864
865 heap [k] = *minpos;
866 ev_active (ANHE_w (*minpos)) = k;
867
868 k = minpos - heap;
869 }
870
871 heap [k] = he;
872 ev_active (ANHE_w (he)) = k;
873}
874
875#else // 4HEAP
876
877#define HEAP0 1
878#define HPARENT(k) ((k) >> 1)
879
880/* towards the root */
881void inline_speed
882upheap (ANHE *heap, int k)
883{
884 ANHE he = heap [k];
885
886 for (;;)
887 {
888 int p = HPARENT (k);
889
890 /* maybe we could use a dummy element at heap [0]? */
891 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
892 break;
893
894 heap [k] = heap [p];
895 ev_active (ANHE_w (heap [k])) = k;
896 k = p;
897 }
898
899 heap [k] = he;
900 ev_active (ANHE_w (heap [k])) = k;
901}
902
903/* away from the root */
904void inline_speed
905downheap (ANHE *heap, int N, int k)
906{
907 ANHE he = heap [k];
908
909 for (;;)
910 {
911 int c = k << 1;
912
913 if (c > N)
914 break;
915
679 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 916 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
680 ? 1 : 0; 917 ? 1 : 0;
681 918
682 if (w->at <= heap [c]->at) 919 if (ANHE_at (he) <= ANHE_at (heap [c]))
683 break; 920 break;
684 921
685 heap [k] = heap [c]; 922 heap [k] = heap [c];
686 ((W)heap [k])->active = k + 1; 923 ev_active (ANHE_w (heap [k])) = k;
687 924
688 k = c; 925 k = c;
689 } 926 }
690 927
691 heap [k] = w; 928 heap [k] = he;
692 ((W)heap [k])->active = k + 1; 929 ev_active (ANHE_w (he)) = k;
693} 930}
931#endif
694 932
695void inline_size 933void inline_size
696adjustheap (WT *heap, int N, int k) 934adjustheap (ANHE *heap, int N, int k)
697{ 935{
936 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
698 upheap (heap, k); 937 upheap (heap, k);
938 else
699 downheap (heap, N, k); 939 downheap (heap, N, k);
700} 940}
701 941
702/*****************************************************************************/ 942/*****************************************************************************/
703 943
704typedef struct 944typedef struct
705{ 945{
706 WL head; 946 WL head;
707 sig_atomic_t volatile gotsig; 947 EV_ATOMIC_T gotsig;
708} ANSIG; 948} ANSIG;
709 949
710static ANSIG *signals; 950static ANSIG *signals;
711static int signalmax; 951static int signalmax;
712 952
713static int sigpipe [2]; 953static EV_ATOMIC_T gotsig;
714static sig_atomic_t volatile gotsig;
715static ev_io sigev;
716 954
717void inline_size 955void inline_size
718signals_init (ANSIG *base, int count) 956signals_init (ANSIG *base, int count)
719{ 957{
720 while (count--) 958 while (count--)
724 962
725 ++base; 963 ++base;
726 } 964 }
727} 965}
728 966
729static void 967/*****************************************************************************/
730sighandler (int signum)
731{
732#if _WIN32
733 signal (signum, sighandler);
734#endif
735
736 signals [signum - 1].gotsig = 1;
737
738 if (!gotsig)
739 {
740 int old_errno = errno;
741 gotsig = 1;
742 write (sigpipe [1], &signum, 1);
743 errno = old_errno;
744 }
745}
746
747void noinline
748ev_feed_signal_event (EV_P_ int signum)
749{
750 WL w;
751
752#if EV_MULTIPLICITY
753 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
754#endif
755
756 --signum;
757
758 if (signum < 0 || signum >= signalmax)
759 return;
760
761 signals [signum].gotsig = 0;
762
763 for (w = signals [signum].head; w; w = w->next)
764 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
765}
766
767static void
768sigcb (EV_P_ ev_io *iow, int revents)
769{
770 int signum;
771
772 read (sigpipe [0], &revents, 1);
773 gotsig = 0;
774
775 for (signum = signalmax; signum--; )
776 if (signals [signum].gotsig)
777 ev_feed_signal_event (EV_A_ signum + 1);
778}
779 968
780void inline_speed 969void inline_speed
781fd_intern (int fd) 970fd_intern (int fd)
782{ 971{
783#ifdef _WIN32 972#ifdef _WIN32
788 fcntl (fd, F_SETFL, O_NONBLOCK); 977 fcntl (fd, F_SETFL, O_NONBLOCK);
789#endif 978#endif
790} 979}
791 980
792static void noinline 981static void noinline
793siginit (EV_P) 982evpipe_init (EV_P)
794{ 983{
984 if (!ev_is_active (&pipeev))
985 {
986#if EV_USE_EVENTFD
987 if ((evfd = eventfd (0, 0)) >= 0)
988 {
989 evpipe [0] = -1;
990 fd_intern (evfd);
991 ev_io_set (&pipeev, evfd, EV_READ);
992 }
993 else
994#endif
995 {
996 while (pipe (evpipe))
997 syserr ("(libev) error creating signal/async pipe");
998
795 fd_intern (sigpipe [0]); 999 fd_intern (evpipe [0]);
796 fd_intern (sigpipe [1]); 1000 fd_intern (evpipe [1]);
1001 ev_io_set (&pipeev, evpipe [0], EV_READ);
1002 }
797 1003
798 ev_io_set (&sigev, sigpipe [0], EV_READ);
799 ev_io_start (EV_A_ &sigev); 1004 ev_io_start (EV_A_ &pipeev);
800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1005 ev_unref (EV_A); /* watcher should not keep loop alive */
1006 }
1007}
1008
1009void inline_size
1010evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1011{
1012 if (!*flag)
1013 {
1014 int old_errno = errno; /* save errno because write might clobber it */
1015
1016 *flag = 1;
1017
1018#if EV_USE_EVENTFD
1019 if (evfd >= 0)
1020 {
1021 uint64_t counter = 1;
1022 write (evfd, &counter, sizeof (uint64_t));
1023 }
1024 else
1025#endif
1026 write (evpipe [1], &old_errno, 1);
1027
1028 errno = old_errno;
1029 }
1030}
1031
1032static void
1033pipecb (EV_P_ ev_io *iow, int revents)
1034{
1035#if EV_USE_EVENTFD
1036 if (evfd >= 0)
1037 {
1038 uint64_t counter;
1039 read (evfd, &counter, sizeof (uint64_t));
1040 }
1041 else
1042#endif
1043 {
1044 char dummy;
1045 read (evpipe [0], &dummy, 1);
1046 }
1047
1048 if (gotsig && ev_is_default_loop (EV_A))
1049 {
1050 int signum;
1051 gotsig = 0;
1052
1053 for (signum = signalmax; signum--; )
1054 if (signals [signum].gotsig)
1055 ev_feed_signal_event (EV_A_ signum + 1);
1056 }
1057
1058#if EV_ASYNC_ENABLE
1059 if (gotasync)
1060 {
1061 int i;
1062 gotasync = 0;
1063
1064 for (i = asynccnt; i--; )
1065 if (asyncs [i]->sent)
1066 {
1067 asyncs [i]->sent = 0;
1068 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1069 }
1070 }
1071#endif
801} 1072}
802 1073
803/*****************************************************************************/ 1074/*****************************************************************************/
804 1075
1076static void
1077ev_sighandler (int signum)
1078{
1079#if EV_MULTIPLICITY
1080 struct ev_loop *loop = &default_loop_struct;
1081#endif
1082
1083#if _WIN32
1084 signal (signum, ev_sighandler);
1085#endif
1086
1087 signals [signum - 1].gotsig = 1;
1088 evpipe_write (EV_A_ &gotsig);
1089}
1090
1091void noinline
1092ev_feed_signal_event (EV_P_ int signum)
1093{
1094 WL w;
1095
1096#if EV_MULTIPLICITY
1097 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1098#endif
1099
1100 --signum;
1101
1102 if (signum < 0 || signum >= signalmax)
1103 return;
1104
1105 signals [signum].gotsig = 0;
1106
1107 for (w = signals [signum].head; w; w = w->next)
1108 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1109}
1110
1111/*****************************************************************************/
1112
805static WL childs [EV_PID_HASHSIZE]; 1113static WL childs [EV_PID_HASHSIZE];
806 1114
807#ifndef _WIN32 1115#ifndef _WIN32
808 1116
809static ev_signal childev; 1117static ev_signal childev;
810 1118
1119#ifndef WIFCONTINUED
1120# define WIFCONTINUED(status) 0
1121#endif
1122
811void inline_speed 1123void inline_speed
812child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1124child_reap (EV_P_ int chain, int pid, int status)
813{ 1125{
814 ev_child *w; 1126 ev_child *w;
1127 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
815 1128
816 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1129 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1130 {
817 if (w->pid == pid || !w->pid) 1131 if ((w->pid == pid || !w->pid)
1132 && (!traced || (w->flags & 1)))
818 { 1133 {
819 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1134 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
820 w->rpid = pid; 1135 w->rpid = pid;
821 w->rstatus = status; 1136 w->rstatus = status;
822 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1137 ev_feed_event (EV_A_ (W)w, EV_CHILD);
823 } 1138 }
1139 }
824} 1140}
825 1141
826#ifndef WCONTINUED 1142#ifndef WCONTINUED
827# define WCONTINUED 0 1143# define WCONTINUED 0
828#endif 1144#endif
837 if (!WCONTINUED 1153 if (!WCONTINUED
838 || errno != EINVAL 1154 || errno != EINVAL
839 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1155 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
840 return; 1156 return;
841 1157
842 /* make sure we are called again until all childs have been reaped */ 1158 /* make sure we are called again until all children have been reaped */
843 /* we need to do it this way so that the callback gets called before we continue */ 1159 /* we need to do it this way so that the callback gets called before we continue */
844 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1160 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
845 1161
846 child_reap (EV_A_ sw, pid, pid, status); 1162 child_reap (EV_A_ pid, pid, status);
847 if (EV_PID_HASHSIZE > 1) 1163 if (EV_PID_HASHSIZE > 1)
848 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1164 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
849} 1165}
850 1166
851#endif 1167#endif
852 1168
853/*****************************************************************************/ 1169/*****************************************************************************/
925} 1241}
926 1242
927unsigned int 1243unsigned int
928ev_embeddable_backends (void) 1244ev_embeddable_backends (void)
929{ 1245{
930 return EVBACKEND_EPOLL 1246 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
931 | EVBACKEND_KQUEUE 1247
932 | EVBACKEND_PORT; 1248 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1249 /* please fix it and tell me how to detect the fix */
1250 flags &= ~EVBACKEND_EPOLL;
1251
1252 return flags;
933} 1253}
934 1254
935unsigned int 1255unsigned int
936ev_backend (EV_P) 1256ev_backend (EV_P)
937{ 1257{
940 1260
941unsigned int 1261unsigned int
942ev_loop_count (EV_P) 1262ev_loop_count (EV_P)
943{ 1263{
944 return loop_count; 1264 return loop_count;
1265}
1266
1267void
1268ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1269{
1270 io_blocktime = interval;
1271}
1272
1273void
1274ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1275{
1276 timeout_blocktime = interval;
945} 1277}
946 1278
947static void noinline 1279static void noinline
948loop_init (EV_P_ unsigned int flags) 1280loop_init (EV_P_ unsigned int flags)
949{ 1281{
955 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1287 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
956 have_monotonic = 1; 1288 have_monotonic = 1;
957 } 1289 }
958#endif 1290#endif
959 1291
960 ev_rt_now = ev_time (); 1292 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1293 mn_now = get_clock ();
962 now_floor = mn_now; 1294 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1295 rtmn_diff = ev_rt_now - mn_now;
1296
1297 io_blocktime = 0.;
1298 timeout_blocktime = 0.;
1299 backend = 0;
1300 backend_fd = -1;
1301 gotasync = 0;
1302#if EV_USE_INOTIFY
1303 fs_fd = -2;
1304#endif
964 1305
965 /* pid check not overridable via env */ 1306 /* pid check not overridable via env */
966#ifndef _WIN32 1307#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1308 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1309 curpid = getpid ();
971 if (!(flags & EVFLAG_NOENV) 1312 if (!(flags & EVFLAG_NOENV)
972 && !enable_secure () 1313 && !enable_secure ()
973 && getenv ("LIBEV_FLAGS")) 1314 && getenv ("LIBEV_FLAGS"))
974 flags = atoi (getenv ("LIBEV_FLAGS")); 1315 flags = atoi (getenv ("LIBEV_FLAGS"));
975 1316
976 if (!(flags & 0x0000ffffUL)) 1317 if (!(flags & 0x0000ffffU))
977 flags |= ev_recommended_backends (); 1318 flags |= ev_recommended_backends ();
978
979 backend = 0;
980 backend_fd = -1;
981#if EV_USE_INOTIFY
982 fs_fd = -2;
983#endif
984 1319
985#if EV_USE_PORT 1320#if EV_USE_PORT
986 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1321 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
987#endif 1322#endif
988#if EV_USE_KQUEUE 1323#if EV_USE_KQUEUE
996#endif 1331#endif
997#if EV_USE_SELECT 1332#if EV_USE_SELECT
998 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1333 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
999#endif 1334#endif
1000 1335
1001 ev_init (&sigev, sigcb); 1336 ev_init (&pipeev, pipecb);
1002 ev_set_priority (&sigev, EV_MAXPRI); 1337 ev_set_priority (&pipeev, EV_MAXPRI);
1003 } 1338 }
1004} 1339}
1005 1340
1006static void noinline 1341static void noinline
1007loop_destroy (EV_P) 1342loop_destroy (EV_P)
1008{ 1343{
1009 int i; 1344 int i;
1345
1346 if (ev_is_active (&pipeev))
1347 {
1348 ev_ref (EV_A); /* signal watcher */
1349 ev_io_stop (EV_A_ &pipeev);
1350
1351#if EV_USE_EVENTFD
1352 if (evfd >= 0)
1353 close (evfd);
1354#endif
1355
1356 if (evpipe [0] >= 0)
1357 {
1358 close (evpipe [0]);
1359 close (evpipe [1]);
1360 }
1361 }
1010 1362
1011#if EV_USE_INOTIFY 1363#if EV_USE_INOTIFY
1012 if (fs_fd >= 0) 1364 if (fs_fd >= 0)
1013 close (fs_fd); 1365 close (fs_fd);
1014#endif 1366#endif
1051#if EV_FORK_ENABLE 1403#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY); 1404 array_free (fork, EMPTY);
1053#endif 1405#endif
1054 array_free (prepare, EMPTY); 1406 array_free (prepare, EMPTY);
1055 array_free (check, EMPTY); 1407 array_free (check, EMPTY);
1408#if EV_ASYNC_ENABLE
1409 array_free (async, EMPTY);
1410#endif
1056 1411
1057 backend = 0; 1412 backend = 0;
1058} 1413}
1059 1414
1415#if EV_USE_INOTIFY
1060void inline_size infy_fork (EV_P); 1416void inline_size infy_fork (EV_P);
1417#endif
1061 1418
1062void inline_size 1419void inline_size
1063loop_fork (EV_P) 1420loop_fork (EV_P)
1064{ 1421{
1065#if EV_USE_PORT 1422#if EV_USE_PORT
1073#endif 1430#endif
1074#if EV_USE_INOTIFY 1431#if EV_USE_INOTIFY
1075 infy_fork (EV_A); 1432 infy_fork (EV_A);
1076#endif 1433#endif
1077 1434
1078 if (ev_is_active (&sigev)) 1435 if (ev_is_active (&pipeev))
1079 { 1436 {
1080 /* default loop */ 1437 /* this "locks" the handlers against writing to the pipe */
1438 /* while we modify the fd vars */
1439 gotsig = 1;
1440#if EV_ASYNC_ENABLE
1441 gotasync = 1;
1442#endif
1081 1443
1082 ev_ref (EV_A); 1444 ev_ref (EV_A);
1083 ev_io_stop (EV_A_ &sigev); 1445 ev_io_stop (EV_A_ &pipeev);
1446
1447#if EV_USE_EVENTFD
1448 if (evfd >= 0)
1449 close (evfd);
1450#endif
1451
1452 if (evpipe [0] >= 0)
1453 {
1084 close (sigpipe [0]); 1454 close (evpipe [0]);
1085 close (sigpipe [1]); 1455 close (evpipe [1]);
1456 }
1086 1457
1087 while (pipe (sigpipe))
1088 syserr ("(libev) error creating pipe");
1089
1090 siginit (EV_A); 1458 evpipe_init (EV_A);
1459 /* now iterate over everything, in case we missed something */
1460 pipecb (EV_A_ &pipeev, EV_READ);
1091 } 1461 }
1092 1462
1093 postfork = 0; 1463 postfork = 0;
1094} 1464}
1095 1465
1117} 1487}
1118 1488
1119void 1489void
1120ev_loop_fork (EV_P) 1490ev_loop_fork (EV_P)
1121{ 1491{
1122 postfork = 1; 1492 postfork = 1; /* must be in line with ev_default_fork */
1123} 1493}
1124
1125#endif 1494#endif
1126 1495
1127#if EV_MULTIPLICITY 1496#if EV_MULTIPLICITY
1128struct ev_loop * 1497struct ev_loop *
1129ev_default_loop_init (unsigned int flags) 1498ev_default_loop_init (unsigned int flags)
1130#else 1499#else
1131int 1500int
1132ev_default_loop (unsigned int flags) 1501ev_default_loop (unsigned int flags)
1133#endif 1502#endif
1134{ 1503{
1135 if (sigpipe [0] == sigpipe [1])
1136 if (pipe (sigpipe))
1137 return 0;
1138
1139 if (!ev_default_loop_ptr) 1504 if (!ev_default_loop_ptr)
1140 { 1505 {
1141#if EV_MULTIPLICITY 1506#if EV_MULTIPLICITY
1142 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1507 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1143#else 1508#else
1146 1511
1147 loop_init (EV_A_ flags); 1512 loop_init (EV_A_ flags);
1148 1513
1149 if (ev_backend (EV_A)) 1514 if (ev_backend (EV_A))
1150 { 1515 {
1151 siginit (EV_A);
1152
1153#ifndef _WIN32 1516#ifndef _WIN32
1154 ev_signal_init (&childev, childcb, SIGCHLD); 1517 ev_signal_init (&childev, childcb, SIGCHLD);
1155 ev_set_priority (&childev, EV_MAXPRI); 1518 ev_set_priority (&childev, EV_MAXPRI);
1156 ev_signal_start (EV_A_ &childev); 1519 ev_signal_start (EV_A_ &childev);
1157 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1520 ev_unref (EV_A); /* child watcher should not keep loop alive */
1174#ifndef _WIN32 1537#ifndef _WIN32
1175 ev_ref (EV_A); /* child watcher */ 1538 ev_ref (EV_A); /* child watcher */
1176 ev_signal_stop (EV_A_ &childev); 1539 ev_signal_stop (EV_A_ &childev);
1177#endif 1540#endif
1178 1541
1179 ev_ref (EV_A); /* signal watcher */
1180 ev_io_stop (EV_A_ &sigev);
1181
1182 close (sigpipe [0]); sigpipe [0] = 0;
1183 close (sigpipe [1]); sigpipe [1] = 0;
1184
1185 loop_destroy (EV_A); 1542 loop_destroy (EV_A);
1186} 1543}
1187 1544
1188void 1545void
1189ev_default_fork (void) 1546ev_default_fork (void)
1191#if EV_MULTIPLICITY 1548#if EV_MULTIPLICITY
1192 struct ev_loop *loop = ev_default_loop_ptr; 1549 struct ev_loop *loop = ev_default_loop_ptr;
1193#endif 1550#endif
1194 1551
1195 if (backend) 1552 if (backend)
1196 postfork = 1; 1553 postfork = 1; /* must be in line with ev_loop_fork */
1197} 1554}
1198 1555
1199/*****************************************************************************/ 1556/*****************************************************************************/
1200 1557
1201void 1558void
1221 p->w->pending = 0; 1578 p->w->pending = 0;
1222 EV_CB_INVOKE (p->w, p->events); 1579 EV_CB_INVOKE (p->w, p->events);
1223 } 1580 }
1224 } 1581 }
1225} 1582}
1226
1227void inline_size
1228timers_reify (EV_P)
1229{
1230 while (timercnt && ((WT)timers [0])->at <= mn_now)
1231 {
1232 ev_timer *w = (ev_timer *)timers [0];
1233
1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1235
1236 /* first reschedule or stop timer */
1237 if (w->repeat)
1238 {
1239 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1240
1241 ((WT)w)->at += w->repeat;
1242 if (((WT)w)->at < mn_now)
1243 ((WT)w)->at = mn_now;
1244
1245 downheap (timers, timercnt, 0);
1246 }
1247 else
1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1249
1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1251 }
1252}
1253
1254#if EV_PERIODIC_ENABLE
1255void inline_size
1256periodics_reify (EV_P)
1257{
1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1259 {
1260 ev_periodic *w = (ev_periodic *)periodics [0];
1261
1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1263
1264 /* first reschedule or stop timer */
1265 if (w->reschedule_cb)
1266 {
1267 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1268 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1269 downheap (periodics, periodiccnt, 0);
1270 }
1271 else if (w->interval)
1272 {
1273 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1274 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1275 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1276 downheap (periodics, periodiccnt, 0);
1277 }
1278 else
1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1280
1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1282 }
1283}
1284
1285static void noinline
1286periodics_reschedule (EV_P)
1287{
1288 int i;
1289
1290 /* adjust periodics after time jump */
1291 for (i = 0; i < periodiccnt; ++i)
1292 {
1293 ev_periodic *w = (ev_periodic *)periodics [i];
1294
1295 if (w->reschedule_cb)
1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1297 else if (w->interval)
1298 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1299 }
1300
1301 /* now rebuild the heap */
1302 for (i = periodiccnt >> 1; i--; )
1303 downheap (periodics, periodiccnt, i);
1304}
1305#endif
1306 1583
1307#if EV_IDLE_ENABLE 1584#if EV_IDLE_ENABLE
1308void inline_size 1585void inline_size
1309idle_reify (EV_P) 1586idle_reify (EV_P)
1310{ 1587{
1322 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1599 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1323 break; 1600 break;
1324 } 1601 }
1325 } 1602 }
1326 } 1603 }
1604}
1605#endif
1606
1607void inline_size
1608timers_reify (EV_P)
1609{
1610 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1611 {
1612 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1613
1614 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1615
1616 /* first reschedule or stop timer */
1617 if (w->repeat)
1618 {
1619 ev_at (w) += w->repeat;
1620 if (ev_at (w) < mn_now)
1621 ev_at (w) = mn_now;
1622
1623 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1624
1625 ANHE_at_set (timers [HEAP0]);
1626 downheap (timers, timercnt, HEAP0);
1627 }
1628 else
1629 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1630
1631 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1632 }
1633}
1634
1635#if EV_PERIODIC_ENABLE
1636void inline_size
1637periodics_reify (EV_P)
1638{
1639 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1640 {
1641 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1642
1643 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1644
1645 /* first reschedule or stop timer */
1646 if (w->reschedule_cb)
1647 {
1648 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1649
1650 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1651
1652 ANHE_at_set (periodics [HEAP0]);
1653 downheap (periodics, periodiccnt, HEAP0);
1654 }
1655 else if (w->interval)
1656 {
1657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1658 /* if next trigger time is not sufficiently in the future, put it there */
1659 /* this might happen because of floating point inexactness */
1660 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1661 {
1662 ev_at (w) += w->interval;
1663
1664 /* if interval is unreasonably low we might still have a time in the past */
1665 /* so correct this. this will make the periodic very inexact, but the user */
1666 /* has effectively asked to get triggered more often than possible */
1667 if (ev_at (w) < ev_rt_now)
1668 ev_at (w) = ev_rt_now;
1669 }
1670
1671 ANHE_at_set (periodics [HEAP0]);
1672 downheap (periodics, periodiccnt, HEAP0);
1673 }
1674 else
1675 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1676
1677 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1678 }
1679}
1680
1681static void noinline
1682periodics_reschedule (EV_P)
1683{
1684 int i;
1685
1686 /* adjust periodics after time jump */
1687 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1688 {
1689 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1690
1691 if (w->reschedule_cb)
1692 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693 else if (w->interval)
1694 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695
1696 ANHE_at_set (periodics [i]);
1697 }
1698
1699 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */
1700 /* also, this is easy and corretc for both 2-heaps and 4-heaps */
1701 for (i = 0; i < periodiccnt; ++i)
1702 upheap (periodics, i + HEAP0);
1327} 1703}
1328#endif 1704#endif
1329 1705
1330void inline_speed 1706void inline_speed
1331time_update (EV_P_ ev_tstamp max_block) 1707time_update (EV_P_ ev_tstamp max_block)
1360 */ 1736 */
1361 for (i = 4; --i; ) 1737 for (i = 4; --i; )
1362 { 1738 {
1363 rtmn_diff = ev_rt_now - mn_now; 1739 rtmn_diff = ev_rt_now - mn_now;
1364 1740
1365 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1741 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1366 return; /* all is well */ 1742 return; /* all is well */
1367 1743
1368 ev_rt_now = ev_time (); 1744 ev_rt_now = ev_time ();
1369 mn_now = get_clock (); 1745 mn_now = get_clock ();
1370 now_floor = mn_now; 1746 now_floor = mn_now;
1386#if EV_PERIODIC_ENABLE 1762#if EV_PERIODIC_ENABLE
1387 periodics_reschedule (EV_A); 1763 periodics_reschedule (EV_A);
1388#endif 1764#endif
1389 /* adjust timers. this is easy, as the offset is the same for all of them */ 1765 /* adjust timers. this is easy, as the offset is the same for all of them */
1390 for (i = 0; i < timercnt; ++i) 1766 for (i = 0; i < timercnt; ++i)
1767 {
1768 ANHE *he = timers + i + HEAP0;
1391 ((WT)timers [i])->at += ev_rt_now - mn_now; 1769 ANHE_w (*he)->at += ev_rt_now - mn_now;
1770 ANHE_at_set (*he);
1771 }
1392 } 1772 }
1393 1773
1394 mn_now = ev_rt_now; 1774 mn_now = ev_rt_now;
1395 } 1775 }
1396} 1776}
1410static int loop_done; 1790static int loop_done;
1411 1791
1412void 1792void
1413ev_loop (EV_P_ int flags) 1793ev_loop (EV_P_ int flags)
1414{ 1794{
1415 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1795 loop_done = EVUNLOOP_CANCEL;
1416 ? EVUNLOOP_ONE
1417 : EVUNLOOP_CANCEL;
1418 1796
1419 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1797 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1420 1798
1421 do 1799 do
1422 { 1800 {
1456 /* update fd-related kernel structures */ 1834 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1835 fd_reify (EV_A);
1458 1836
1459 /* calculate blocking time */ 1837 /* calculate blocking time */
1460 { 1838 {
1461 ev_tstamp block; 1839 ev_tstamp waittime = 0.;
1840 ev_tstamp sleeptime = 0.;
1462 1841
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1842 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1843 {
1467 /* update time to cancel out callback processing overhead */ 1844 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1845 time_update (EV_A_ 1e100);
1469 1846
1470 block = MAX_BLOCKTIME; 1847 waittime = MAX_BLOCKTIME;
1471 1848
1472 if (timercnt) 1849 if (timercnt)
1473 { 1850 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1851 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1475 if (block > to) block = to; 1852 if (waittime > to) waittime = to;
1476 } 1853 }
1477 1854
1478#if EV_PERIODIC_ENABLE 1855#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1856 if (periodiccnt)
1480 { 1857 {
1481 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1858 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1482 if (block > to) block = to; 1859 if (waittime > to) waittime = to;
1483 } 1860 }
1484#endif 1861#endif
1485 1862
1486 if (expect_false (block < 0.)) block = 0.; 1863 if (expect_false (waittime < timeout_blocktime))
1864 waittime = timeout_blocktime;
1865
1866 sleeptime = waittime - backend_fudge;
1867
1868 if (expect_true (sleeptime > io_blocktime))
1869 sleeptime = io_blocktime;
1870
1871 if (sleeptime)
1872 {
1873 ev_sleep (sleeptime);
1874 waittime -= sleeptime;
1875 }
1487 } 1876 }
1488 1877
1489 ++loop_count; 1878 ++loop_count;
1490 backend_poll (EV_A_ block); 1879 backend_poll (EV_A_ waittime);
1491 1880
1492 /* update ev_rt_now, do magic */ 1881 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1882 time_update (EV_A_ waittime + sleeptime);
1494 } 1883 }
1495 1884
1496 /* queue pending timers and reschedule them */ 1885 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1886 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1887#if EV_PERIODIC_ENABLE
1507 /* queue check watchers, to be executed first */ 1896 /* queue check watchers, to be executed first */
1508 if (expect_false (checkcnt)) 1897 if (expect_false (checkcnt))
1509 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1898 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1510 1899
1511 call_pending (EV_A); 1900 call_pending (EV_A);
1512
1513 } 1901 }
1514 while (expect_true (activecnt && !loop_done)); 1902 while (expect_true (
1903 activecnt
1904 && !loop_done
1905 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1906 ));
1515 1907
1516 if (loop_done == EVUNLOOP_ONE) 1908 if (loop_done == EVUNLOOP_ONE)
1517 loop_done = EVUNLOOP_CANCEL; 1909 loop_done = EVUNLOOP_CANCEL;
1518} 1910}
1519 1911
1623{ 2015{
1624 clear_pending (EV_A_ (W)w); 2016 clear_pending (EV_A_ (W)w);
1625 if (expect_false (!ev_is_active (w))) 2017 if (expect_false (!ev_is_active (w)))
1626 return; 2018 return;
1627 2019
1628 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2020 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1629 2021
1630 wlist_del (&anfds[w->fd].head, (WL)w); 2022 wlist_del (&anfds[w->fd].head, (WL)w);
1631 ev_stop (EV_A_ (W)w); 2023 ev_stop (EV_A_ (W)w);
1632 2024
1633 fd_change (EV_A_ w->fd, 1); 2025 fd_change (EV_A_ w->fd, 1);
1637ev_timer_start (EV_P_ ev_timer *w) 2029ev_timer_start (EV_P_ ev_timer *w)
1638{ 2030{
1639 if (expect_false (ev_is_active (w))) 2031 if (expect_false (ev_is_active (w)))
1640 return; 2032 return;
1641 2033
1642 ((WT)w)->at += mn_now; 2034 ev_at (w) += mn_now;
1643 2035
1644 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2036 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1645 2037
1646 ev_start (EV_A_ (W)w, ++timercnt); 2038 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2039 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1648 timers [timercnt - 1] = (WT)w; 2040 ANHE_w (timers [ev_active (w)]) = (WT)w;
1649 upheap (timers, timercnt - 1); 2041 ANHE_at_set (timers [ev_active (w)]);
2042 upheap (timers, ev_active (w));
1650 2043
1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2044 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1652} 2045}
1653 2046
1654void noinline 2047void noinline
1655ev_timer_stop (EV_P_ ev_timer *w) 2048ev_timer_stop (EV_P_ ev_timer *w)
1656{ 2049{
1657 clear_pending (EV_A_ (W)w); 2050 clear_pending (EV_A_ (W)w);
1658 if (expect_false (!ev_is_active (w))) 2051 if (expect_false (!ev_is_active (w)))
1659 return; 2052 return;
1660 2053
1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1662
1663 { 2054 {
1664 int active = ((W)w)->active; 2055 int active = ev_active (w);
1665 2056
2057 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2058
1666 if (expect_true (--active < --timercnt)) 2059 if (expect_true (active < timercnt + HEAP0 - 1))
1667 { 2060 {
1668 timers [active] = timers [timercnt]; 2061 timers [active] = timers [timercnt + HEAP0 - 1];
1669 adjustheap (timers, timercnt, active); 2062 adjustheap (timers, timercnt, active);
1670 } 2063 }
2064
2065 --timercnt;
1671 } 2066 }
1672 2067
1673 ((WT)w)->at -= mn_now; 2068 ev_at (w) -= mn_now;
1674 2069
1675 ev_stop (EV_A_ (W)w); 2070 ev_stop (EV_A_ (W)w);
1676} 2071}
1677 2072
1678void noinline 2073void noinline
1680{ 2075{
1681 if (ev_is_active (w)) 2076 if (ev_is_active (w))
1682 { 2077 {
1683 if (w->repeat) 2078 if (w->repeat)
1684 { 2079 {
1685 ((WT)w)->at = mn_now + w->repeat; 2080 ev_at (w) = mn_now + w->repeat;
2081 ANHE_at_set (timers [ev_active (w)]);
1686 adjustheap (timers, timercnt, ((W)w)->active - 1); 2082 adjustheap (timers, timercnt, ev_active (w));
1687 } 2083 }
1688 else 2084 else
1689 ev_timer_stop (EV_A_ w); 2085 ev_timer_stop (EV_A_ w);
1690 } 2086 }
1691 else if (w->repeat) 2087 else if (w->repeat)
1692 { 2088 {
1693 w->at = w->repeat; 2089 ev_at (w) = w->repeat;
1694 ev_timer_start (EV_A_ w); 2090 ev_timer_start (EV_A_ w);
1695 } 2091 }
1696} 2092}
1697 2093
1698#if EV_PERIODIC_ENABLE 2094#if EV_PERIODIC_ENABLE
1701{ 2097{
1702 if (expect_false (ev_is_active (w))) 2098 if (expect_false (ev_is_active (w)))
1703 return; 2099 return;
1704 2100
1705 if (w->reschedule_cb) 2101 if (w->reschedule_cb)
1706 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2102 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1707 else if (w->interval) 2103 else if (w->interval)
1708 { 2104 {
1709 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2105 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1710 /* this formula differs from the one in periodic_reify because we do not always round up */ 2106 /* this formula differs from the one in periodic_reify because we do not always round up */
1711 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2107 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1712 } 2108 }
1713 else 2109 else
1714 ((WT)w)->at = w->offset; 2110 ev_at (w) = w->offset;
1715 2111
1716 ev_start (EV_A_ (W)w, ++periodiccnt); 2112 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2113 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1718 periodics [periodiccnt - 1] = (WT)w; 2114 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1719 upheap (periodics, periodiccnt - 1); 2115 ANHE_at_set (periodics [ev_active (w)]);
2116 upheap (periodics, ev_active (w));
1720 2117
1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2118 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1722} 2119}
1723 2120
1724void noinline 2121void noinline
1725ev_periodic_stop (EV_P_ ev_periodic *w) 2122ev_periodic_stop (EV_P_ ev_periodic *w)
1726{ 2123{
1727 clear_pending (EV_A_ (W)w); 2124 clear_pending (EV_A_ (W)w);
1728 if (expect_false (!ev_is_active (w))) 2125 if (expect_false (!ev_is_active (w)))
1729 return; 2126 return;
1730 2127
1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1732
1733 { 2128 {
1734 int active = ((W)w)->active; 2129 int active = ev_active (w);
1735 2130
2131 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2132
1736 if (expect_true (--active < --periodiccnt)) 2133 if (expect_true (active < periodiccnt + HEAP0 - 1))
1737 { 2134 {
1738 periodics [active] = periodics [periodiccnt]; 2135 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1739 adjustheap (periodics, periodiccnt, active); 2136 adjustheap (periodics, periodiccnt, active);
1740 } 2137 }
2138
2139 --periodiccnt;
1741 } 2140 }
1742 2141
1743 ev_stop (EV_A_ (W)w); 2142 ev_stop (EV_A_ (W)w);
1744} 2143}
1745 2144
1764#endif 2163#endif
1765 if (expect_false (ev_is_active (w))) 2164 if (expect_false (ev_is_active (w)))
1766 return; 2165 return;
1767 2166
1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2167 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2168
2169 evpipe_init (EV_A);
1769 2170
1770 { 2171 {
1771#ifndef _WIN32 2172#ifndef _WIN32
1772 sigset_t full, prev; 2173 sigset_t full, prev;
1773 sigfillset (&full); 2174 sigfillset (&full);
1785 wlist_add (&signals [w->signum - 1].head, (WL)w); 2186 wlist_add (&signals [w->signum - 1].head, (WL)w);
1786 2187
1787 if (!((WL)w)->next) 2188 if (!((WL)w)->next)
1788 { 2189 {
1789#if _WIN32 2190#if _WIN32
1790 signal (w->signum, sighandler); 2191 signal (w->signum, ev_sighandler);
1791#else 2192#else
1792 struct sigaction sa; 2193 struct sigaction sa;
1793 sa.sa_handler = sighandler; 2194 sa.sa_handler = ev_sighandler;
1794 sigfillset (&sa.sa_mask); 2195 sigfillset (&sa.sa_mask);
1795 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2196 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1796 sigaction (w->signum, &sa, 0); 2197 sigaction (w->signum, &sa, 0);
1797#endif 2198#endif
1798 } 2199 }
1859 if (w->wd < 0) 2260 if (w->wd < 0)
1860 { 2261 {
1861 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2262 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1862 2263
1863 /* monitor some parent directory for speedup hints */ 2264 /* monitor some parent directory for speedup hints */
2265 /* note that exceeding the hardcoded limit is not a correctness issue, */
2266 /* but an efficiency issue only */
1864 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2267 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1865 { 2268 {
1866 char path [4096]; 2269 char path [4096];
1867 strcpy (path, w->path); 2270 strcpy (path, w->path);
1868 2271
2113 clear_pending (EV_A_ (W)w); 2516 clear_pending (EV_A_ (W)w);
2114 if (expect_false (!ev_is_active (w))) 2517 if (expect_false (!ev_is_active (w)))
2115 return; 2518 return;
2116 2519
2117 { 2520 {
2118 int active = ((W)w)->active; 2521 int active = ev_active (w);
2119 2522
2120 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2523 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2121 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2524 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2122 2525
2123 ev_stop (EV_A_ (W)w); 2526 ev_stop (EV_A_ (W)w);
2124 --idleall; 2527 --idleall;
2125 } 2528 }
2126} 2529}
2143 clear_pending (EV_A_ (W)w); 2546 clear_pending (EV_A_ (W)w);
2144 if (expect_false (!ev_is_active (w))) 2547 if (expect_false (!ev_is_active (w)))
2145 return; 2548 return;
2146 2549
2147 { 2550 {
2148 int active = ((W)w)->active; 2551 int active = ev_active (w);
2552
2149 prepares [active - 1] = prepares [--preparecnt]; 2553 prepares [active - 1] = prepares [--preparecnt];
2150 ((W)prepares [active - 1])->active = active; 2554 ev_active (prepares [active - 1]) = active;
2151 } 2555 }
2152 2556
2153 ev_stop (EV_A_ (W)w); 2557 ev_stop (EV_A_ (W)w);
2154} 2558}
2155 2559
2170 clear_pending (EV_A_ (W)w); 2574 clear_pending (EV_A_ (W)w);
2171 if (expect_false (!ev_is_active (w))) 2575 if (expect_false (!ev_is_active (w)))
2172 return; 2576 return;
2173 2577
2174 { 2578 {
2175 int active = ((W)w)->active; 2579 int active = ev_active (w);
2580
2176 checks [active - 1] = checks [--checkcnt]; 2581 checks [active - 1] = checks [--checkcnt];
2177 ((W)checks [active - 1])->active = active; 2582 ev_active (checks [active - 1]) = active;
2178 } 2583 }
2179 2584
2180 ev_stop (EV_A_ (W)w); 2585 ev_stop (EV_A_ (W)w);
2181} 2586}
2182 2587
2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2598 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2194 2599
2195 if (ev_cb (w)) 2600 if (ev_cb (w))
2196 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2601 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2197 else 2602 else
2198 ev_embed_sweep (loop, w); 2603 ev_loop (w->other, EVLOOP_NONBLOCK);
2199} 2604}
2200 2605
2201static void 2606static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2607embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{ 2608{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2609 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205 2610
2206 fd_reify (w->other); 2611 {
2612 struct ev_loop *loop = w->other;
2613
2614 while (fdchangecnt)
2615 {
2616 fd_reify (EV_A);
2617 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2618 }
2619 }
2207} 2620}
2621
2622#if 0
2623static void
2624embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2625{
2626 ev_idle_stop (EV_A_ idle);
2627}
2628#endif
2208 2629
2209void 2630void
2210ev_embed_start (EV_P_ ev_embed *w) 2631ev_embed_start (EV_P_ ev_embed *w)
2211{ 2632{
2212 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
2213 return; 2634 return;
2214 2635
2215 { 2636 {
2216 struct ev_loop *loop = w->other; 2637 struct ev_loop *loop = w->other;
2217 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2638 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2218 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_WRITE); 2639 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2219 } 2640 }
2220 2641
2221 ev_set_priority (&w->io, ev_priority (w)); 2642 ev_set_priority (&w->io, ev_priority (w));
2222 ev_io_start (EV_A_ &w->io); 2643 ev_io_start (EV_A_ &w->io);
2223 2644
2224 ev_prepare_init (&w->prepare, embed_prepare_cb); 2645 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI); 2646 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare); 2647 ev_prepare_start (EV_A_ &w->prepare);
2227 2648
2649 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2650
2228 ev_start (EV_A_ (W)w, 1); 2651 ev_start (EV_A_ (W)w, 1);
2229} 2652}
2230 2653
2231void 2654void
2232ev_embed_stop (EV_P_ ev_embed *w) 2655ev_embed_stop (EV_P_ ev_embed *w)
2260 clear_pending (EV_A_ (W)w); 2683 clear_pending (EV_A_ (W)w);
2261 if (expect_false (!ev_is_active (w))) 2684 if (expect_false (!ev_is_active (w)))
2262 return; 2685 return;
2263 2686
2264 { 2687 {
2265 int active = ((W)w)->active; 2688 int active = ev_active (w);
2689
2266 forks [active - 1] = forks [--forkcnt]; 2690 forks [active - 1] = forks [--forkcnt];
2267 ((W)forks [active - 1])->active = active; 2691 ev_active (forks [active - 1]) = active;
2268 } 2692 }
2269 2693
2270 ev_stop (EV_A_ (W)w); 2694 ev_stop (EV_A_ (W)w);
2695}
2696#endif
2697
2698#if EV_ASYNC_ENABLE
2699void
2700ev_async_start (EV_P_ ev_async *w)
2701{
2702 if (expect_false (ev_is_active (w)))
2703 return;
2704
2705 evpipe_init (EV_A);
2706
2707 ev_start (EV_A_ (W)w, ++asynccnt);
2708 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2709 asyncs [asynccnt - 1] = w;
2710}
2711
2712void
2713ev_async_stop (EV_P_ ev_async *w)
2714{
2715 clear_pending (EV_A_ (W)w);
2716 if (expect_false (!ev_is_active (w)))
2717 return;
2718
2719 {
2720 int active = ev_active (w);
2721
2722 asyncs [active - 1] = asyncs [--asynccnt];
2723 ev_active (asyncs [active - 1]) = active;
2724 }
2725
2726 ev_stop (EV_A_ (W)w);
2727}
2728
2729void
2730ev_async_send (EV_P_ ev_async *w)
2731{
2732 w->sent = 1;
2733 evpipe_write (EV_A_ &gotasync);
2271} 2734}
2272#endif 2735#endif
2273 2736
2274/*****************************************************************************/ 2737/*****************************************************************************/
2275 2738

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines