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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines