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

Comparing libev/ev.c (file contents):
Revision 1.183 by root, Wed Dec 12 05:11:56 2007 UTC vs.
Revision 1.236 by root, Wed May 7 14:46:22 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#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
333#if EV_USE_MONOTONIC
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
335/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
267 338
268#ifdef _WIN32 339#ifdef _WIN32
269# include "ev_win32.c" 340# include "ev_win32.c"
270#endif 341#endif
271 342
292 perror (msg); 363 perror (msg);
293 abort (); 364 abort ();
294 } 365 }
295} 366}
296 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
297static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
298 384
299void 385void
300ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
301{ 387{
302 alloc = cb; 388 alloc = cb;
303} 389}
304 390
305inline_speed void * 391inline_speed void *
306ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
307{ 393{
308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
309 395
310 if (!ptr && size) 396 if (!ptr && size)
311 { 397 {
312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
313 abort (); 399 abort ();
407{ 493{
408 return ev_rt_now; 494 return ev_rt_now;
409} 495}
410#endif 496#endif
411 497
498void
499ev_sleep (ev_tstamp delay)
500{
501 if (delay > 0.)
502 {
503#if EV_USE_NANOSLEEP
504 struct timespec ts;
505
506 ts.tv_sec = (time_t)delay;
507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
508
509 nanosleep (&ts, 0);
510#elif defined(_WIN32)
511 Sleep ((unsigned long)(delay * 1e3));
512#else
513 struct timeval tv;
514
515 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517
518 select (0, 0, 0, 0, &tv);
519#endif
520 }
521}
522
523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
412int inline_size 527int inline_size
413array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
414{ 529{
415 int ncur = cur + 1; 530 int ncur = cur + 1;
416 531
417 do 532 do
418 ncur <<= 1; 533 ncur <<= 1;
419 while (cnt > ncur); 534 while (cnt > ncur);
420 535
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
423 { 538 {
424 ncur *= elem; 539 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
426 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem; 542 ncur /= elem;
428 } 543 }
429 544
430 return ncur; 545 return ncur;
533 { 648 {
534 int fd = fdchanges [i]; 649 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 650 ANFD *anfd = anfds + fd;
536 ev_io *w; 651 ev_io *w;
537 652
538 int events = 0; 653 unsigned char events = 0;
539 654
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 655 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 656 events |= (unsigned char)w->events;
542 657
543#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
544 if (events) 659 if (events)
545 { 660 {
546 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
547 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 668 }
550#endif 669#endif
551 670
671 {
672 unsigned char o_events = anfd->events;
673 unsigned char o_reify = anfd->reify;
674
552 anfd->reify = 0; 675 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 676 anfd->events = events;
677
678 if (o_events != events || o_reify & EV_IOFDSET)
679 backend_modify (EV_A_ fd, o_events, events);
680 }
556 } 681 }
557 682
558 fdchangecnt = 0; 683 fdchangecnt = 0;
559} 684}
560 685
561void inline_size 686void inline_size
562fd_change (EV_P_ int fd, int flags) 687fd_change (EV_P_ int fd, int flags)
563{ 688{
564 unsigned char reify = anfds [fd].reify; 689 unsigned char reify = anfds [fd].reify;
565 anfds [fd].reify |= flags | 1; 690 anfds [fd].reify |= flags;
566 691
567 if (expect_true (!reify)) 692 if (expect_true (!reify))
568 { 693 {
569 ++fdchangecnt; 694 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 695 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
628 753
629 for (fd = 0; fd < anfdmax; ++fd) 754 for (fd = 0; fd < anfdmax; ++fd)
630 if (anfds [fd].events) 755 if (anfds [fd].events)
631 { 756 {
632 anfds [fd].events = 0; 757 anfds [fd].events = 0;
633 fd_change (EV_A_ fd, EV_IOFDSET); 758 fd_change (EV_A_ fd, EV_IOFDSET | 1);
634 } 759 }
635} 760}
636 761
637/*****************************************************************************/ 762/*****************************************************************************/
638 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define HEAP0 3 /* index of first element in heap */
774
775/* towards the root */
639void inline_speed 776void inline_speed
640upheap (WT *heap, int k) 777upheap (WT *heap, int k)
641{ 778{
642 WT w = heap [k]; 779 WT w = heap [k];
643 780
644 while (k) 781 for (;;)
645 { 782 {
646 int p = (k - 1) >> 1; 783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
647 784
648 if (heap [p]->at <= w->at) 785 if (p >= HEAP0 || heap [p]->at <= w->at)
649 break; 786 break;
650 787
651 heap [k] = heap [p]; 788 heap [k] = heap [p];
652 ((W)heap [k])->active = k + 1; 789 ev_active (heap [k]) = k;
653 k = p; 790 k = p;
654 } 791 }
655 792
656 heap [k] = w; 793 heap [k] = w;
657 ((W)heap [k])->active = k + 1; 794 ev_active (heap [k]) = k;
658} 795}
659 796
797/* away from the root */
660void inline_speed 798void inline_speed
661downheap (WT *heap, int N, int k) 799downheap (WT *heap, int N, int k)
662{ 800{
663 WT w = heap [k]; 801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
664 803
665 for (;;) 804 for (;;)
666 { 805 {
806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
809
810 // find minimum child
811 if (expect_true (pos +3 < E))
812 {
813 /* fast path */
814 (minpos = pos + 0), (minat = (*minpos)->at);
815 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
816 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
817 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
818 }
819 else
820 {
821 /* slow path */
822 if (pos >= E)
823 break;
824 (minpos = pos + 0), (minat = (*minpos)->at);
825 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
826 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
827 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
828 }
829
830 if (w->at <= minat)
831 break;
832
833 ev_active (*minpos) = k;
834 heap [k] = *minpos;
835
836 k = minpos - heap;
837 }
838
839 heap [k] = w;
840 ev_active (heap [k]) = k;
841}
842
843#else // 4HEAP
844
845#define HEAP0 1
846
847/* towards the root */
848void inline_speed
849upheap (WT *heap, int k)
850{
851 WT w = heap [k];
852
853 for (;;)
854 {
855 int p = k >> 1;
856
857 /* maybe we could use a dummy element at heap [0]? */
858 if (!p || heap [p]->at <= w->at)
859 break;
860
861 heap [k] = heap [p];
862 ev_active (heap [k]) = k;
863 k = p;
864 }
865
866 heap [k] = w;
867 ev_active (heap [k]) = k;
868}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
667 int c = (k << 1) + 1; 878 int c = k << 1;
668 879
669 if (c >= N) 880 if (c > N)
670 break; 881 break;
671 882
672 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
673 ? 1 : 0; 884 ? 1 : 0;
674 885
675 if (w->at <= heap [c]->at) 886 if (w->at <= heap [c]->at)
676 break; 887 break;
677 888
678 heap [k] = heap [c]; 889 heap [k] = heap [c];
679 ((W)heap [k])->active = k + 1; 890 ((W)heap [k])->active = k;
680 891
681 k = c; 892 k = c;
682 } 893 }
683 894
684 heap [k] = w; 895 heap [k] = w;
685 ((W)heap [k])->active = k + 1; 896 ev_active (heap [k]) = k;
686} 897}
898#endif
687 899
688void inline_size 900void inline_size
689adjustheap (WT *heap, int N, int k) 901adjustheap (WT *heap, int N, int k)
690{ 902{
691 upheap (heap, k); 903 upheap (heap, k);
695/*****************************************************************************/ 907/*****************************************************************************/
696 908
697typedef struct 909typedef struct
698{ 910{
699 WL head; 911 WL head;
700 sig_atomic_t volatile gotsig; 912 EV_ATOMIC_T gotsig;
701} ANSIG; 913} ANSIG;
702 914
703static ANSIG *signals; 915static ANSIG *signals;
704static int signalmax; 916static int signalmax;
705 917
706static int sigpipe [2]; 918static EV_ATOMIC_T gotsig;
707static sig_atomic_t volatile gotsig;
708static ev_io sigev;
709 919
710void inline_size 920void inline_size
711signals_init (ANSIG *base, int count) 921signals_init (ANSIG *base, int count)
712{ 922{
713 while (count--) 923 while (count--)
717 927
718 ++base; 928 ++base;
719 } 929 }
720} 930}
721 931
722static void 932/*****************************************************************************/
723sighandler (int signum)
724{
725#if _WIN32
726 signal (signum, sighandler);
727#endif
728
729 signals [signum - 1].gotsig = 1;
730
731 if (!gotsig)
732 {
733 int old_errno = errno;
734 gotsig = 1;
735 write (sigpipe [1], &signum, 1);
736 errno = old_errno;
737 }
738}
739
740void noinline
741ev_feed_signal_event (EV_P_ int signum)
742{
743 WL w;
744
745#if EV_MULTIPLICITY
746 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
747#endif
748
749 --signum;
750
751 if (signum < 0 || signum >= signalmax)
752 return;
753
754 signals [signum].gotsig = 0;
755
756 for (w = signals [signum].head; w; w = w->next)
757 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
758}
759
760static void
761sigcb (EV_P_ ev_io *iow, int revents)
762{
763 int signum;
764
765 read (sigpipe [0], &revents, 1);
766 gotsig = 0;
767
768 for (signum = signalmax; signum--; )
769 if (signals [signum].gotsig)
770 ev_feed_signal_event (EV_A_ signum + 1);
771}
772 933
773void inline_speed 934void inline_speed
774fd_intern (int fd) 935fd_intern (int fd)
775{ 936{
776#ifdef _WIN32 937#ifdef _WIN32
781 fcntl (fd, F_SETFL, O_NONBLOCK); 942 fcntl (fd, F_SETFL, O_NONBLOCK);
782#endif 943#endif
783} 944}
784 945
785static void noinline 946static void noinline
786siginit (EV_P) 947evpipe_init (EV_P)
787{ 948{
949 if (!ev_is_active (&pipeev))
950 {
951#if EV_USE_EVENTFD
952 if ((evfd = eventfd (0, 0)) >= 0)
953 {
954 evpipe [0] = -1;
955 fd_intern (evfd);
956 ev_io_set (&pipeev, evfd, EV_READ);
957 }
958 else
959#endif
960 {
961 while (pipe (evpipe))
962 syserr ("(libev) error creating signal/async pipe");
963
788 fd_intern (sigpipe [0]); 964 fd_intern (evpipe [0]);
789 fd_intern (sigpipe [1]); 965 fd_intern (evpipe [1]);
966 ev_io_set (&pipeev, evpipe [0], EV_READ);
967 }
790 968
791 ev_io_set (&sigev, sigpipe [0], EV_READ);
792 ev_io_start (EV_A_ &sigev); 969 ev_io_start (EV_A_ &pipeev);
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* watcher should not keep loop alive */
971 }
972}
973
974void inline_size
975evpipe_write (EV_P_ EV_ATOMIC_T *flag)
976{
977 if (!*flag)
978 {
979 int old_errno = errno; /* save errno because write might clobber it */
980
981 *flag = 1;
982
983#if EV_USE_EVENTFD
984 if (evfd >= 0)
985 {
986 uint64_t counter = 1;
987 write (evfd, &counter, sizeof (uint64_t));
988 }
989 else
990#endif
991 write (evpipe [1], &old_errno, 1);
992
993 errno = old_errno;
994 }
995}
996
997static void
998pipecb (EV_P_ ev_io *iow, int revents)
999{
1000#if EV_USE_EVENTFD
1001 if (evfd >= 0)
1002 {
1003 uint64_t counter;
1004 read (evfd, &counter, sizeof (uint64_t));
1005 }
1006 else
1007#endif
1008 {
1009 char dummy;
1010 read (evpipe [0], &dummy, 1);
1011 }
1012
1013 if (gotsig && ev_is_default_loop (EV_A))
1014 {
1015 int signum;
1016 gotsig = 0;
1017
1018 for (signum = signalmax; signum--; )
1019 if (signals [signum].gotsig)
1020 ev_feed_signal_event (EV_A_ signum + 1);
1021 }
1022
1023#if EV_ASYNC_ENABLE
1024 if (gotasync)
1025 {
1026 int i;
1027 gotasync = 0;
1028
1029 for (i = asynccnt; i--; )
1030 if (asyncs [i]->sent)
1031 {
1032 asyncs [i]->sent = 0;
1033 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1034 }
1035 }
1036#endif
794} 1037}
795 1038
796/*****************************************************************************/ 1039/*****************************************************************************/
797 1040
1041static void
1042ev_sighandler (int signum)
1043{
1044#if EV_MULTIPLICITY
1045 struct ev_loop *loop = &default_loop_struct;
1046#endif
1047
1048#if _WIN32
1049 signal (signum, ev_sighandler);
1050#endif
1051
1052 signals [signum - 1].gotsig = 1;
1053 evpipe_write (EV_A_ &gotsig);
1054}
1055
1056void noinline
1057ev_feed_signal_event (EV_P_ int signum)
1058{
1059 WL w;
1060
1061#if EV_MULTIPLICITY
1062 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1063#endif
1064
1065 --signum;
1066
1067 if (signum < 0 || signum >= signalmax)
1068 return;
1069
1070 signals [signum].gotsig = 0;
1071
1072 for (w = signals [signum].head; w; w = w->next)
1073 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1074}
1075
1076/*****************************************************************************/
1077
798static WL childs [EV_PID_HASHSIZE]; 1078static WL childs [EV_PID_HASHSIZE];
799 1079
800#ifndef _WIN32 1080#ifndef _WIN32
801 1081
802static ev_signal childev; 1082static ev_signal childev;
803 1083
1084#ifndef WIFCONTINUED
1085# define WIFCONTINUED(status) 0
1086#endif
1087
804void inline_speed 1088void inline_speed
805child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1089child_reap (EV_P_ int chain, int pid, int status)
806{ 1090{
807 ev_child *w; 1091 ev_child *w;
1092 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
808 1093
809 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1094 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1095 {
810 if (w->pid == pid || !w->pid) 1096 if ((w->pid == pid || !w->pid)
1097 && (!traced || (w->flags & 1)))
811 { 1098 {
812 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1099 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
813 w->rpid = pid; 1100 w->rpid = pid;
814 w->rstatus = status; 1101 w->rstatus = status;
815 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1102 ev_feed_event (EV_A_ (W)w, EV_CHILD);
816 } 1103 }
1104 }
817} 1105}
818 1106
819#ifndef WCONTINUED 1107#ifndef WCONTINUED
820# define WCONTINUED 0 1108# define WCONTINUED 0
821#endif 1109#endif
830 if (!WCONTINUED 1118 if (!WCONTINUED
831 || errno != EINVAL 1119 || errno != EINVAL
832 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1120 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
833 return; 1121 return;
834 1122
835 /* make sure we are called again until all childs have been reaped */ 1123 /* make sure we are called again until all children have been reaped */
836 /* we need to do it this way so that the callback gets called before we continue */ 1124 /* we need to do it this way so that the callback gets called before we continue */
837 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1125 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
838 1126
839 child_reap (EV_A_ sw, pid, pid, status); 1127 child_reap (EV_A_ pid, pid, status);
840 if (EV_PID_HASHSIZE > 1) 1128 if (EV_PID_HASHSIZE > 1)
841 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1129 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
842} 1130}
843 1131
844#endif 1132#endif
845 1133
846/*****************************************************************************/ 1134/*****************************************************************************/
918} 1206}
919 1207
920unsigned int 1208unsigned int
921ev_embeddable_backends (void) 1209ev_embeddable_backends (void)
922{ 1210{
923 return EVBACKEND_EPOLL 1211 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
924 | EVBACKEND_KQUEUE 1212
925 | EVBACKEND_PORT; 1213 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1214 /* please fix it and tell me how to detect the fix */
1215 flags &= ~EVBACKEND_EPOLL;
1216
1217 return flags;
926} 1218}
927 1219
928unsigned int 1220unsigned int
929ev_backend (EV_P) 1221ev_backend (EV_P)
930{ 1222{
933 1225
934unsigned int 1226unsigned int
935ev_loop_count (EV_P) 1227ev_loop_count (EV_P)
936{ 1228{
937 return loop_count; 1229 return loop_count;
1230}
1231
1232void
1233ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1234{
1235 io_blocktime = interval;
1236}
1237
1238void
1239ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1240{
1241 timeout_blocktime = interval;
938} 1242}
939 1243
940static void noinline 1244static void noinline
941loop_init (EV_P_ unsigned int flags) 1245loop_init (EV_P_ unsigned int flags)
942{ 1246{
948 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1252 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
949 have_monotonic = 1; 1253 have_monotonic = 1;
950 } 1254 }
951#endif 1255#endif
952 1256
953 ev_rt_now = ev_time (); 1257 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1258 mn_now = get_clock ();
955 now_floor = mn_now; 1259 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1260 rtmn_diff = ev_rt_now - mn_now;
1261
1262 io_blocktime = 0.;
1263 timeout_blocktime = 0.;
1264 backend = 0;
1265 backend_fd = -1;
1266 gotasync = 0;
1267#if EV_USE_INOTIFY
1268 fs_fd = -2;
1269#endif
957 1270
958 /* pid check not overridable via env */ 1271 /* pid check not overridable via env */
959#ifndef _WIN32 1272#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1273 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1274 curpid = getpid ();
964 if (!(flags & EVFLAG_NOENV) 1277 if (!(flags & EVFLAG_NOENV)
965 && !enable_secure () 1278 && !enable_secure ()
966 && getenv ("LIBEV_FLAGS")) 1279 && getenv ("LIBEV_FLAGS"))
967 flags = atoi (getenv ("LIBEV_FLAGS")); 1280 flags = atoi (getenv ("LIBEV_FLAGS"));
968 1281
969 if (!(flags & 0x0000ffffUL)) 1282 if (!(flags & 0x0000ffffU))
970 flags |= ev_recommended_backends (); 1283 flags |= ev_recommended_backends ();
971
972 backend = 0;
973 backend_fd = -1;
974#if EV_USE_INOTIFY
975 fs_fd = -2;
976#endif
977 1284
978#if EV_USE_PORT 1285#if EV_USE_PORT
979 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1286 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
980#endif 1287#endif
981#if EV_USE_KQUEUE 1288#if EV_USE_KQUEUE
989#endif 1296#endif
990#if EV_USE_SELECT 1297#if EV_USE_SELECT
991 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1298 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
992#endif 1299#endif
993 1300
994 ev_init (&sigev, sigcb); 1301 ev_init (&pipeev, pipecb);
995 ev_set_priority (&sigev, EV_MAXPRI); 1302 ev_set_priority (&pipeev, EV_MAXPRI);
996 } 1303 }
997} 1304}
998 1305
999static void noinline 1306static void noinline
1000loop_destroy (EV_P) 1307loop_destroy (EV_P)
1001{ 1308{
1002 int i; 1309 int i;
1310
1311 if (ev_is_active (&pipeev))
1312 {
1313 ev_ref (EV_A); /* signal watcher */
1314 ev_io_stop (EV_A_ &pipeev);
1315
1316#if EV_USE_EVENTFD
1317 if (evfd >= 0)
1318 close (evfd);
1319#endif
1320
1321 if (evpipe [0] >= 0)
1322 {
1323 close (evpipe [0]);
1324 close (evpipe [1]);
1325 }
1326 }
1003 1327
1004#if EV_USE_INOTIFY 1328#if EV_USE_INOTIFY
1005 if (fs_fd >= 0) 1329 if (fs_fd >= 0)
1006 close (fs_fd); 1330 close (fs_fd);
1007#endif 1331#endif
1030 array_free (pending, [i]); 1354 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1355#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1356 array_free (idle, [i]);
1033#endif 1357#endif
1034 } 1358 }
1359
1360 ev_free (anfds); anfdmax = 0;
1035 1361
1036 /* have to use the microsoft-never-gets-it-right macro */ 1362 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1363 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1364 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1365#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1366 array_free (periodic, EMPTY);
1041#endif 1367#endif
1368#if EV_FORK_ENABLE
1369 array_free (fork, EMPTY);
1370#endif
1042 array_free (prepare, EMPTY); 1371 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1372 array_free (check, EMPTY);
1373#if EV_ASYNC_ENABLE
1374 array_free (async, EMPTY);
1375#endif
1044 1376
1045 backend = 0; 1377 backend = 0;
1046} 1378}
1047 1379
1380#if EV_USE_INOTIFY
1048void inline_size infy_fork (EV_P); 1381void inline_size infy_fork (EV_P);
1382#endif
1049 1383
1050void inline_size 1384void inline_size
1051loop_fork (EV_P) 1385loop_fork (EV_P)
1052{ 1386{
1053#if EV_USE_PORT 1387#if EV_USE_PORT
1061#endif 1395#endif
1062#if EV_USE_INOTIFY 1396#if EV_USE_INOTIFY
1063 infy_fork (EV_A); 1397 infy_fork (EV_A);
1064#endif 1398#endif
1065 1399
1066 if (ev_is_active (&sigev)) 1400 if (ev_is_active (&pipeev))
1067 { 1401 {
1068 /* default loop */ 1402 /* this "locks" the handlers against writing to the pipe */
1403 /* while we modify the fd vars */
1404 gotsig = 1;
1405#if EV_ASYNC_ENABLE
1406 gotasync = 1;
1407#endif
1069 1408
1070 ev_ref (EV_A); 1409 ev_ref (EV_A);
1071 ev_io_stop (EV_A_ &sigev); 1410 ev_io_stop (EV_A_ &pipeev);
1411
1412#if EV_USE_EVENTFD
1413 if (evfd >= 0)
1414 close (evfd);
1415#endif
1416
1417 if (evpipe [0] >= 0)
1418 {
1072 close (sigpipe [0]); 1419 close (evpipe [0]);
1073 close (sigpipe [1]); 1420 close (evpipe [1]);
1421 }
1074 1422
1075 while (pipe (sigpipe))
1076 syserr ("(libev) error creating pipe");
1077
1078 siginit (EV_A); 1423 evpipe_init (EV_A);
1424 /* now iterate over everything, in case we missed something */
1425 pipecb (EV_A_ &pipeev, EV_READ);
1079 } 1426 }
1080 1427
1081 postfork = 0; 1428 postfork = 0;
1082} 1429}
1083 1430
1105} 1452}
1106 1453
1107void 1454void
1108ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
1109{ 1456{
1110 postfork = 1; 1457 postfork = 1; /* must be in line with ev_default_fork */
1111} 1458}
1112
1113#endif 1459#endif
1114 1460
1115#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1116struct ev_loop * 1462struct ev_loop *
1117ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
1118#else 1464#else
1119int 1465int
1120ev_default_loop (unsigned int flags) 1466ev_default_loop (unsigned int flags)
1121#endif 1467#endif
1122{ 1468{
1123 if (sigpipe [0] == sigpipe [1])
1124 if (pipe (sigpipe))
1125 return 0;
1126
1127 if (!ev_default_loop_ptr) 1469 if (!ev_default_loop_ptr)
1128 { 1470 {
1129#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1130 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1472 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1131#else 1473#else
1134 1476
1135 loop_init (EV_A_ flags); 1477 loop_init (EV_A_ flags);
1136 1478
1137 if (ev_backend (EV_A)) 1479 if (ev_backend (EV_A))
1138 { 1480 {
1139 siginit (EV_A);
1140
1141#ifndef _WIN32 1481#ifndef _WIN32
1142 ev_signal_init (&childev, childcb, SIGCHLD); 1482 ev_signal_init (&childev, childcb, SIGCHLD);
1143 ev_set_priority (&childev, EV_MAXPRI); 1483 ev_set_priority (&childev, EV_MAXPRI);
1144 ev_signal_start (EV_A_ &childev); 1484 ev_signal_start (EV_A_ &childev);
1145 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1485 ev_unref (EV_A); /* child watcher should not keep loop alive */
1162#ifndef _WIN32 1502#ifndef _WIN32
1163 ev_ref (EV_A); /* child watcher */ 1503 ev_ref (EV_A); /* child watcher */
1164 ev_signal_stop (EV_A_ &childev); 1504 ev_signal_stop (EV_A_ &childev);
1165#endif 1505#endif
1166 1506
1167 ev_ref (EV_A); /* signal watcher */
1168 ev_io_stop (EV_A_ &sigev);
1169
1170 close (sigpipe [0]); sigpipe [0] = 0;
1171 close (sigpipe [1]); sigpipe [1] = 0;
1172
1173 loop_destroy (EV_A); 1507 loop_destroy (EV_A);
1174} 1508}
1175 1509
1176void 1510void
1177ev_default_fork (void) 1511ev_default_fork (void)
1179#if EV_MULTIPLICITY 1513#if EV_MULTIPLICITY
1180 struct ev_loop *loop = ev_default_loop_ptr; 1514 struct ev_loop *loop = ev_default_loop_ptr;
1181#endif 1515#endif
1182 1516
1183 if (backend) 1517 if (backend)
1184 postfork = 1; 1518 postfork = 1; /* must be in line with ev_loop_fork */
1185} 1519}
1186 1520
1187/*****************************************************************************/ 1521/*****************************************************************************/
1188 1522
1189void 1523void
1209 p->w->pending = 0; 1543 p->w->pending = 0;
1210 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1211 } 1545 }
1212 } 1546 }
1213} 1547}
1214
1215void inline_size
1216timers_reify (EV_P)
1217{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 {
1220 ev_timer *w = (ev_timer *)timers [0];
1221
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223
1224 /* first reschedule or stop timer */
1225 if (w->repeat)
1226 {
1227 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1228
1229 ((WT)w)->at += w->repeat;
1230 if (((WT)w)->at < mn_now)
1231 ((WT)w)->at = mn_now;
1232
1233 downheap (timers, timercnt, 0);
1234 }
1235 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1239 }
1240}
1241
1242#if EV_PERIODIC_ENABLE
1243void inline_size
1244periodics_reify (EV_P)
1245{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1247 {
1248 ev_periodic *w = (ev_periodic *)periodics [0];
1249
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251
1252 /* first reschedule or stop timer */
1253 if (w->reschedule_cb)
1254 {
1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1256 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1257 downheap (periodics, periodiccnt, 0);
1258 }
1259 else if (w->interval)
1260 {
1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1262 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1263 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1264 downheap (periodics, periodiccnt, 0);
1265 }
1266 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1270 }
1271}
1272
1273static void noinline
1274periodics_reschedule (EV_P)
1275{
1276 int i;
1277
1278 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i)
1280 {
1281 ev_periodic *w = (ev_periodic *)periodics [i];
1282
1283 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval)
1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1287 }
1288
1289 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; )
1291 downheap (periodics, periodiccnt, i);
1292}
1293#endif
1294 1548
1295#if EV_IDLE_ENABLE 1549#if EV_IDLE_ENABLE
1296void inline_size 1550void inline_size
1297idle_reify (EV_P) 1551idle_reify (EV_P)
1298{ 1552{
1310 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1311 break; 1565 break;
1312 } 1566 }
1313 } 1567 }
1314 } 1568 }
1569}
1570#endif
1571
1572void inline_size
1573timers_reify (EV_P)
1574{
1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1576 {
1577 ev_timer *w = (ev_timer *)timers [HEAP0];
1578
1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1580
1581 /* first reschedule or stop timer */
1582 if (w->repeat)
1583 {
1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1585
1586 ev_at (w) += w->repeat;
1587 if (ev_at (w) < mn_now)
1588 ev_at (w) = mn_now;
1589
1590 downheap (timers, timercnt, HEAP0);
1591 }
1592 else
1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1594
1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1596 }
1597}
1598
1599#if EV_PERIODIC_ENABLE
1600void inline_size
1601periodics_reify (EV_P)
1602{
1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1604 {
1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1606
1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1608
1609 /* first reschedule or stop timer */
1610 if (w->reschedule_cb)
1611 {
1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1613 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1614 downheap (periodics, periodiccnt, 1);
1615 }
1616 else if (w->interval)
1617 {
1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1621 downheap (periodics, periodiccnt, HEAP0);
1622 }
1623 else
1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1625
1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1627 }
1628}
1629
1630static void noinline
1631periodics_reschedule (EV_P)
1632{
1633 int i;
1634
1635 /* adjust periodics after time jump */
1636 for (i = 1; i <= periodiccnt; ++i)
1637 {
1638 ev_periodic *w = (ev_periodic *)periodics [i];
1639
1640 if (w->reschedule_cb)
1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1642 else if (w->interval)
1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1644 }
1645
1646 /* now rebuild the heap */
1647 for (i = periodiccnt >> 1; --i; )
1648 downheap (periodics, periodiccnt, i + HEAP0);
1315} 1649}
1316#endif 1650#endif
1317 1651
1318void inline_speed 1652void inline_speed
1319time_update (EV_P_ ev_tstamp max_block) 1653time_update (EV_P_ ev_tstamp max_block)
1348 */ 1682 */
1349 for (i = 4; --i; ) 1683 for (i = 4; --i; )
1350 { 1684 {
1351 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1352 1686
1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1354 return; /* all is well */ 1688 return; /* all is well */
1355 1689
1356 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1357 mn_now = get_clock (); 1691 mn_now = get_clock ();
1358 now_floor = mn_now; 1692 now_floor = mn_now;
1373 { 1707 {
1374#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1375 periodics_reschedule (EV_A); 1709 periodics_reschedule (EV_A);
1376#endif 1710#endif
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1711 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1712 for (i = 1; i <= timercnt; ++i)
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1713 ev_at (timers [i]) += ev_rt_now - mn_now;
1380 } 1714 }
1381 1715
1382 mn_now = ev_rt_now; 1716 mn_now = ev_rt_now;
1383 } 1717 }
1384} 1718}
1398static int loop_done; 1732static int loop_done;
1399 1733
1400void 1734void
1401ev_loop (EV_P_ int flags) 1735ev_loop (EV_P_ int flags)
1402{ 1736{
1403 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1737 loop_done = EVUNLOOP_CANCEL;
1404 ? EVUNLOOP_ONE
1405 : EVUNLOOP_CANCEL;
1406 1738
1407 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1739 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1408 1740
1409 do 1741 do
1410 { 1742 {
1444 /* update fd-related kernel structures */ 1776 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1777 fd_reify (EV_A);
1446 1778
1447 /* calculate blocking time */ 1779 /* calculate blocking time */
1448 { 1780 {
1449 ev_tstamp block; 1781 ev_tstamp waittime = 0.;
1782 ev_tstamp sleeptime = 0.;
1450 1783
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1784 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1785 {
1455 /* update time to cancel out callback processing overhead */ 1786 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1787 time_update (EV_A_ 1e100);
1457 1788
1458 block = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1459 1790
1460 if (timercnt) 1791 if (timercnt)
1461 { 1792 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1463 if (block > to) block = to; 1794 if (waittime > to) waittime = to;
1464 } 1795 }
1465 1796
1466#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1798 if (periodiccnt)
1468 { 1799 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1801 if (waittime > to) waittime = to;
1471 } 1802 }
1472#endif 1803#endif
1473 1804
1474 if (expect_false (block < 0.)) block = 0.; 1805 if (expect_false (waittime < timeout_blocktime))
1806 waittime = timeout_blocktime;
1807
1808 sleeptime = waittime - backend_fudge;
1809
1810 if (expect_true (sleeptime > io_blocktime))
1811 sleeptime = io_blocktime;
1812
1813 if (sleeptime)
1814 {
1815 ev_sleep (sleeptime);
1816 waittime -= sleeptime;
1817 }
1475 } 1818 }
1476 1819
1477 ++loop_count; 1820 ++loop_count;
1478 backend_poll (EV_A_ block); 1821 backend_poll (EV_A_ waittime);
1479 1822
1480 /* update ev_rt_now, do magic */ 1823 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1824 time_update (EV_A_ waittime + sleeptime);
1482 } 1825 }
1483 1826
1484 /* queue pending timers and reschedule them */ 1827 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1828 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1829#if EV_PERIODIC_ENABLE
1495 /* queue check watchers, to be executed first */ 1838 /* queue check watchers, to be executed first */
1496 if (expect_false (checkcnt)) 1839 if (expect_false (checkcnt))
1497 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1840 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1498 1841
1499 call_pending (EV_A); 1842 call_pending (EV_A);
1500
1501 } 1843 }
1502 while (expect_true (activecnt && !loop_done)); 1844 while (expect_true (
1845 activecnt
1846 && !loop_done
1847 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1848 ));
1503 1849
1504 if (loop_done == EVUNLOOP_ONE) 1850 if (loop_done == EVUNLOOP_ONE)
1505 loop_done = EVUNLOOP_CANCEL; 1851 loop_done = EVUNLOOP_CANCEL;
1506} 1852}
1507 1853
1600 1946
1601 ev_start (EV_A_ (W)w, 1); 1947 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1948 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add (&anfds[fd].head, (WL)w); 1949 wlist_add (&anfds[fd].head, (WL)w);
1604 1950
1605 fd_change (EV_A_ fd, w->events & EV_IOFDSET); 1951 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1606 w->events &= ~ EV_IOFDSET; 1952 w->events &= ~EV_IOFDSET;
1607} 1953}
1608 1954
1609void noinline 1955void noinline
1610ev_io_stop (EV_P_ ev_io *w) 1956ev_io_stop (EV_P_ ev_io *w)
1611{ 1957{
1616 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1962 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1617 1963
1618 wlist_del (&anfds[w->fd].head, (WL)w); 1964 wlist_del (&anfds[w->fd].head, (WL)w);
1619 ev_stop (EV_A_ (W)w); 1965 ev_stop (EV_A_ (W)w);
1620 1966
1621 fd_change (EV_A_ w->fd, 0); 1967 fd_change (EV_A_ w->fd, 1);
1622} 1968}
1623 1969
1624void noinline 1970void noinline
1625ev_timer_start (EV_P_ ev_timer *w) 1971ev_timer_start (EV_P_ ev_timer *w)
1626{ 1972{
1627 if (expect_false (ev_is_active (w))) 1973 if (expect_false (ev_is_active (w)))
1628 return; 1974 return;
1629 1975
1630 ((WT)w)->at += mn_now; 1976 ev_at (w) += mn_now;
1631 1977
1632 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1978 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1633 1979
1634 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1635 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1636 timers [timercnt - 1] = (WT)w; 1982 timers [ev_active (w)] = (WT)w;
1637 upheap (timers, timercnt - 1); 1983 upheap (timers, ev_active (w));
1638 1984
1639 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1640} 1986}
1641 1987
1642void noinline 1988void noinline
1643ev_timer_stop (EV_P_ ev_timer *w) 1989ev_timer_stop (EV_P_ ev_timer *w)
1644{ 1990{
1645 clear_pending (EV_A_ (W)w); 1991 clear_pending (EV_A_ (W)w);
1646 if (expect_false (!ev_is_active (w))) 1992 if (expect_false (!ev_is_active (w)))
1647 return; 1993 return;
1648 1994
1649 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1650
1651 { 1995 {
1652 int active = ((W)w)->active; 1996 int active = ev_active (w);
1653 1997
1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1999
1654 if (expect_true (--active < --timercnt)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1655 { 2001 {
1656 timers [active] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1657 adjustheap (timers, timercnt, active); 2003 adjustheap (timers, timercnt, active);
1658 } 2004 }
2005
2006 --timercnt;
1659 } 2007 }
1660 2008
1661 ((WT)w)->at -= mn_now; 2009 ev_at (w) -= mn_now;
1662 2010
1663 ev_stop (EV_A_ (W)w); 2011 ev_stop (EV_A_ (W)w);
1664} 2012}
1665 2013
1666void noinline 2014void noinline
1668{ 2016{
1669 if (ev_is_active (w)) 2017 if (ev_is_active (w))
1670 { 2018 {
1671 if (w->repeat) 2019 if (w->repeat)
1672 { 2020 {
1673 ((WT)w)->at = mn_now + w->repeat; 2021 ev_at (w) = mn_now + w->repeat;
1674 adjustheap (timers, timercnt, ((W)w)->active - 1); 2022 adjustheap (timers, timercnt, ev_active (w));
1675 } 2023 }
1676 else 2024 else
1677 ev_timer_stop (EV_A_ w); 2025 ev_timer_stop (EV_A_ w);
1678 } 2026 }
1679 else if (w->repeat) 2027 else if (w->repeat)
1680 { 2028 {
1681 w->at = w->repeat; 2029 ev_at (w) = w->repeat;
1682 ev_timer_start (EV_A_ w); 2030 ev_timer_start (EV_A_ w);
1683 } 2031 }
1684} 2032}
1685 2033
1686#if EV_PERIODIC_ENABLE 2034#if EV_PERIODIC_ENABLE
1689{ 2037{
1690 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1691 return; 2039 return;
1692 2040
1693 if (w->reschedule_cb) 2041 if (w->reschedule_cb)
1694 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2042 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1695 else if (w->interval) 2043 else if (w->interval)
1696 { 2044 {
1697 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2045 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1698 /* this formula differs from the one in periodic_reify because we do not always round up */ 2046 /* this formula differs from the one in periodic_reify because we do not always round up */
1699 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2047 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1700 } 2048 }
1701 else 2049 else
1702 ((WT)w)->at = w->offset; 2050 ev_at (w) = w->offset;
1703 2051
1704 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1705 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1706 periodics [periodiccnt - 1] = (WT)w; 2054 periodics [ev_active (w)] = (WT)w;
1707 upheap (periodics, periodiccnt - 1); 2055 upheap (periodics, ev_active (w));
1708 2056
1709 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1710} 2058}
1711 2059
1712void noinline 2060void noinline
1713ev_periodic_stop (EV_P_ ev_periodic *w) 2061ev_periodic_stop (EV_P_ ev_periodic *w)
1714{ 2062{
1715 clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1716 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1717 return; 2065 return;
1718 2066
1719 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1720
1721 { 2067 {
1722 int active = ((W)w)->active; 2068 int active = ev_active (w);
1723 2069
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2071
1724 if (expect_true (--active < --periodiccnt)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1725 { 2073 {
1726 periodics [active] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1727 adjustheap (periodics, periodiccnt, active); 2075 adjustheap (periodics, periodiccnt, active);
1728 } 2076 }
2077
2078 --periodiccnt;
1729 } 2079 }
1730 2080
1731 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1732} 2082}
1733 2083
1752#endif 2102#endif
1753 if (expect_false (ev_is_active (w))) 2103 if (expect_false (ev_is_active (w)))
1754 return; 2104 return;
1755 2105
1756 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2106 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2107
2108 evpipe_init (EV_A);
1757 2109
1758 { 2110 {
1759#ifndef _WIN32 2111#ifndef _WIN32
1760 sigset_t full, prev; 2112 sigset_t full, prev;
1761 sigfillset (&full); 2113 sigfillset (&full);
1773 wlist_add (&signals [w->signum - 1].head, (WL)w); 2125 wlist_add (&signals [w->signum - 1].head, (WL)w);
1774 2126
1775 if (!((WL)w)->next) 2127 if (!((WL)w)->next)
1776 { 2128 {
1777#if _WIN32 2129#if _WIN32
1778 signal (w->signum, sighandler); 2130 signal (w->signum, ev_sighandler);
1779#else 2131#else
1780 struct sigaction sa; 2132 struct sigaction sa;
1781 sa.sa_handler = sighandler; 2133 sa.sa_handler = ev_sighandler;
1782 sigfillset (&sa.sa_mask); 2134 sigfillset (&sa.sa_mask);
1783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2135 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1784 sigaction (w->signum, &sa, 0); 2136 sigaction (w->signum, &sa, 0);
1785#endif 2137#endif
1786 } 2138 }
1847 if (w->wd < 0) 2199 if (w->wd < 0)
1848 { 2200 {
1849 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2201 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1850 2202
1851 /* monitor some parent directory for speedup hints */ 2203 /* monitor some parent directory for speedup hints */
2204 /* note that exceeding the hardcoded limit is not a correctness issue, */
2205 /* but an efficiency issue only */
1852 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1853 { 2207 {
1854 char path [4096]; 2208 char path [4096];
1855 strcpy (path, w->path); 2209 strcpy (path, w->path);
1856 2210
2101 clear_pending (EV_A_ (W)w); 2455 clear_pending (EV_A_ (W)w);
2102 if (expect_false (!ev_is_active (w))) 2456 if (expect_false (!ev_is_active (w)))
2103 return; 2457 return;
2104 2458
2105 { 2459 {
2106 int active = ((W)w)->active; 2460 int active = ev_active (w);
2107 2461
2108 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2109 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2463 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2110 2464
2111 ev_stop (EV_A_ (W)w); 2465 ev_stop (EV_A_ (W)w);
2112 --idleall; 2466 --idleall;
2113 } 2467 }
2114} 2468}
2131 clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2132 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2133 return; 2487 return;
2134 2488
2135 { 2489 {
2136 int active = ((W)w)->active; 2490 int active = ev_active (w);
2491
2137 prepares [active - 1] = prepares [--preparecnt]; 2492 prepares [active - 1] = prepares [--preparecnt];
2138 ((W)prepares [active - 1])->active = active; 2493 ev_active (prepares [active - 1]) = active;
2139 } 2494 }
2140 2495
2141 ev_stop (EV_A_ (W)w); 2496 ev_stop (EV_A_ (W)w);
2142} 2497}
2143 2498
2158 clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2159 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2160 return; 2515 return;
2161 2516
2162 { 2517 {
2163 int active = ((W)w)->active; 2518 int active = ev_active (w);
2519
2164 checks [active - 1] = checks [--checkcnt]; 2520 checks [active - 1] = checks [--checkcnt];
2165 ((W)checks [active - 1])->active = active; 2521 ev_active (checks [active - 1]) = active;
2166 } 2522 }
2167 2523
2168 ev_stop (EV_A_ (W)w); 2524 ev_stop (EV_A_ (W)w);
2169} 2525}
2170 2526
2171#if EV_EMBED_ENABLE 2527#if EV_EMBED_ENABLE
2172void noinline 2528void noinline
2173ev_embed_sweep (EV_P_ ev_embed *w) 2529ev_embed_sweep (EV_P_ ev_embed *w)
2174{ 2530{
2175 ev_loop (w->loop, EVLOOP_NONBLOCK); 2531 ev_loop (w->other, EVLOOP_NONBLOCK);
2176} 2532}
2177 2533
2178static void 2534static void
2179embed_cb (EV_P_ ev_io *io, int revents) 2535embed_io_cb (EV_P_ ev_io *io, int revents)
2180{ 2536{
2181 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2537 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2182 2538
2183 if (ev_cb (w)) 2539 if (ev_cb (w))
2184 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2540 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2185 else 2541 else
2186 ev_embed_sweep (loop, w); 2542 ev_loop (w->other, EVLOOP_NONBLOCK);
2187} 2543}
2544
2545static void
2546embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2547{
2548 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2549
2550 {
2551 struct ev_loop *loop = w->other;
2552
2553 while (fdchangecnt)
2554 {
2555 fd_reify (EV_A);
2556 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2557 }
2558 }
2559}
2560
2561#if 0
2562static void
2563embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2564{
2565 ev_idle_stop (EV_A_ idle);
2566}
2567#endif
2188 2568
2189void 2569void
2190ev_embed_start (EV_P_ ev_embed *w) 2570ev_embed_start (EV_P_ ev_embed *w)
2191{ 2571{
2192 if (expect_false (ev_is_active (w))) 2572 if (expect_false (ev_is_active (w)))
2193 return; 2573 return;
2194 2574
2195 { 2575 {
2196 struct ev_loop *loop = w->loop; 2576 struct ev_loop *loop = w->other;
2197 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2577 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2198 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2578 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2199 } 2579 }
2200 2580
2201 ev_set_priority (&w->io, ev_priority (w)); 2581 ev_set_priority (&w->io, ev_priority (w));
2202 ev_io_start (EV_A_ &w->io); 2582 ev_io_start (EV_A_ &w->io);
2583
2584 ev_prepare_init (&w->prepare, embed_prepare_cb);
2585 ev_set_priority (&w->prepare, EV_MINPRI);
2586 ev_prepare_start (EV_A_ &w->prepare);
2587
2588 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2203 2589
2204 ev_start (EV_A_ (W)w, 1); 2590 ev_start (EV_A_ (W)w, 1);
2205} 2591}
2206 2592
2207void 2593void
2210 clear_pending (EV_A_ (W)w); 2596 clear_pending (EV_A_ (W)w);
2211 if (expect_false (!ev_is_active (w))) 2597 if (expect_false (!ev_is_active (w)))
2212 return; 2598 return;
2213 2599
2214 ev_io_stop (EV_A_ &w->io); 2600 ev_io_stop (EV_A_ &w->io);
2601 ev_prepare_stop (EV_A_ &w->prepare);
2215 2602
2216 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2217} 2604}
2218#endif 2605#endif
2219 2606
2235 clear_pending (EV_A_ (W)w); 2622 clear_pending (EV_A_ (W)w);
2236 if (expect_false (!ev_is_active (w))) 2623 if (expect_false (!ev_is_active (w)))
2237 return; 2624 return;
2238 2625
2239 { 2626 {
2240 int active = ((W)w)->active; 2627 int active = ev_active (w);
2628
2241 forks [active - 1] = forks [--forkcnt]; 2629 forks [active - 1] = forks [--forkcnt];
2242 ((W)forks [active - 1])->active = active; 2630 ev_active (forks [active - 1]) = active;
2243 } 2631 }
2244 2632
2245 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2634}
2635#endif
2636
2637#if EV_ASYNC_ENABLE
2638void
2639ev_async_start (EV_P_ ev_async *w)
2640{
2641 if (expect_false (ev_is_active (w)))
2642 return;
2643
2644 evpipe_init (EV_A);
2645
2646 ev_start (EV_A_ (W)w, ++asynccnt);
2647 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2648 asyncs [asynccnt - 1] = w;
2649}
2650
2651void
2652ev_async_stop (EV_P_ ev_async *w)
2653{
2654 clear_pending (EV_A_ (W)w);
2655 if (expect_false (!ev_is_active (w)))
2656 return;
2657
2658 {
2659 int active = ev_active (w);
2660
2661 asyncs [active - 1] = asyncs [--asynccnt];
2662 ev_active (asyncs [active - 1]) = active;
2663 }
2664
2665 ev_stop (EV_A_ (W)w);
2666}
2667
2668void
2669ev_async_send (EV_P_ ev_async *w)
2670{
2671 w->sent = 1;
2672 evpipe_write (EV_A_ &gotasync);
2246} 2673}
2247#endif 2674#endif
2248 2675
2249/*****************************************************************************/ 2676/*****************************************************************************/
2250 2677
2308 ev_timer_set (&once->to, timeout, 0.); 2735 ev_timer_set (&once->to, timeout, 0.);
2309 ev_timer_start (EV_A_ &once->to); 2736 ev_timer_start (EV_A_ &once->to);
2310 } 2737 }
2311} 2738}
2312 2739
2740#if EV_MULTIPLICITY
2741 #include "ev_wrap.h"
2742#endif
2743
2313#ifdef __cplusplus 2744#ifdef __cplusplus
2314} 2745}
2315#endif 2746#endif
2316 2747

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines