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.241 by root, Fri May 9 13:57:00 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 ();
336 W w; 422 W w;
337 int events; 423 int events;
338} ANPENDING; 424} ANPENDING;
339 425
340#if EV_USE_INOTIFY 426#if EV_USE_INOTIFY
427/* hash table entry per inotify-id */
341typedef struct 428typedef struct
342{ 429{
343 WL head; 430 WL head;
344} ANFS; 431} ANFS;
432#endif
433
434/* Heap Entry */
435#if EV_HEAP_CACHE_AT
436 typedef struct {
437 WT w;
438 ev_tstamp at;
439 } ANHE;
440
441 #define ANHE_w(he) (he) /* access watcher, read-write */
442 #define ANHE_at(he) (he)->at /* acces cahced at, read-only */
443 #define ANHE_at_set(he) (he)->at = (he)->w->at /* update at from watcher */
444#else
445 typedef WT ANHE;
446
447 #define ANHE_w(he) (he)
448 #define ANHE_at(he) (he)->at
449 #define ANHE_at_set(he)
345#endif 450#endif
346 451
347#if EV_MULTIPLICITY 452#if EV_MULTIPLICITY
348 453
349 struct ev_loop 454 struct ev_loop
407{ 512{
408 return ev_rt_now; 513 return ev_rt_now;
409} 514}
410#endif 515#endif
411 516
517void
518ev_sleep (ev_tstamp delay)
519{
520 if (delay > 0.)
521 {
522#if EV_USE_NANOSLEEP
523 struct timespec ts;
524
525 ts.tv_sec = (time_t)delay;
526 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
527
528 nanosleep (&ts, 0);
529#elif defined(_WIN32)
530 Sleep ((unsigned long)(delay * 1e3));
531#else
532 struct timeval tv;
533
534 tv.tv_sec = (time_t)delay;
535 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
536
537 select (0, 0, 0, 0, &tv);
538#endif
539 }
540}
541
542/*****************************************************************************/
543
544#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
545
412int inline_size 546int inline_size
413array_nextsize (int elem, int cur, int cnt) 547array_nextsize (int elem, int cur, int cnt)
414{ 548{
415 int ncur = cur + 1; 549 int ncur = cur + 1;
416 550
417 do 551 do
418 ncur <<= 1; 552 ncur <<= 1;
419 while (cnt > ncur); 553 while (cnt > ncur);
420 554
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 555 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096) 556 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
423 { 557 {
424 ncur *= elem; 558 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 559 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
426 ncur = ncur - sizeof (void *) * 4; 560 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem; 561 ncur /= elem;
428 } 562 }
429 563
430 return ncur; 564 return ncur;
533 { 667 {
534 int fd = fdchanges [i]; 668 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 669 ANFD *anfd = anfds + fd;
536 ev_io *w; 670 ev_io *w;
537 671
538 int events = 0; 672 unsigned char events = 0;
539 673
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 674 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 675 events |= (unsigned char)w->events;
542 676
543#if EV_SELECT_IS_WINSOCKET 677#if EV_SELECT_IS_WINSOCKET
544 if (events) 678 if (events)
545 { 679 {
546 unsigned long argp; 680 unsigned long argp;
681 #ifdef EV_FD_TO_WIN32_HANDLE
682 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
683 #else
547 anfd->handle = _get_osfhandle (fd); 684 anfd->handle = _get_osfhandle (fd);
685 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 686 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 687 }
550#endif 688#endif
551 689
690 {
691 unsigned char o_events = anfd->events;
692 unsigned char o_reify = anfd->reify;
693
552 anfd->reify = 0; 694 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 695 anfd->events = events;
696
697 if (o_events != events || o_reify & EV_IOFDSET)
698 backend_modify (EV_A_ fd, o_events, events);
699 }
556 } 700 }
557 701
558 fdchangecnt = 0; 702 fdchangecnt = 0;
559} 703}
560 704
561void inline_size 705void inline_size
562fd_change (EV_P_ int fd, int flags) 706fd_change (EV_P_ int fd, int flags)
563{ 707{
564 unsigned char reify = anfds [fd].reify; 708 unsigned char reify = anfds [fd].reify;
565 anfds [fd].reify |= flags | 1; 709 anfds [fd].reify |= flags;
566 710
567 if (expect_true (!reify)) 711 if (expect_true (!reify))
568 { 712 {
569 ++fdchangecnt; 713 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 714 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
628 772
629 for (fd = 0; fd < anfdmax; ++fd) 773 for (fd = 0; fd < anfdmax; ++fd)
630 if (anfds [fd].events) 774 if (anfds [fd].events)
631 { 775 {
632 anfds [fd].events = 0; 776 anfds [fd].events = 0;
633 fd_change (EV_A_ fd, EV_IOFDSET); 777 fd_change (EV_A_ fd, EV_IOFDSET | 1);
634 } 778 }
635} 779}
636 780
637/*****************************************************************************/ 781/*****************************************************************************/
638 782
783/*
784 * the heap functions want a real array index. array index 0 uis guaranteed to not
785 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
786 * the branching factor of the d-tree.
787 */
788
789/*
790 * at the moment we allow libev the luxury of two heaps,
791 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
792 * which is more cache-efficient.
793 * the difference is about 5% with 50000+ watchers.
794 */
795#define EV_USE_4HEAP !EV_MINIMAL
796#if EV_USE_4HEAP
797
798#define DHEAP 4
799#define HEAP0 (DHEAP - 1) /* index of first element in heap */
800
801/* towards the root */
639void inline_speed 802void inline_speed
640upheap (WT *heap, int k) 803upheap (ANHE *heap, int k)
641{ 804{
642 WT w = heap [k]; 805 ANHE he = heap [k];
643 806
644 while (k) 807 for (;;)
645 { 808 {
646 int p = (k - 1) >> 1; 809 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
647 810
648 if (heap [p]->at <= w->at) 811 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
649 break; 812 break;
650 813
651 heap [k] = heap [p]; 814 heap [k] = heap [p];
652 ((W)heap [k])->active = k + 1; 815 ev_active (ANHE_w (heap [k])) = k;
653 k = p; 816 k = p;
654 } 817 }
655 818
819 ev_active (ANHE_w (he)) = k;
820 heap [k] = he;
821}
822
823/* away from the root */
824void inline_speed
825downheap (ANHE *heap, int N, int k)
826{
827 ANHE he = heap [k];
828 ANHE *E = heap + N + HEAP0;
829
830 for (;;)
831 {
832 ev_tstamp minat;
833 ANHE *minpos;
834 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
835
836 // find minimum child
837 if (expect_true (pos + DHEAP - 1 < E))
838 {
839 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
840 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
841 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
842 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
843 }
844 else if (pos < E)
845 {
846 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
848 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
849 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 }
851 else
852 break;
853
854 if (ANHE_at (he) <= minat)
855 break;
856
857 ev_active (ANHE_w (*minpos)) = k;
858 heap [k] = *minpos;
859
860 k = minpos - heap;
861 }
862
863 ev_active (ANHE_w (he)) = k;
864 heap [k] = he;
865}
866
867#else // 4HEAP
868
869#define HEAP0 1
870
871/* towards the root */
872void inline_speed
873upheap (ANHE *heap, int k)
874{
875 ANHE he = heap [k];
876
877 for (;;)
878 {
879 int p = k >> 1;
880
881 /* maybe we could use a dummy element at heap [0]? */
882 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
883 break;
884
885 heap [k] = heap [p];
886 ev_active (ANHE_w (heap [k])) = k;
887 k = p;
888 }
889
656 heap [k] = w; 890 heap [k] = w;
657 ((W)heap [k])->active = k + 1; 891 ev_active (ANHE_w (heap [k])) = k;
658} 892}
659 893
894/* away from the root */
660void inline_speed 895void inline_speed
661downheap (WT *heap, int N, int k) 896downheap (ANHE *heap, int N, int k)
662{ 897{
663 WT w = heap [k]; 898 ANHE he = heap [k];
664 899
665 for (;;) 900 for (;;)
666 { 901 {
667 int c = (k << 1) + 1; 902 int c = k << 1;
668 903
669 if (c >= N) 904 if (c > N)
670 break; 905 break;
671 906
672 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 907 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
673 ? 1 : 0; 908 ? 1 : 0;
674 909
675 if (w->at <= heap [c]->at) 910 if (w->at <= ANHE_at (heap [c]))
676 break; 911 break;
677 912
678 heap [k] = heap [c]; 913 heap [k] = heap [c];
679 ((W)heap [k])->active = k + 1; 914 ev_active (ANHE_w (heap [k])) = k;
680 915
681 k = c; 916 k = c;
682 } 917 }
683 918
684 heap [k] = w; 919 heap [k] = he;
685 ((W)heap [k])->active = k + 1; 920 ev_active (ANHE_w (he)) = k;
686} 921}
922#endif
687 923
688void inline_size 924void inline_size
689adjustheap (WT *heap, int N, int k) 925adjustheap (ANHE *heap, int N, int k)
690{ 926{
691 upheap (heap, k); 927 upheap (heap, k);
692 downheap (heap, N, k); 928 downheap (heap, N, k);
693} 929}
694 930
695/*****************************************************************************/ 931/*****************************************************************************/
696 932
697typedef struct 933typedef struct
698{ 934{
699 WL head; 935 WL head;
700 sig_atomic_t volatile gotsig; 936 EV_ATOMIC_T gotsig;
701} ANSIG; 937} ANSIG;
702 938
703static ANSIG *signals; 939static ANSIG *signals;
704static int signalmax; 940static int signalmax;
705 941
706static int sigpipe [2]; 942static EV_ATOMIC_T gotsig;
707static sig_atomic_t volatile gotsig;
708static ev_io sigev;
709 943
710void inline_size 944void inline_size
711signals_init (ANSIG *base, int count) 945signals_init (ANSIG *base, int count)
712{ 946{
713 while (count--) 947 while (count--)
717 951
718 ++base; 952 ++base;
719 } 953 }
720} 954}
721 955
722static void 956/*****************************************************************************/
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 957
773void inline_speed 958void inline_speed
774fd_intern (int fd) 959fd_intern (int fd)
775{ 960{
776#ifdef _WIN32 961#ifdef _WIN32
781 fcntl (fd, F_SETFL, O_NONBLOCK); 966 fcntl (fd, F_SETFL, O_NONBLOCK);
782#endif 967#endif
783} 968}
784 969
785static void noinline 970static void noinline
786siginit (EV_P) 971evpipe_init (EV_P)
787{ 972{
973 if (!ev_is_active (&pipeev))
974 {
975#if EV_USE_EVENTFD
976 if ((evfd = eventfd (0, 0)) >= 0)
977 {
978 evpipe [0] = -1;
979 fd_intern (evfd);
980 ev_io_set (&pipeev, evfd, EV_READ);
981 }
982 else
983#endif
984 {
985 while (pipe (evpipe))
986 syserr ("(libev) error creating signal/async pipe");
987
788 fd_intern (sigpipe [0]); 988 fd_intern (evpipe [0]);
789 fd_intern (sigpipe [1]); 989 fd_intern (evpipe [1]);
990 ev_io_set (&pipeev, evpipe [0], EV_READ);
991 }
790 992
791 ev_io_set (&sigev, sigpipe [0], EV_READ);
792 ev_io_start (EV_A_ &sigev); 993 ev_io_start (EV_A_ &pipeev);
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 994 ev_unref (EV_A); /* watcher should not keep loop alive */
995 }
996}
997
998void inline_size
999evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1000{
1001 if (!*flag)
1002 {
1003 int old_errno = errno; /* save errno because write might clobber it */
1004
1005 *flag = 1;
1006
1007#if EV_USE_EVENTFD
1008 if (evfd >= 0)
1009 {
1010 uint64_t counter = 1;
1011 write (evfd, &counter, sizeof (uint64_t));
1012 }
1013 else
1014#endif
1015 write (evpipe [1], &old_errno, 1);
1016
1017 errno = old_errno;
1018 }
1019}
1020
1021static void
1022pipecb (EV_P_ ev_io *iow, int revents)
1023{
1024#if EV_USE_EVENTFD
1025 if (evfd >= 0)
1026 {
1027 uint64_t counter;
1028 read (evfd, &counter, sizeof (uint64_t));
1029 }
1030 else
1031#endif
1032 {
1033 char dummy;
1034 read (evpipe [0], &dummy, 1);
1035 }
1036
1037 if (gotsig && ev_is_default_loop (EV_A))
1038 {
1039 int signum;
1040 gotsig = 0;
1041
1042 for (signum = signalmax; signum--; )
1043 if (signals [signum].gotsig)
1044 ev_feed_signal_event (EV_A_ signum + 1);
1045 }
1046
1047#if EV_ASYNC_ENABLE
1048 if (gotasync)
1049 {
1050 int i;
1051 gotasync = 0;
1052
1053 for (i = asynccnt; i--; )
1054 if (asyncs [i]->sent)
1055 {
1056 asyncs [i]->sent = 0;
1057 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1058 }
1059 }
1060#endif
794} 1061}
795 1062
796/*****************************************************************************/ 1063/*****************************************************************************/
797 1064
1065static void
1066ev_sighandler (int signum)
1067{
1068#if EV_MULTIPLICITY
1069 struct ev_loop *loop = &default_loop_struct;
1070#endif
1071
1072#if _WIN32
1073 signal (signum, ev_sighandler);
1074#endif
1075
1076 signals [signum - 1].gotsig = 1;
1077 evpipe_write (EV_A_ &gotsig);
1078}
1079
1080void noinline
1081ev_feed_signal_event (EV_P_ int signum)
1082{
1083 WL w;
1084
1085#if EV_MULTIPLICITY
1086 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1087#endif
1088
1089 --signum;
1090
1091 if (signum < 0 || signum >= signalmax)
1092 return;
1093
1094 signals [signum].gotsig = 0;
1095
1096 for (w = signals [signum].head; w; w = w->next)
1097 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1098}
1099
1100/*****************************************************************************/
1101
798static WL childs [EV_PID_HASHSIZE]; 1102static WL childs [EV_PID_HASHSIZE];
799 1103
800#ifndef _WIN32 1104#ifndef _WIN32
801 1105
802static ev_signal childev; 1106static ev_signal childev;
803 1107
1108#ifndef WIFCONTINUED
1109# define WIFCONTINUED(status) 0
1110#endif
1111
804void inline_speed 1112void inline_speed
805child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1113child_reap (EV_P_ int chain, int pid, int status)
806{ 1114{
807 ev_child *w; 1115 ev_child *w;
1116 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
808 1117
809 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1118 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1119 {
810 if (w->pid == pid || !w->pid) 1120 if ((w->pid == pid || !w->pid)
1121 && (!traced || (w->flags & 1)))
811 { 1122 {
812 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1123 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; 1124 w->rpid = pid;
814 w->rstatus = status; 1125 w->rstatus = status;
815 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1126 ev_feed_event (EV_A_ (W)w, EV_CHILD);
816 } 1127 }
1128 }
817} 1129}
818 1130
819#ifndef WCONTINUED 1131#ifndef WCONTINUED
820# define WCONTINUED 0 1132# define WCONTINUED 0
821#endif 1133#endif
830 if (!WCONTINUED 1142 if (!WCONTINUED
831 || errno != EINVAL 1143 || errno != EINVAL
832 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1144 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
833 return; 1145 return;
834 1146
835 /* make sure we are called again until all childs have been reaped */ 1147 /* 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 */ 1148 /* 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); 1149 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
838 1150
839 child_reap (EV_A_ sw, pid, pid, status); 1151 child_reap (EV_A_ pid, pid, status);
840 if (EV_PID_HASHSIZE > 1) 1152 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 */ 1153 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
842} 1154}
843 1155
844#endif 1156#endif
845 1157
846/*****************************************************************************/ 1158/*****************************************************************************/
918} 1230}
919 1231
920unsigned int 1232unsigned int
921ev_embeddable_backends (void) 1233ev_embeddable_backends (void)
922{ 1234{
923 return EVBACKEND_EPOLL 1235 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
924 | EVBACKEND_KQUEUE 1236
925 | EVBACKEND_PORT; 1237 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1238 /* please fix it and tell me how to detect the fix */
1239 flags &= ~EVBACKEND_EPOLL;
1240
1241 return flags;
926} 1242}
927 1243
928unsigned int 1244unsigned int
929ev_backend (EV_P) 1245ev_backend (EV_P)
930{ 1246{
933 1249
934unsigned int 1250unsigned int
935ev_loop_count (EV_P) 1251ev_loop_count (EV_P)
936{ 1252{
937 return loop_count; 1253 return loop_count;
1254}
1255
1256void
1257ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1258{
1259 io_blocktime = interval;
1260}
1261
1262void
1263ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1264{
1265 timeout_blocktime = interval;
938} 1266}
939 1267
940static void noinline 1268static void noinline
941loop_init (EV_P_ unsigned int flags) 1269loop_init (EV_P_ unsigned int flags)
942{ 1270{
948 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1276 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
949 have_monotonic = 1; 1277 have_monotonic = 1;
950 } 1278 }
951#endif 1279#endif
952 1280
953 ev_rt_now = ev_time (); 1281 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1282 mn_now = get_clock ();
955 now_floor = mn_now; 1283 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1284 rtmn_diff = ev_rt_now - mn_now;
1285
1286 io_blocktime = 0.;
1287 timeout_blocktime = 0.;
1288 backend = 0;
1289 backend_fd = -1;
1290 gotasync = 0;
1291#if EV_USE_INOTIFY
1292 fs_fd = -2;
1293#endif
957 1294
958 /* pid check not overridable via env */ 1295 /* pid check not overridable via env */
959#ifndef _WIN32 1296#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1297 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1298 curpid = getpid ();
964 if (!(flags & EVFLAG_NOENV) 1301 if (!(flags & EVFLAG_NOENV)
965 && !enable_secure () 1302 && !enable_secure ()
966 && getenv ("LIBEV_FLAGS")) 1303 && getenv ("LIBEV_FLAGS"))
967 flags = atoi (getenv ("LIBEV_FLAGS")); 1304 flags = atoi (getenv ("LIBEV_FLAGS"));
968 1305
969 if (!(flags & 0x0000ffffUL)) 1306 if (!(flags & 0x0000ffffU))
970 flags |= ev_recommended_backends (); 1307 flags |= ev_recommended_backends ();
971
972 backend = 0;
973 backend_fd = -1;
974#if EV_USE_INOTIFY
975 fs_fd = -2;
976#endif
977 1308
978#if EV_USE_PORT 1309#if EV_USE_PORT
979 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1310 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
980#endif 1311#endif
981#if EV_USE_KQUEUE 1312#if EV_USE_KQUEUE
989#endif 1320#endif
990#if EV_USE_SELECT 1321#if EV_USE_SELECT
991 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1322 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
992#endif 1323#endif
993 1324
994 ev_init (&sigev, sigcb); 1325 ev_init (&pipeev, pipecb);
995 ev_set_priority (&sigev, EV_MAXPRI); 1326 ev_set_priority (&pipeev, EV_MAXPRI);
996 } 1327 }
997} 1328}
998 1329
999static void noinline 1330static void noinline
1000loop_destroy (EV_P) 1331loop_destroy (EV_P)
1001{ 1332{
1002 int i; 1333 int i;
1334
1335 if (ev_is_active (&pipeev))
1336 {
1337 ev_ref (EV_A); /* signal watcher */
1338 ev_io_stop (EV_A_ &pipeev);
1339
1340#if EV_USE_EVENTFD
1341 if (evfd >= 0)
1342 close (evfd);
1343#endif
1344
1345 if (evpipe [0] >= 0)
1346 {
1347 close (evpipe [0]);
1348 close (evpipe [1]);
1349 }
1350 }
1003 1351
1004#if EV_USE_INOTIFY 1352#if EV_USE_INOTIFY
1005 if (fs_fd >= 0) 1353 if (fs_fd >= 0)
1006 close (fs_fd); 1354 close (fs_fd);
1007#endif 1355#endif
1030 array_free (pending, [i]); 1378 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1379#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1380 array_free (idle, [i]);
1033#endif 1381#endif
1034 } 1382 }
1383
1384 ev_free (anfds); anfdmax = 0;
1035 1385
1036 /* have to use the microsoft-never-gets-it-right macro */ 1386 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1387 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1388 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1389#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1390 array_free (periodic, EMPTY);
1041#endif 1391#endif
1392#if EV_FORK_ENABLE
1393 array_free (fork, EMPTY);
1394#endif
1042 array_free (prepare, EMPTY); 1395 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1396 array_free (check, EMPTY);
1397#if EV_ASYNC_ENABLE
1398 array_free (async, EMPTY);
1399#endif
1044 1400
1045 backend = 0; 1401 backend = 0;
1046} 1402}
1047 1403
1404#if EV_USE_INOTIFY
1048void inline_size infy_fork (EV_P); 1405void inline_size infy_fork (EV_P);
1406#endif
1049 1407
1050void inline_size 1408void inline_size
1051loop_fork (EV_P) 1409loop_fork (EV_P)
1052{ 1410{
1053#if EV_USE_PORT 1411#if EV_USE_PORT
1061#endif 1419#endif
1062#if EV_USE_INOTIFY 1420#if EV_USE_INOTIFY
1063 infy_fork (EV_A); 1421 infy_fork (EV_A);
1064#endif 1422#endif
1065 1423
1066 if (ev_is_active (&sigev)) 1424 if (ev_is_active (&pipeev))
1067 { 1425 {
1068 /* default loop */ 1426 /* this "locks" the handlers against writing to the pipe */
1427 /* while we modify the fd vars */
1428 gotsig = 1;
1429#if EV_ASYNC_ENABLE
1430 gotasync = 1;
1431#endif
1069 1432
1070 ev_ref (EV_A); 1433 ev_ref (EV_A);
1071 ev_io_stop (EV_A_ &sigev); 1434 ev_io_stop (EV_A_ &pipeev);
1435
1436#if EV_USE_EVENTFD
1437 if (evfd >= 0)
1438 close (evfd);
1439#endif
1440
1441 if (evpipe [0] >= 0)
1442 {
1072 close (sigpipe [0]); 1443 close (evpipe [0]);
1073 close (sigpipe [1]); 1444 close (evpipe [1]);
1445 }
1074 1446
1075 while (pipe (sigpipe))
1076 syserr ("(libev) error creating pipe");
1077
1078 siginit (EV_A); 1447 evpipe_init (EV_A);
1448 /* now iterate over everything, in case we missed something */
1449 pipecb (EV_A_ &pipeev, EV_READ);
1079 } 1450 }
1080 1451
1081 postfork = 0; 1452 postfork = 0;
1082} 1453}
1083 1454
1105} 1476}
1106 1477
1107void 1478void
1108ev_loop_fork (EV_P) 1479ev_loop_fork (EV_P)
1109{ 1480{
1110 postfork = 1; 1481 postfork = 1; /* must be in line with ev_default_fork */
1111} 1482}
1112
1113#endif 1483#endif
1114 1484
1115#if EV_MULTIPLICITY 1485#if EV_MULTIPLICITY
1116struct ev_loop * 1486struct ev_loop *
1117ev_default_loop_init (unsigned int flags) 1487ev_default_loop_init (unsigned int flags)
1118#else 1488#else
1119int 1489int
1120ev_default_loop (unsigned int flags) 1490ev_default_loop (unsigned int flags)
1121#endif 1491#endif
1122{ 1492{
1123 if (sigpipe [0] == sigpipe [1])
1124 if (pipe (sigpipe))
1125 return 0;
1126
1127 if (!ev_default_loop_ptr) 1493 if (!ev_default_loop_ptr)
1128 { 1494 {
1129#if EV_MULTIPLICITY 1495#if EV_MULTIPLICITY
1130 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1496 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1131#else 1497#else
1134 1500
1135 loop_init (EV_A_ flags); 1501 loop_init (EV_A_ flags);
1136 1502
1137 if (ev_backend (EV_A)) 1503 if (ev_backend (EV_A))
1138 { 1504 {
1139 siginit (EV_A);
1140
1141#ifndef _WIN32 1505#ifndef _WIN32
1142 ev_signal_init (&childev, childcb, SIGCHLD); 1506 ev_signal_init (&childev, childcb, SIGCHLD);
1143 ev_set_priority (&childev, EV_MAXPRI); 1507 ev_set_priority (&childev, EV_MAXPRI);
1144 ev_signal_start (EV_A_ &childev); 1508 ev_signal_start (EV_A_ &childev);
1145 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1509 ev_unref (EV_A); /* child watcher should not keep loop alive */
1162#ifndef _WIN32 1526#ifndef _WIN32
1163 ev_ref (EV_A); /* child watcher */ 1527 ev_ref (EV_A); /* child watcher */
1164 ev_signal_stop (EV_A_ &childev); 1528 ev_signal_stop (EV_A_ &childev);
1165#endif 1529#endif
1166 1530
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); 1531 loop_destroy (EV_A);
1174} 1532}
1175 1533
1176void 1534void
1177ev_default_fork (void) 1535ev_default_fork (void)
1179#if EV_MULTIPLICITY 1537#if EV_MULTIPLICITY
1180 struct ev_loop *loop = ev_default_loop_ptr; 1538 struct ev_loop *loop = ev_default_loop_ptr;
1181#endif 1539#endif
1182 1540
1183 if (backend) 1541 if (backend)
1184 postfork = 1; 1542 postfork = 1; /* must be in line with ev_loop_fork */
1185} 1543}
1186 1544
1187/*****************************************************************************/ 1545/*****************************************************************************/
1188 1546
1189void 1547void
1209 p->w->pending = 0; 1567 p->w->pending = 0;
1210 EV_CB_INVOKE (p->w, p->events); 1568 EV_CB_INVOKE (p->w, p->events);
1211 } 1569 }
1212 } 1570 }
1213} 1571}
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 1572
1295#if EV_IDLE_ENABLE 1573#if EV_IDLE_ENABLE
1296void inline_size 1574void inline_size
1297idle_reify (EV_P) 1575idle_reify (EV_P)
1298{ 1576{
1310 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1588 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1311 break; 1589 break;
1312 } 1590 }
1313 } 1591 }
1314 } 1592 }
1593}
1594#endif
1595
1596void inline_size
1597timers_reify (EV_P)
1598{
1599 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now)
1600 {
1601 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1602
1603 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1604
1605 /* first reschedule or stop timer */
1606 if (w->repeat)
1607 {
1608 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1609
1610 ev_at (w) += w->repeat;
1611 if (ev_at (w) < mn_now)
1612 ev_at (w) = mn_now;
1613
1614 downheap (timers, timercnt, HEAP0);
1615 }
1616 else
1617 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1618
1619 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1620 }
1621}
1622
1623#if EV_PERIODIC_ENABLE
1624void inline_size
1625periodics_reify (EV_P)
1626{
1627 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now)
1628 {
1629 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1630
1631 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1632
1633 /* first reschedule or stop timer */
1634 if (w->reschedule_cb)
1635 {
1636 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1637 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1638 downheap (periodics, periodiccnt, 1);
1639 }
1640 else if (w->interval)
1641 {
1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1643 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1644 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1645 downheap (periodics, periodiccnt, HEAP0);
1646 }
1647 else
1648 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1649
1650 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1651 }
1652}
1653
1654static void noinline
1655periodics_reschedule (EV_P)
1656{
1657 int i;
1658
1659 /* adjust periodics after time jump */
1660 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1661 {
1662 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1663
1664 if (w->reschedule_cb)
1665 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval)
1667 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1668 }
1669
1670 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */
1671 for (i = periodiccnt >> 1; --i; )
1672 downheap (periodics, periodiccnt, i + HEAP0);
1315} 1673}
1316#endif 1674#endif
1317 1675
1318void inline_speed 1676void inline_speed
1319time_update (EV_P_ ev_tstamp max_block) 1677time_update (EV_P_ ev_tstamp max_block)
1348 */ 1706 */
1349 for (i = 4; --i; ) 1707 for (i = 4; --i; )
1350 { 1708 {
1351 rtmn_diff = ev_rt_now - mn_now; 1709 rtmn_diff = ev_rt_now - mn_now;
1352 1710
1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1711 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1354 return; /* all is well */ 1712 return; /* all is well */
1355 1713
1356 ev_rt_now = ev_time (); 1714 ev_rt_now = ev_time ();
1357 mn_now = get_clock (); 1715 mn_now = get_clock ();
1358 now_floor = mn_now; 1716 now_floor = mn_now;
1374#if EV_PERIODIC_ENABLE 1732#if EV_PERIODIC_ENABLE
1375 periodics_reschedule (EV_A); 1733 periodics_reschedule (EV_A);
1376#endif 1734#endif
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1735 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1736 for (i = 0; i < timercnt; ++i)
1737 {
1738 ANHE *he = timers + i + HEAP0;
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1739 ANHE_w (*he)->at += ev_rt_now - mn_now;
1740 ANHE_at_set (*he);
1741 }
1380 } 1742 }
1381 1743
1382 mn_now = ev_rt_now; 1744 mn_now = ev_rt_now;
1383 } 1745 }
1384} 1746}
1398static int loop_done; 1760static int loop_done;
1399 1761
1400void 1762void
1401ev_loop (EV_P_ int flags) 1763ev_loop (EV_P_ int flags)
1402{ 1764{
1403 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1765 loop_done = EVUNLOOP_CANCEL;
1404 ? EVUNLOOP_ONE
1405 : EVUNLOOP_CANCEL;
1406 1766
1407 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1767 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1408 1768
1409 do 1769 do
1410 { 1770 {
1444 /* update fd-related kernel structures */ 1804 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1805 fd_reify (EV_A);
1446 1806
1447 /* calculate blocking time */ 1807 /* calculate blocking time */
1448 { 1808 {
1449 ev_tstamp block; 1809 ev_tstamp waittime = 0.;
1810 ev_tstamp sleeptime = 0.;
1450 1811
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1812 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1813 {
1455 /* update time to cancel out callback processing overhead */ 1814 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1815 time_update (EV_A_ 1e100);
1457 1816
1458 block = MAX_BLOCKTIME; 1817 waittime = MAX_BLOCKTIME;
1459 1818
1460 if (timercnt) 1819 if (timercnt)
1461 { 1820 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1821 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1463 if (block > to) block = to; 1822 if (waittime > to) waittime = to;
1464 } 1823 }
1465 1824
1466#if EV_PERIODIC_ENABLE 1825#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1826 if (periodiccnt)
1468 { 1827 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1828 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1829 if (waittime > to) waittime = to;
1471 } 1830 }
1472#endif 1831#endif
1473 1832
1474 if (expect_false (block < 0.)) block = 0.; 1833 if (expect_false (waittime < timeout_blocktime))
1834 waittime = timeout_blocktime;
1835
1836 sleeptime = waittime - backend_fudge;
1837
1838 if (expect_true (sleeptime > io_blocktime))
1839 sleeptime = io_blocktime;
1840
1841 if (sleeptime)
1842 {
1843 ev_sleep (sleeptime);
1844 waittime -= sleeptime;
1845 }
1475 } 1846 }
1476 1847
1477 ++loop_count; 1848 ++loop_count;
1478 backend_poll (EV_A_ block); 1849 backend_poll (EV_A_ waittime);
1479 1850
1480 /* update ev_rt_now, do magic */ 1851 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1852 time_update (EV_A_ waittime + sleeptime);
1482 } 1853 }
1483 1854
1484 /* queue pending timers and reschedule them */ 1855 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1856 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1857#if EV_PERIODIC_ENABLE
1495 /* queue check watchers, to be executed first */ 1866 /* queue check watchers, to be executed first */
1496 if (expect_false (checkcnt)) 1867 if (expect_false (checkcnt))
1497 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1868 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1498 1869
1499 call_pending (EV_A); 1870 call_pending (EV_A);
1500
1501 } 1871 }
1502 while (expect_true (activecnt && !loop_done)); 1872 while (expect_true (
1873 activecnt
1874 && !loop_done
1875 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1876 ));
1503 1877
1504 if (loop_done == EVUNLOOP_ONE) 1878 if (loop_done == EVUNLOOP_ONE)
1505 loop_done = EVUNLOOP_CANCEL; 1879 loop_done = EVUNLOOP_CANCEL;
1506} 1880}
1507 1881
1600 1974
1601 ev_start (EV_A_ (W)w, 1); 1975 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1976 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add (&anfds[fd].head, (WL)w); 1977 wlist_add (&anfds[fd].head, (WL)w);
1604 1978
1605 fd_change (EV_A_ fd, w->events & EV_IOFDSET); 1979 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1606 w->events &= ~ EV_IOFDSET; 1980 w->events &= ~EV_IOFDSET;
1607} 1981}
1608 1982
1609void noinline 1983void noinline
1610ev_io_stop (EV_P_ ev_io *w) 1984ev_io_stop (EV_P_ ev_io *w)
1611{ 1985{
1616 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1990 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1617 1991
1618 wlist_del (&anfds[w->fd].head, (WL)w); 1992 wlist_del (&anfds[w->fd].head, (WL)w);
1619 ev_stop (EV_A_ (W)w); 1993 ev_stop (EV_A_ (W)w);
1620 1994
1621 fd_change (EV_A_ w->fd, 0); 1995 fd_change (EV_A_ w->fd, 1);
1622} 1996}
1623 1997
1624void noinline 1998void noinline
1625ev_timer_start (EV_P_ ev_timer *w) 1999ev_timer_start (EV_P_ ev_timer *w)
1626{ 2000{
1627 if (expect_false (ev_is_active (w))) 2001 if (expect_false (ev_is_active (w)))
1628 return; 2002 return;
1629 2003
1630 ((WT)w)->at += mn_now; 2004 ev_at (w) += mn_now;
1631 2005
1632 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2006 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1633 2007
1634 ev_start (EV_A_ (W)w, ++timercnt); 2008 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1635 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 2009 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1636 timers [timercnt - 1] = (WT)w; 2010 ANHE_w (timers [ev_active (w)]) = (WT)w;
1637 upheap (timers, timercnt - 1); 2011 ANHE_at_set (timers [ev_active (w)]);
2012 upheap (timers, ev_active (w));
1638 2013
1639 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2014 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1640} 2015}
1641 2016
1642void noinline 2017void noinline
1643ev_timer_stop (EV_P_ ev_timer *w) 2018ev_timer_stop (EV_P_ ev_timer *w)
1644{ 2019{
1645 clear_pending (EV_A_ (W)w); 2020 clear_pending (EV_A_ (W)w);
1646 if (expect_false (!ev_is_active (w))) 2021 if (expect_false (!ev_is_active (w)))
1647 return; 2022 return;
1648 2023
1649 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1650
1651 { 2024 {
1652 int active = ((W)w)->active; 2025 int active = ev_active (w);
1653 2026
2027 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2028
1654 if (expect_true (--active < --timercnt)) 2029 if (expect_true (active < timercnt + HEAP0 - 1))
1655 { 2030 {
1656 timers [active] = timers [timercnt]; 2031 timers [active] = timers [timercnt + HEAP0 - 1];
1657 adjustheap (timers, timercnt, active); 2032 adjustheap (timers, timercnt, active);
1658 } 2033 }
2034
2035 --timercnt;
1659 } 2036 }
1660 2037
1661 ((WT)w)->at -= mn_now; 2038 ev_at (w) -= mn_now;
1662 2039
1663 ev_stop (EV_A_ (W)w); 2040 ev_stop (EV_A_ (W)w);
1664} 2041}
1665 2042
1666void noinline 2043void noinline
1668{ 2045{
1669 if (ev_is_active (w)) 2046 if (ev_is_active (w))
1670 { 2047 {
1671 if (w->repeat) 2048 if (w->repeat)
1672 { 2049 {
1673 ((WT)w)->at = mn_now + w->repeat; 2050 ev_at (w) = mn_now + w->repeat;
2051 ANHE_at_set (timers [ev_active (w)]);
1674 adjustheap (timers, timercnt, ((W)w)->active - 1); 2052 adjustheap (timers, timercnt, ev_active (w));
1675 } 2053 }
1676 else 2054 else
1677 ev_timer_stop (EV_A_ w); 2055 ev_timer_stop (EV_A_ w);
1678 } 2056 }
1679 else if (w->repeat) 2057 else if (w->repeat)
1680 { 2058 {
1681 w->at = w->repeat; 2059 ev_at (w) = w->repeat;
1682 ev_timer_start (EV_A_ w); 2060 ev_timer_start (EV_A_ w);
1683 } 2061 }
1684} 2062}
1685 2063
1686#if EV_PERIODIC_ENABLE 2064#if EV_PERIODIC_ENABLE
1689{ 2067{
1690 if (expect_false (ev_is_active (w))) 2068 if (expect_false (ev_is_active (w)))
1691 return; 2069 return;
1692 2070
1693 if (w->reschedule_cb) 2071 if (w->reschedule_cb)
1694 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2072 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1695 else if (w->interval) 2073 else if (w->interval)
1696 { 2074 {
1697 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2075 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 */ 2076 /* 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; 2077 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1700 } 2078 }
1701 else 2079 else
1702 ((WT)w)->at = w->offset; 2080 ev_at (w) = w->offset;
1703 2081
1704 ev_start (EV_A_ (W)w, ++periodiccnt); 2082 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1705 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2083 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1706 periodics [periodiccnt - 1] = (WT)w; 2084 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1707 upheap (periodics, periodiccnt - 1); 2085 upheap (periodics, ev_active (w));
1708 2086
1709 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2087 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1710} 2088}
1711 2089
1712void noinline 2090void noinline
1713ev_periodic_stop (EV_P_ ev_periodic *w) 2091ev_periodic_stop (EV_P_ ev_periodic *w)
1714{ 2092{
1715 clear_pending (EV_A_ (W)w); 2093 clear_pending (EV_A_ (W)w);
1716 if (expect_false (!ev_is_active (w))) 2094 if (expect_false (!ev_is_active (w)))
1717 return; 2095 return;
1718 2096
1719 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1720
1721 { 2097 {
1722 int active = ((W)w)->active; 2098 int active = ev_active (w);
1723 2099
2100 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2101
1724 if (expect_true (--active < --periodiccnt)) 2102 if (expect_true (active < periodiccnt + HEAP0 - 1))
1725 { 2103 {
1726 periodics [active] = periodics [periodiccnt]; 2104 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1727 adjustheap (periodics, periodiccnt, active); 2105 adjustheap (periodics, periodiccnt, active);
1728 } 2106 }
2107
2108 --periodiccnt;
1729 } 2109 }
1730 2110
1731 ev_stop (EV_A_ (W)w); 2111 ev_stop (EV_A_ (W)w);
1732} 2112}
1733 2113
1752#endif 2132#endif
1753 if (expect_false (ev_is_active (w))) 2133 if (expect_false (ev_is_active (w)))
1754 return; 2134 return;
1755 2135
1756 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2136 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2137
2138 evpipe_init (EV_A);
1757 2139
1758 { 2140 {
1759#ifndef _WIN32 2141#ifndef _WIN32
1760 sigset_t full, prev; 2142 sigset_t full, prev;
1761 sigfillset (&full); 2143 sigfillset (&full);
1773 wlist_add (&signals [w->signum - 1].head, (WL)w); 2155 wlist_add (&signals [w->signum - 1].head, (WL)w);
1774 2156
1775 if (!((WL)w)->next) 2157 if (!((WL)w)->next)
1776 { 2158 {
1777#if _WIN32 2159#if _WIN32
1778 signal (w->signum, sighandler); 2160 signal (w->signum, ev_sighandler);
1779#else 2161#else
1780 struct sigaction sa; 2162 struct sigaction sa;
1781 sa.sa_handler = sighandler; 2163 sa.sa_handler = ev_sighandler;
1782 sigfillset (&sa.sa_mask); 2164 sigfillset (&sa.sa_mask);
1783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2165 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1784 sigaction (w->signum, &sa, 0); 2166 sigaction (w->signum, &sa, 0);
1785#endif 2167#endif
1786 } 2168 }
1847 if (w->wd < 0) 2229 if (w->wd < 0)
1848 { 2230 {
1849 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2231 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1850 2232
1851 /* monitor some parent directory for speedup hints */ 2233 /* monitor some parent directory for speedup hints */
2234 /* note that exceeding the hardcoded limit is not a correctness issue, */
2235 /* but an efficiency issue only */
1852 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2236 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1853 { 2237 {
1854 char path [4096]; 2238 char path [4096];
1855 strcpy (path, w->path); 2239 strcpy (path, w->path);
1856 2240
2101 clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2102 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2103 return; 2487 return;
2104 2488
2105 { 2489 {
2106 int active = ((W)w)->active; 2490 int active = ev_active (w);
2107 2491
2108 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2492 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2109 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2493 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2110 2494
2111 ev_stop (EV_A_ (W)w); 2495 ev_stop (EV_A_ (W)w);
2112 --idleall; 2496 --idleall;
2113 } 2497 }
2114} 2498}
2131 clear_pending (EV_A_ (W)w); 2515 clear_pending (EV_A_ (W)w);
2132 if (expect_false (!ev_is_active (w))) 2516 if (expect_false (!ev_is_active (w)))
2133 return; 2517 return;
2134 2518
2135 { 2519 {
2136 int active = ((W)w)->active; 2520 int active = ev_active (w);
2521
2137 prepares [active - 1] = prepares [--preparecnt]; 2522 prepares [active - 1] = prepares [--preparecnt];
2138 ((W)prepares [active - 1])->active = active; 2523 ev_active (prepares [active - 1]) = active;
2139 } 2524 }
2140 2525
2141 ev_stop (EV_A_ (W)w); 2526 ev_stop (EV_A_ (W)w);
2142} 2527}
2143 2528
2158 clear_pending (EV_A_ (W)w); 2543 clear_pending (EV_A_ (W)w);
2159 if (expect_false (!ev_is_active (w))) 2544 if (expect_false (!ev_is_active (w)))
2160 return; 2545 return;
2161 2546
2162 { 2547 {
2163 int active = ((W)w)->active; 2548 int active = ev_active (w);
2549
2164 checks [active - 1] = checks [--checkcnt]; 2550 checks [active - 1] = checks [--checkcnt];
2165 ((W)checks [active - 1])->active = active; 2551 ev_active (checks [active - 1]) = active;
2166 } 2552 }
2167 2553
2168 ev_stop (EV_A_ (W)w); 2554 ev_stop (EV_A_ (W)w);
2169} 2555}
2170 2556
2171#if EV_EMBED_ENABLE 2557#if EV_EMBED_ENABLE
2172void noinline 2558void noinline
2173ev_embed_sweep (EV_P_ ev_embed *w) 2559ev_embed_sweep (EV_P_ ev_embed *w)
2174{ 2560{
2175 ev_loop (w->loop, EVLOOP_NONBLOCK); 2561 ev_loop (w->other, EVLOOP_NONBLOCK);
2176} 2562}
2177 2563
2178static void 2564static void
2179embed_cb (EV_P_ ev_io *io, int revents) 2565embed_io_cb (EV_P_ ev_io *io, int revents)
2180{ 2566{
2181 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2567 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2182 2568
2183 if (ev_cb (w)) 2569 if (ev_cb (w))
2184 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2570 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2185 else 2571 else
2186 ev_embed_sweep (loop, w); 2572 ev_loop (w->other, EVLOOP_NONBLOCK);
2187} 2573}
2574
2575static void
2576embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2577{
2578 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2579
2580 {
2581 struct ev_loop *loop = w->other;
2582
2583 while (fdchangecnt)
2584 {
2585 fd_reify (EV_A);
2586 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2587 }
2588 }
2589}
2590
2591#if 0
2592static void
2593embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2594{
2595 ev_idle_stop (EV_A_ idle);
2596}
2597#endif
2188 2598
2189void 2599void
2190ev_embed_start (EV_P_ ev_embed *w) 2600ev_embed_start (EV_P_ ev_embed *w)
2191{ 2601{
2192 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
2193 return; 2603 return;
2194 2604
2195 { 2605 {
2196 struct ev_loop *loop = w->loop; 2606 struct ev_loop *loop = w->other;
2197 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2607 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2198 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2608 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2199 } 2609 }
2200 2610
2201 ev_set_priority (&w->io, ev_priority (w)); 2611 ev_set_priority (&w->io, ev_priority (w));
2202 ev_io_start (EV_A_ &w->io); 2612 ev_io_start (EV_A_ &w->io);
2613
2614 ev_prepare_init (&w->prepare, embed_prepare_cb);
2615 ev_set_priority (&w->prepare, EV_MINPRI);
2616 ev_prepare_start (EV_A_ &w->prepare);
2617
2618 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2203 2619
2204 ev_start (EV_A_ (W)w, 1); 2620 ev_start (EV_A_ (W)w, 1);
2205} 2621}
2206 2622
2207void 2623void
2210 clear_pending (EV_A_ (W)w); 2626 clear_pending (EV_A_ (W)w);
2211 if (expect_false (!ev_is_active (w))) 2627 if (expect_false (!ev_is_active (w)))
2212 return; 2628 return;
2213 2629
2214 ev_io_stop (EV_A_ &w->io); 2630 ev_io_stop (EV_A_ &w->io);
2631 ev_prepare_stop (EV_A_ &w->prepare);
2215 2632
2216 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2217} 2634}
2218#endif 2635#endif
2219 2636
2235 clear_pending (EV_A_ (W)w); 2652 clear_pending (EV_A_ (W)w);
2236 if (expect_false (!ev_is_active (w))) 2653 if (expect_false (!ev_is_active (w)))
2237 return; 2654 return;
2238 2655
2239 { 2656 {
2240 int active = ((W)w)->active; 2657 int active = ev_active (w);
2658
2241 forks [active - 1] = forks [--forkcnt]; 2659 forks [active - 1] = forks [--forkcnt];
2242 ((W)forks [active - 1])->active = active; 2660 ev_active (forks [active - 1]) = active;
2243 } 2661 }
2244 2662
2245 ev_stop (EV_A_ (W)w); 2663 ev_stop (EV_A_ (W)w);
2664}
2665#endif
2666
2667#if EV_ASYNC_ENABLE
2668void
2669ev_async_start (EV_P_ ev_async *w)
2670{
2671 if (expect_false (ev_is_active (w)))
2672 return;
2673
2674 evpipe_init (EV_A);
2675
2676 ev_start (EV_A_ (W)w, ++asynccnt);
2677 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2678 asyncs [asynccnt - 1] = w;
2679}
2680
2681void
2682ev_async_stop (EV_P_ ev_async *w)
2683{
2684 clear_pending (EV_A_ (W)w);
2685 if (expect_false (!ev_is_active (w)))
2686 return;
2687
2688 {
2689 int active = ev_active (w);
2690
2691 asyncs [active - 1] = asyncs [--asynccnt];
2692 ev_active (asyncs [active - 1]) = active;
2693 }
2694
2695 ev_stop (EV_A_ (W)w);
2696}
2697
2698void
2699ev_async_send (EV_P_ ev_async *w)
2700{
2701 w->sent = 1;
2702 evpipe_write (EV_A_ &gotasync);
2246} 2703}
2247#endif 2704#endif
2248 2705
2249/*****************************************************************************/ 2706/*****************************************************************************/
2250 2707
2308 ev_timer_set (&once->to, timeout, 0.); 2765 ev_timer_set (&once->to, timeout, 0.);
2309 ev_timer_start (EV_A_ &once->to); 2766 ev_timer_start (EV_A_ &once->to);
2310 } 2767 }
2311} 2768}
2312 2769
2770#if EV_MULTIPLICITY
2771 #include "ev_wrap.h"
2772#endif
2773
2313#ifdef __cplusplus 2774#ifdef __cplusplus
2314} 2775}
2315#endif 2776#endif
2316 2777

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines