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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines