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

Comparing libev/ev.c (file contents):
Revision 1.180 by root, Tue Dec 11 22:04:55 2007 UTC vs.
Revision 1.259 by root, Mon Sep 8 13:14:23 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>
… …
129#ifndef _WIN32 154#ifndef _WIN32
130# include <sys/time.h> 155# include <sys/time.h>
131# include <sys/wait.h> 156# include <sys/wait.h>
132# include <unistd.h> 157# include <unistd.h>
133#else 158#else
159# include <io.h>
134# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
135# include <windows.h> 161# include <windows.h>
136# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
138# endif 164# endif
139#endif 165#endif
140 166
141/**/ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
142 168
143#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
144# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
145#endif 175#endif
146 176
147#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
179#endif
180
181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
185# define EV_USE_NANOSLEEP 0
186# endif
149#endif 187#endif
150 188
151#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
153#endif 191#endif
… …
159# define EV_USE_POLL 1 197# define EV_USE_POLL 1
160# endif 198# endif
161#endif 199#endif
162 200
163#ifndef EV_USE_EPOLL 201#ifndef EV_USE_EPOLL
202# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
203# define EV_USE_EPOLL 1
204# else
164# define EV_USE_EPOLL 0 205# define EV_USE_EPOLL 0
206# endif
165#endif 207#endif
166 208
167#ifndef EV_USE_KQUEUE 209#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0 210# define EV_USE_KQUEUE 0
169#endif 211#endif
… …
171#ifndef EV_USE_PORT 213#ifndef EV_USE_PORT
172# define EV_USE_PORT 0 214# define EV_USE_PORT 0
173#endif 215#endif
174 216
175#ifndef EV_USE_INOTIFY 217#ifndef EV_USE_INOTIFY
218# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
219# define EV_USE_INOTIFY 1
220# else
176# define EV_USE_INOTIFY 0 221# define EV_USE_INOTIFY 0
222# endif
177#endif 223#endif
178 224
179#ifndef EV_PID_HASHSIZE 225#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL 226# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1 227# define EV_PID_HASHSIZE 1
… …
190# else 236# else
191# define EV_INOTIFY_HASHSIZE 16 237# define EV_INOTIFY_HASHSIZE 16
192# endif 238# endif
193#endif 239#endif
194 240
195/**/ 241#ifndef EV_USE_EVENTFD
242# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
243# define EV_USE_EVENTFD 1
244# else
245# define EV_USE_EVENTFD 0
246# endif
247#endif
248
249#if 0 /* debugging */
250# define EV_VERIFY 3
251# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
257#endif
258
259#ifndef EV_USE_4HEAP
260# define EV_USE_4HEAP !EV_MINIMAL
261#endif
262
263#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif
266
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 268
197#ifndef CLOCK_MONOTONIC 269#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 270# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 271# define EV_USE_MONOTONIC 0
200#endif 272#endif
… …
202#ifndef CLOCK_REALTIME 274#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 275# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 276# define EV_USE_REALTIME 0
205#endif 277#endif
206 278
279#if !EV_STAT_ENABLE
280# undef EV_USE_INOTIFY
281# define EV_USE_INOTIFY 0
282#endif
283
284#if !EV_USE_NANOSLEEP
285# ifndef _WIN32
286# include <sys/select.h>
287# endif
288#endif
289
290#if EV_USE_INOTIFY
291# include <sys/inotify.h>
292#endif
293
207#if EV_SELECT_IS_WINSOCKET 294#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 295# include <winsock.h>
209#endif 296#endif
210 297
211#if !EV_STAT_ENABLE 298#if EV_USE_EVENTFD
212# define EV_USE_INOTIFY 0 299/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
300# include <stdint.h>
301# ifdef __cplusplus
302extern "C" {
213#endif 303# endif
214 304int eventfd (unsigned int initval, int flags);
215#if EV_USE_INOTIFY 305# ifdef __cplusplus
216# include <sys/inotify.h> 306}
307# endif
217#endif 308#endif
218 309
219/**/ 310/**/
311
312#if EV_VERIFY >= 3
313# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
314#else
315# define EV_FREQUENT_CHECK do { } while (0)
316#endif
220 317
221/* 318/*
222 * This is used to avoid floating point rounding problems. 319 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics 320 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding 321 * to ensure progress, time-wise, even when rounding
… …
230 327
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 328#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) */ 329#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 */ 330/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 331
235#if __GNUC__ >= 3 332#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 333# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 334# define noinline __attribute__ ((noinline))
238#else 335#else
239# define expect(expr,value) (expr) 336# define expect(expr,value) (expr)
240# define noinline 337# define noinline
241# if __STDC_VERSION__ < 199901L 338# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
242# define inline 339# define inline
243# endif 340# endif
244#endif 341#endif
245 342
246#define expect_false(expr) expect ((expr) != 0, 0) 343#define expect_false(expr) expect ((expr) != 0, 0)
… …
261 358
262typedef ev_watcher *W; 359typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 360typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 361typedef ev_watcher_time *WT;
265 362
363#define ev_active(w) ((W)(w))->active
364#define ev_at(w) ((WT)(w))->at
365
366#if EV_USE_MONOTONIC
367/* sig_atomic_t is used to avoid per-thread variables or locking but still */
368/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 369static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
370#endif
267 371
268#ifdef _WIN32 372#ifdef _WIN32
269# include "ev_win32.c" 373# include "ev_win32.c"
270#endif 374#endif
271 375
… …
292 perror (msg); 396 perror (msg);
293 abort (); 397 abort ();
294 } 398 }
295} 399}
296 400
401static void *
402ev_realloc_emul (void *ptr, long size)
403{
404 /* some systems, notably openbsd and darwin, fail to properly
405 * implement realloc (x, 0) (as required by both ansi c-98 and
406 * the single unix specification, so work around them here.
407 */
408
409 if (size)
410 return realloc (ptr, size);
411
412 free (ptr);
413 return 0;
414}
415
297static void *(*alloc)(void *ptr, long size); 416static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
298 417
299void 418void
300ev_set_allocator (void *(*cb)(void *ptr, long size)) 419ev_set_allocator (void *(*cb)(void *ptr, long size))
301{ 420{
302 alloc = cb; 421 alloc = cb;
303} 422}
304 423
305inline_speed void * 424inline_speed void *
306ev_realloc (void *ptr, long size) 425ev_realloc (void *ptr, long size)
307{ 426{
308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 427 ptr = alloc (ptr, size);
309 428
310 if (!ptr && size) 429 if (!ptr && size)
311 { 430 {
312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 431 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
313 abort (); 432 abort ();
… …
336 W w; 455 W w;
337 int events; 456 int events;
338} ANPENDING; 457} ANPENDING;
339 458
340#if EV_USE_INOTIFY 459#if EV_USE_INOTIFY
460/* hash table entry per inotify-id */
341typedef struct 461typedef struct
342{ 462{
343 WL head; 463 WL head;
344} ANFS; 464} ANFS;
465#endif
466
467/* Heap Entry */
468#if EV_HEAP_CACHE_AT
469 typedef struct {
470 ev_tstamp at;
471 WT w;
472 } ANHE;
473
474 #define ANHE_w(he) (he).w /* access watcher, read-write */
475 #define ANHE_at(he) (he).at /* access cached at, read-only */
476 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
477#else
478 typedef WT ANHE;
479
480 #define ANHE_w(he) (he)
481 #define ANHE_at(he) (he)->at
482 #define ANHE_at_cache(he)
345#endif 483#endif
346 484
347#if EV_MULTIPLICITY 485#if EV_MULTIPLICITY
348 486
349 struct ev_loop 487 struct ev_loop
… …
407{ 545{
408 return ev_rt_now; 546 return ev_rt_now;
409} 547}
410#endif 548#endif
411 549
550void
551ev_sleep (ev_tstamp delay)
552{
553 if (delay > 0.)
554 {
555#if EV_USE_NANOSLEEP
556 struct timespec ts;
557
558 ts.tv_sec = (time_t)delay;
559 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
560
561 nanosleep (&ts, 0);
562#elif defined(_WIN32)
563 Sleep ((unsigned long)(delay * 1e3));
564#else
565 struct timeval tv;
566
567 tv.tv_sec = (time_t)delay;
568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569
570 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
571 /* somehting nto guaranteed by newer posix versions, but guaranteed */
572 /* by older ones */
573 select (0, 0, 0, 0, &tv);
574#endif
575 }
576}
577
578/*****************************************************************************/
579
580#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
581
412int inline_size 582int inline_size
413array_nextsize (int elem, int cur, int cnt) 583array_nextsize (int elem, int cur, int cnt)
414{ 584{
415 int ncur = cur + 1; 585 int ncur = cur + 1;
416 586
417 do 587 do
418 ncur <<= 1; 588 ncur <<= 1;
419 while (cnt > ncur); 589 while (cnt > ncur);
420 590
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 591 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096) 592 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
423 { 593 {
424 ncur *= elem; 594 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 595 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
426 ncur = ncur - sizeof (void *) * 4; 596 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem; 597 ncur /= elem;
428 } 598 }
429 599
430 return ncur; 600 return ncur;
… …
533 { 703 {
534 int fd = fdchanges [i]; 704 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 705 ANFD *anfd = anfds + fd;
536 ev_io *w; 706 ev_io *w;
537 707
538 int events = 0; 708 unsigned char events = 0;
539 709
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 710 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 711 events |= (unsigned char)w->events;
542 712
543#if EV_SELECT_IS_WINSOCKET 713#if EV_SELECT_IS_WINSOCKET
544 if (events) 714 if (events)
545 { 715 {
546 unsigned long argp; 716 unsigned long arg;
717 #ifdef EV_FD_TO_WIN32_HANDLE
718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
719 #else
547 anfd->handle = _get_osfhandle (fd); 720 anfd->handle = _get_osfhandle (fd);
721 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
549 } 723 }
550#endif 724#endif
551 725
726 {
727 unsigned char o_events = anfd->events;
728 unsigned char o_reify = anfd->reify;
729
552 anfd->reify = 0; 730 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 731 anfd->events = events;
732
733 if (o_events != events || o_reify & EV_IOFDSET)
734 backend_modify (EV_A_ fd, o_events, events);
735 }
556 } 736 }
557 737
558 fdchangecnt = 0; 738 fdchangecnt = 0;
559} 739}
560 740
561void inline_size 741void inline_size
562fd_change (EV_P_ int fd) 742fd_change (EV_P_ int fd, int flags)
563{ 743{
564 if (expect_false (anfds [fd].reify)) 744 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 745 anfds [fd].reify |= flags;
568 746
747 if (expect_true (!reify))
748 {
569 ++fdchangecnt; 749 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 750 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 751 fdchanges [fdchangecnt - 1] = fd;
752 }
572} 753}
573 754
574void inline_speed 755void inline_speed
575fd_kill (EV_P_ int fd) 756fd_kill (EV_P_ int fd)
576{ 757{
… …
599{ 780{
600 int fd; 781 int fd;
601 782
602 for (fd = 0; fd < anfdmax; ++fd) 783 for (fd = 0; fd < anfdmax; ++fd)
603 if (anfds [fd].events) 784 if (anfds [fd].events)
604 if (!fd_valid (fd) == -1 && errno == EBADF) 785 if (!fd_valid (fd) && errno == EBADF)
605 fd_kill (EV_A_ fd); 786 fd_kill (EV_A_ fd);
606} 787}
607 788
608/* called on ENOMEM in select/poll to kill some fds and retry */ 789/* called on ENOMEM in select/poll to kill some fds and retry */
609static void noinline 790static void noinline
… …
627 808
628 for (fd = 0; fd < anfdmax; ++fd) 809 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 810 if (anfds [fd].events)
630 { 811 {
631 anfds [fd].events = 0; 812 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 813 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 814 }
634} 815}
635 816
636/*****************************************************************************/ 817/*****************************************************************************/
637 818
819/*
820 * the heap functions want a real array index. array index 0 uis guaranteed to not
821 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
822 * the branching factor of the d-tree.
823 */
824
825/*
826 * at the moment we allow libev the luxury of two heaps,
827 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
828 * which is more cache-efficient.
829 * the difference is about 5% with 50000+ watchers.
830 */
831#if EV_USE_4HEAP
832
833#define DHEAP 4
834#define HEAP0 (DHEAP - 1) /* index of first element in heap */
835#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
836#define UPHEAP_DONE(p,k) ((p) == (k))
837
838/* away from the root */
638void inline_speed 839void inline_speed
639upheap (WT *heap, int k) 840downheap (ANHE *heap, int N, int k)
640{ 841{
641 WT w = heap [k]; 842 ANHE he = heap [k];
843 ANHE *E = heap + N + HEAP0;
642 844
643 while (k) 845 for (;;)
644 { 846 {
645 int p = (k - 1) >> 1; 847 ev_tstamp minat;
848 ANHE *minpos;
849 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
646 850
647 if (heap [p]->at <= w->at) 851 /* find minimum child */
852 if (expect_true (pos + DHEAP - 1 < E))
853 {
854 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
855 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
856 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
857 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
858 }
859 else if (pos < E)
860 {
861 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
862 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
863 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
864 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
865 }
866 else
648 break; 867 break;
649 868
869 if (ANHE_at (he) <= minat)
870 break;
871
872 heap [k] = *minpos;
873 ev_active (ANHE_w (*minpos)) = k;
874
875 k = minpos - heap;
876 }
877
878 heap [k] = he;
879 ev_active (ANHE_w (he)) = k;
880}
881
882#else /* 4HEAP */
883
884#define HEAP0 1
885#define HPARENT(k) ((k) >> 1)
886#define UPHEAP_DONE(p,k) (!(p))
887
888/* away from the root */
889void inline_speed
890downheap (ANHE *heap, int N, int k)
891{
892 ANHE he = heap [k];
893
894 for (;;)
895 {
896 int c = k << 1;
897
898 if (c > N + HEAP0 - 1)
899 break;
900
901 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
902 ? 1 : 0;
903
904 if (ANHE_at (he) <= ANHE_at (heap [c]))
905 break;
906
907 heap [k] = heap [c];
908 ev_active (ANHE_w (heap [k])) = k;
909
910 k = c;
911 }
912
913 heap [k] = he;
914 ev_active (ANHE_w (he)) = k;
915}
916#endif
917
918/* towards the root */
919void inline_speed
920upheap (ANHE *heap, int k)
921{
922 ANHE he = heap [k];
923
924 for (;;)
925 {
926 int p = HPARENT (k);
927
928 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
929 break;
930
650 heap [k] = heap [p]; 931 heap [k] = heap [p];
651 ((W)heap [k])->active = k + 1; 932 ev_active (ANHE_w (heap [k])) = k;
652 k = p; 933 k = p;
653 } 934 }
654 935
655 heap [k] = w; 936 heap [k] = he;
656 ((W)heap [k])->active = k + 1; 937 ev_active (ANHE_w (he)) = k;
657
658}
659
660void inline_speed
661downheap (WT *heap, int N, int k)
662{
663 WT w = heap [k];
664
665 for (;;)
666 {
667 int c = (k << 1) + 1;
668
669 if (c >= N)
670 break;
671
672 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
673 ? 1 : 0;
674
675 if (w->at <= heap [c]->at)
676 break;
677
678 heap [k] = heap [c];
679 ((W)heap [k])->active = k + 1;
680
681 k = c;
682 }
683
684 heap [k] = w;
685 ((W)heap [k])->active = k + 1;
686} 938}
687 939
688void inline_size 940void inline_size
689adjustheap (WT *heap, int N, int k) 941adjustheap (ANHE *heap, int N, int k)
690{ 942{
943 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
691 upheap (heap, k); 944 upheap (heap, k);
945 else
692 downheap (heap, N, k); 946 downheap (heap, N, k);
947}
948
949/* rebuild the heap: this function is used only once and executed rarely */
950void inline_size
951reheap (ANHE *heap, int N)
952{
953 int i;
954
955 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
956 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
957 for (i = 0; i < N; ++i)
958 upheap (heap, i + HEAP0);
693} 959}
694 960
695/*****************************************************************************/ 961/*****************************************************************************/
696 962
697typedef struct 963typedef struct
698{ 964{
699 WL head; 965 WL head;
700 sig_atomic_t volatile gotsig; 966 EV_ATOMIC_T gotsig;
701} ANSIG; 967} ANSIG;
702 968
703static ANSIG *signals; 969static ANSIG *signals;
704static int signalmax; 970static int signalmax;
705 971
706static int sigpipe [2]; 972static EV_ATOMIC_T gotsig;
707static sig_atomic_t volatile gotsig;
708static ev_io sigev;
709 973
710void inline_size 974void inline_size
711signals_init (ANSIG *base, int count) 975signals_init (ANSIG *base, int count)
712{ 976{
713 while (count--) 977 while (count--)
… …
717 981
718 ++base; 982 ++base;
719 } 983 }
720} 984}
721 985
722static void 986/*****************************************************************************/
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 987
773void inline_speed 988void inline_speed
774fd_intern (int fd) 989fd_intern (int fd)
775{ 990{
776#ifdef _WIN32 991#ifdef _WIN32
777 int arg = 1; 992 unsigned long arg = 1;
778 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 993 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
779#else 994#else
780 fcntl (fd, F_SETFD, FD_CLOEXEC); 995 fcntl (fd, F_SETFD, FD_CLOEXEC);
781 fcntl (fd, F_SETFL, O_NONBLOCK); 996 fcntl (fd, F_SETFL, O_NONBLOCK);
782#endif 997#endif
783} 998}
784 999
785static void noinline 1000static void noinline
786siginit (EV_P) 1001evpipe_init (EV_P)
787{ 1002{
1003 if (!ev_is_active (&pipeev))
1004 {
1005#if EV_USE_EVENTFD
1006 if ((evfd = eventfd (0, 0)) >= 0)
1007 {
1008 evpipe [0] = -1;
1009 fd_intern (evfd);
1010 ev_io_set (&pipeev, evfd, EV_READ);
1011 }
1012 else
1013#endif
1014 {
1015 while (pipe (evpipe))
1016 syserr ("(libev) error creating signal/async pipe");
1017
788 fd_intern (sigpipe [0]); 1018 fd_intern (evpipe [0]);
789 fd_intern (sigpipe [1]); 1019 fd_intern (evpipe [1]);
1020 ev_io_set (&pipeev, evpipe [0], EV_READ);
1021 }
790 1022
791 ev_io_set (&sigev, sigpipe [0], EV_READ);
792 ev_io_start (EV_A_ &sigev); 1023 ev_io_start (EV_A_ &pipeev);
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1024 ev_unref (EV_A); /* watcher should not keep loop alive */
1025 }
1026}
1027
1028void inline_size
1029evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1030{
1031 if (!*flag)
1032 {
1033 int old_errno = errno; /* save errno because write might clobber it */
1034
1035 *flag = 1;
1036
1037#if EV_USE_EVENTFD
1038 if (evfd >= 0)
1039 {
1040 uint64_t counter = 1;
1041 write (evfd, &counter, sizeof (uint64_t));
1042 }
1043 else
1044#endif
1045 write (evpipe [1], &old_errno, 1);
1046
1047 errno = old_errno;
1048 }
1049}
1050
1051static void
1052pipecb (EV_P_ ev_io *iow, int revents)
1053{
1054#if EV_USE_EVENTFD
1055 if (evfd >= 0)
1056 {
1057 uint64_t counter;
1058 read (evfd, &counter, sizeof (uint64_t));
1059 }
1060 else
1061#endif
1062 {
1063 char dummy;
1064 read (evpipe [0], &dummy, 1);
1065 }
1066
1067 if (gotsig && ev_is_default_loop (EV_A))
1068 {
1069 int signum;
1070 gotsig = 0;
1071
1072 for (signum = signalmax; signum--; )
1073 if (signals [signum].gotsig)
1074 ev_feed_signal_event (EV_A_ signum + 1);
1075 }
1076
1077#if EV_ASYNC_ENABLE
1078 if (gotasync)
1079 {
1080 int i;
1081 gotasync = 0;
1082
1083 for (i = asynccnt; i--; )
1084 if (asyncs [i]->sent)
1085 {
1086 asyncs [i]->sent = 0;
1087 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1088 }
1089 }
1090#endif
794} 1091}
795 1092
796/*****************************************************************************/ 1093/*****************************************************************************/
797 1094
1095static void
1096ev_sighandler (int signum)
1097{
1098#if EV_MULTIPLICITY
1099 struct ev_loop *loop = &default_loop_struct;
1100#endif
1101
1102#if _WIN32
1103 signal (signum, ev_sighandler);
1104#endif
1105
1106 signals [signum - 1].gotsig = 1;
1107 evpipe_write (EV_A_ &gotsig);
1108}
1109
1110void noinline
1111ev_feed_signal_event (EV_P_ int signum)
1112{
1113 WL w;
1114
1115#if EV_MULTIPLICITY
1116 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1117#endif
1118
1119 --signum;
1120
1121 if (signum < 0 || signum >= signalmax)
1122 return;
1123
1124 signals [signum].gotsig = 0;
1125
1126 for (w = signals [signum].head; w; w = w->next)
1127 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1128}
1129
1130/*****************************************************************************/
1131
798static ev_child *childs [EV_PID_HASHSIZE]; 1132static WL childs [EV_PID_HASHSIZE];
799 1133
800#ifndef _WIN32 1134#ifndef _WIN32
801 1135
802static ev_signal childev; 1136static ev_signal childev;
803 1137
1138#ifndef WIFCONTINUED
1139# define WIFCONTINUED(status) 0
1140#endif
1141
804void inline_speed 1142void inline_speed
805child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1143child_reap (EV_P_ int chain, int pid, int status)
806{ 1144{
807 ev_child *w; 1145 ev_child *w;
1146 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
808 1147
809 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1148 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1149 {
810 if (w->pid == pid || !w->pid) 1150 if ((w->pid == pid || !w->pid)
1151 && (!traced || (w->flags & 1)))
811 { 1152 {
812 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1153 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; 1154 w->rpid = pid;
814 w->rstatus = status; 1155 w->rstatus = status;
815 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1156 ev_feed_event (EV_A_ (W)w, EV_CHILD);
816 } 1157 }
1158 }
817} 1159}
818 1160
819#ifndef WCONTINUED 1161#ifndef WCONTINUED
820# define WCONTINUED 0 1162# define WCONTINUED 0
821#endif 1163#endif
… …
830 if (!WCONTINUED 1172 if (!WCONTINUED
831 || errno != EINVAL 1173 || errno != EINVAL
832 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1174 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
833 return; 1175 return;
834 1176
835 /* make sure we are called again until all childs have been reaped */ 1177 /* 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 */ 1178 /* 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); 1179 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
838 1180
839 child_reap (EV_A_ sw, pid, pid, status); 1181 child_reap (EV_A_ pid, pid, status);
840 if (EV_PID_HASHSIZE > 1) 1182 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 */ 1183 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
842} 1184}
843 1185
844#endif 1186#endif
845 1187
846/*****************************************************************************/ 1188/*****************************************************************************/
… …
918} 1260}
919 1261
920unsigned int 1262unsigned int
921ev_embeddable_backends (void) 1263ev_embeddable_backends (void)
922{ 1264{
923 return EVBACKEND_EPOLL 1265 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
924 | EVBACKEND_KQUEUE 1266
925 | EVBACKEND_PORT; 1267 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1268 /* please fix it and tell me how to detect the fix */
1269 flags &= ~EVBACKEND_EPOLL;
1270
1271 return flags;
926} 1272}
927 1273
928unsigned int 1274unsigned int
929ev_backend (EV_P) 1275ev_backend (EV_P)
930{ 1276{
… …
933 1279
934unsigned int 1280unsigned int
935ev_loop_count (EV_P) 1281ev_loop_count (EV_P)
936{ 1282{
937 return loop_count; 1283 return loop_count;
1284}
1285
1286void
1287ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1288{
1289 io_blocktime = interval;
1290}
1291
1292void
1293ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1294{
1295 timeout_blocktime = interval;
938} 1296}
939 1297
940static void noinline 1298static void noinline
941loop_init (EV_P_ unsigned int flags) 1299loop_init (EV_P_ unsigned int flags)
942{ 1300{
… …
948 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1306 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
949 have_monotonic = 1; 1307 have_monotonic = 1;
950 } 1308 }
951#endif 1309#endif
952 1310
953 ev_rt_now = ev_time (); 1311 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1312 mn_now = get_clock ();
955 now_floor = mn_now; 1313 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1314 rtmn_diff = ev_rt_now - mn_now;
1315
1316 io_blocktime = 0.;
1317 timeout_blocktime = 0.;
1318 backend = 0;
1319 backend_fd = -1;
1320 gotasync = 0;
1321#if EV_USE_INOTIFY
1322 fs_fd = -2;
1323#endif
957 1324
958 /* pid check not overridable via env */ 1325 /* pid check not overridable via env */
959#ifndef _WIN32 1326#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1327 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1328 curpid = getpid ();
… …
964 if (!(flags & EVFLAG_NOENV) 1331 if (!(flags & EVFLAG_NOENV)
965 && !enable_secure () 1332 && !enable_secure ()
966 && getenv ("LIBEV_FLAGS")) 1333 && getenv ("LIBEV_FLAGS"))
967 flags = atoi (getenv ("LIBEV_FLAGS")); 1334 flags = atoi (getenv ("LIBEV_FLAGS"));
968 1335
969 if (!(flags & 0x0000ffffUL)) 1336 if (!(flags & 0x0000ffffU))
970 flags |= ev_recommended_backends (); 1337 flags |= ev_recommended_backends ();
971
972 backend = 0;
973 backend_fd = -1;
974#if EV_USE_INOTIFY
975 fs_fd = -2;
976#endif
977 1338
978#if EV_USE_PORT 1339#if EV_USE_PORT
979 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1340 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
980#endif 1341#endif
981#if EV_USE_KQUEUE 1342#if EV_USE_KQUEUE
… …
989#endif 1350#endif
990#if EV_USE_SELECT 1351#if EV_USE_SELECT
991 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1352 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
992#endif 1353#endif
993 1354
994 ev_init (&sigev, sigcb); 1355 ev_init (&pipeev, pipecb);
995 ev_set_priority (&sigev, EV_MAXPRI); 1356 ev_set_priority (&pipeev, EV_MAXPRI);
996 } 1357 }
997} 1358}
998 1359
999static void noinline 1360static void noinline
1000loop_destroy (EV_P) 1361loop_destroy (EV_P)
1001{ 1362{
1002 int i; 1363 int i;
1364
1365 if (ev_is_active (&pipeev))
1366 {
1367 ev_ref (EV_A); /* signal watcher */
1368 ev_io_stop (EV_A_ &pipeev);
1369
1370#if EV_USE_EVENTFD
1371 if (evfd >= 0)
1372 close (evfd);
1373#endif
1374
1375 if (evpipe [0] >= 0)
1376 {
1377 close (evpipe [0]);
1378 close (evpipe [1]);
1379 }
1380 }
1003 1381
1004#if EV_USE_INOTIFY 1382#if EV_USE_INOTIFY
1005 if (fs_fd >= 0) 1383 if (fs_fd >= 0)
1006 close (fs_fd); 1384 close (fs_fd);
1007#endif 1385#endif
… …
1030 array_free (pending, [i]); 1408 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1409#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1410 array_free (idle, [i]);
1033#endif 1411#endif
1034 } 1412 }
1413
1414 ev_free (anfds); anfdmax = 0;
1035 1415
1036 /* have to use the microsoft-never-gets-it-right macro */ 1416 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1417 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1418 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1419#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1420 array_free (periodic, EMPTY);
1041#endif 1421#endif
1422#if EV_FORK_ENABLE
1423 array_free (fork, EMPTY);
1424#endif
1042 array_free (prepare, EMPTY); 1425 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1426 array_free (check, EMPTY);
1427#if EV_ASYNC_ENABLE
1428 array_free (async, EMPTY);
1429#endif
1044 1430
1045 backend = 0; 1431 backend = 0;
1046} 1432}
1047 1433
1434#if EV_USE_INOTIFY
1048void inline_size infy_fork (EV_P); 1435void inline_size infy_fork (EV_P);
1436#endif
1049 1437
1050void inline_size 1438void inline_size
1051loop_fork (EV_P) 1439loop_fork (EV_P)
1052{ 1440{
1053#if EV_USE_PORT 1441#if EV_USE_PORT
… …
1061#endif 1449#endif
1062#if EV_USE_INOTIFY 1450#if EV_USE_INOTIFY
1063 infy_fork (EV_A); 1451 infy_fork (EV_A);
1064#endif 1452#endif
1065 1453
1066 if (ev_is_active (&sigev)) 1454 if (ev_is_active (&pipeev))
1067 { 1455 {
1068 /* default loop */ 1456 /* this "locks" the handlers against writing to the pipe */
1457 /* while we modify the fd vars */
1458 gotsig = 1;
1459#if EV_ASYNC_ENABLE
1460 gotasync = 1;
1461#endif
1069 1462
1070 ev_ref (EV_A); 1463 ev_ref (EV_A);
1071 ev_io_stop (EV_A_ &sigev); 1464 ev_io_stop (EV_A_ &pipeev);
1465
1466#if EV_USE_EVENTFD
1467 if (evfd >= 0)
1468 close (evfd);
1469#endif
1470
1471 if (evpipe [0] >= 0)
1472 {
1072 close (sigpipe [0]); 1473 close (evpipe [0]);
1073 close (sigpipe [1]); 1474 close (evpipe [1]);
1475 }
1074 1476
1075 while (pipe (sigpipe))
1076 syserr ("(libev) error creating pipe");
1077
1078 siginit (EV_A); 1477 evpipe_init (EV_A);
1478 /* now iterate over everything, in case we missed something */
1479 pipecb (EV_A_ &pipeev, EV_READ);
1079 } 1480 }
1080 1481
1081 postfork = 0; 1482 postfork = 0;
1082} 1483}
1083 1484
1084#if EV_MULTIPLICITY 1485#if EV_MULTIPLICITY
1486
1085struct ev_loop * 1487struct ev_loop *
1086ev_loop_new (unsigned int flags) 1488ev_loop_new (unsigned int flags)
1087{ 1489{
1088 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1490 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1089 1491
… …
1105} 1507}
1106 1508
1107void 1509void
1108ev_loop_fork (EV_P) 1510ev_loop_fork (EV_P)
1109{ 1511{
1110 postfork = 1; 1512 postfork = 1; /* must be in line with ev_default_fork */
1111} 1513}
1112 1514
1515#if EV_VERIFY
1516static void noinline
1517verify_watcher (EV_P_ W w)
1518{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520
1521 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523}
1524
1525static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N)
1527{
1528 int i;
1529
1530 for (i = HEAP0; i < N + HEAP0; ++i)
1531 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 }
1538}
1539
1540static void noinline
1541array_verify (EV_P_ W *ws, int cnt)
1542{
1543 while (cnt--)
1544 {
1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]);
1547 }
1548}
1549#endif
1550
1551void
1552ev_loop_verify (EV_P)
1553{
1554#if EV_VERIFY
1555 int i;
1556 WL w;
1557
1558 assert (activecnt >= -1);
1559
1560 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1563
1564 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next)
1567 {
1568 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 }
1572
1573 assert (timermax >= timercnt);
1574 verify_heap (EV_A_ timers, timercnt);
1575
1576#if EV_PERIODIC_ENABLE
1577 assert (periodicmax >= periodiccnt);
1578 verify_heap (EV_A_ periodics, periodiccnt);
1579#endif
1580
1581 for (i = NUMPRI; i--; )
1582 {
1583 assert (pendingmax [i] >= pendingcnt [i]);
1584#if EV_IDLE_ENABLE
1585 assert (idleall >= 0);
1586 assert (idlemax [i] >= idlecnt [i]);
1587 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1588#endif
1589 }
1590
1591#if EV_FORK_ENABLE
1592 assert (forkmax >= forkcnt);
1593 array_verify (EV_A_ (W *)forks, forkcnt);
1594#endif
1595
1596#if EV_ASYNC_ENABLE
1597 assert (asyncmax >= asynccnt);
1598 array_verify (EV_A_ (W *)asyncs, asynccnt);
1599#endif
1600
1601 assert (preparemax >= preparecnt);
1602 array_verify (EV_A_ (W *)prepares, preparecnt);
1603
1604 assert (checkmax >= checkcnt);
1605 array_verify (EV_A_ (W *)checks, checkcnt);
1606
1607# if 0
1608 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1609 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1113#endif 1610# endif
1611#endif
1612}
1613
1614#endif /* multiplicity */
1114 1615
1115#if EV_MULTIPLICITY 1616#if EV_MULTIPLICITY
1116struct ev_loop * 1617struct ev_loop *
1117ev_default_loop_init (unsigned int flags) 1618ev_default_loop_init (unsigned int flags)
1118#else 1619#else
1119int 1620int
1120ev_default_loop (unsigned int flags) 1621ev_default_loop (unsigned int flags)
1121#endif 1622#endif
1122{ 1623{
1123 if (sigpipe [0] == sigpipe [1])
1124 if (pipe (sigpipe))
1125 return 0;
1126
1127 if (!ev_default_loop_ptr) 1624 if (!ev_default_loop_ptr)
1128 { 1625 {
1129#if EV_MULTIPLICITY 1626#if EV_MULTIPLICITY
1130 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1627 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1131#else 1628#else
… …
1134 1631
1135 loop_init (EV_A_ flags); 1632 loop_init (EV_A_ flags);
1136 1633
1137 if (ev_backend (EV_A)) 1634 if (ev_backend (EV_A))
1138 { 1635 {
1139 siginit (EV_A);
1140
1141#ifndef _WIN32 1636#ifndef _WIN32
1142 ev_signal_init (&childev, childcb, SIGCHLD); 1637 ev_signal_init (&childev, childcb, SIGCHLD);
1143 ev_set_priority (&childev, EV_MAXPRI); 1638 ev_set_priority (&childev, EV_MAXPRI);
1144 ev_signal_start (EV_A_ &childev); 1639 ev_signal_start (EV_A_ &childev);
1145 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1640 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1162#ifndef _WIN32 1657#ifndef _WIN32
1163 ev_ref (EV_A); /* child watcher */ 1658 ev_ref (EV_A); /* child watcher */
1164 ev_signal_stop (EV_A_ &childev); 1659 ev_signal_stop (EV_A_ &childev);
1165#endif 1660#endif
1166 1661
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); 1662 loop_destroy (EV_A);
1174} 1663}
1175 1664
1176void 1665void
1177ev_default_fork (void) 1666ev_default_fork (void)
… …
1179#if EV_MULTIPLICITY 1668#if EV_MULTIPLICITY
1180 struct ev_loop *loop = ev_default_loop_ptr; 1669 struct ev_loop *loop = ev_default_loop_ptr;
1181#endif 1670#endif
1182 1671
1183 if (backend) 1672 if (backend)
1184 postfork = 1; 1673 postfork = 1; /* must be in line with ev_loop_fork */
1185} 1674}
1186 1675
1187/*****************************************************************************/ 1676/*****************************************************************************/
1188 1677
1189void 1678void
… …
1206 { 1695 {
1207 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1208 1697
1209 p->w->pending = 0; 1698 p->w->pending = 0;
1210 EV_CB_INVOKE (p->w, p->events); 1699 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK;
1211 } 1701 }
1212 } 1702 }
1213} 1703}
1214
1215void inline_size
1216timers_reify (EV_P)
1217{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 {
1220 ev_timer *w = 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 ((WT *)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 = 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 ((WT *)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 ((WT *)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 = 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 ((WT *)periodics, periodiccnt, i);
1292}
1293#endif
1294 1704
1295#if EV_IDLE_ENABLE 1705#if EV_IDLE_ENABLE
1296void inline_size 1706void inline_size
1297idle_reify (EV_P) 1707idle_reify (EV_P)
1298{ 1708{
… …
1310 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1720 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1311 break; 1721 break;
1312 } 1722 }
1313 } 1723 }
1314 } 1724 }
1725}
1726#endif
1727
1728void inline_size
1729timers_reify (EV_P)
1730{
1731 EV_FREQUENT_CHECK;
1732
1733 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1734 {
1735 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1736
1737 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1738
1739 /* first reschedule or stop timer */
1740 if (w->repeat)
1741 {
1742 ev_at (w) += w->repeat;
1743 if (ev_at (w) < mn_now)
1744 ev_at (w) = mn_now;
1745
1746 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1747
1748 ANHE_at_cache (timers [HEAP0]);
1749 downheap (timers, timercnt, HEAP0);
1750 }
1751 else
1752 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1753
1754 EV_FREQUENT_CHECK;
1755 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1756 }
1757}
1758
1759#if EV_PERIODIC_ENABLE
1760void inline_size
1761periodics_reify (EV_P)
1762{
1763 EV_FREQUENT_CHECK;
1764
1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1766 {
1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1768
1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1770
1771 /* first reschedule or stop timer */
1772 if (w->reschedule_cb)
1773 {
1774 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1775
1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1777
1778 ANHE_at_cache (periodics [HEAP0]);
1779 downheap (periodics, periodiccnt, HEAP0);
1780 }
1781 else if (w->interval)
1782 {
1783 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1784 /* if next trigger time is not sufficiently in the future, put it there */
1785 /* this might happen because of floating point inexactness */
1786 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1787 {
1788 ev_at (w) += w->interval;
1789
1790 /* if interval is unreasonably low we might still have a time in the past */
1791 /* so correct this. this will make the periodic very inexact, but the user */
1792 /* has effectively asked to get triggered more often than possible */
1793 if (ev_at (w) < ev_rt_now)
1794 ev_at (w) = ev_rt_now;
1795 }
1796
1797 ANHE_at_cache (periodics [HEAP0]);
1798 downheap (periodics, periodiccnt, HEAP0);
1799 }
1800 else
1801 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1802
1803 EV_FREQUENT_CHECK;
1804 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1805 }
1806}
1807
1808static void noinline
1809periodics_reschedule (EV_P)
1810{
1811 int i;
1812
1813 /* adjust periodics after time jump */
1814 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
1815 {
1816 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
1817
1818 if (w->reschedule_cb)
1819 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1820 else if (w->interval)
1821 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1822
1823 ANHE_at_cache (periodics [i]);
1824 }
1825
1826 reheap (periodics, periodiccnt);
1315} 1827}
1316#endif 1828#endif
1317 1829
1318void inline_speed 1830void inline_speed
1319time_update (EV_P_ ev_tstamp max_block) 1831time_update (EV_P_ ev_tstamp max_block)
… …
1348 */ 1860 */
1349 for (i = 4; --i; ) 1861 for (i = 4; --i; )
1350 { 1862 {
1351 rtmn_diff = ev_rt_now - mn_now; 1863 rtmn_diff = ev_rt_now - mn_now;
1352 1864
1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1865 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1354 return; /* all is well */ 1866 return; /* all is well */
1355 1867
1356 ev_rt_now = ev_time (); 1868 ev_rt_now = ev_time ();
1357 mn_now = get_clock (); 1869 mn_now = get_clock ();
1358 now_floor = mn_now; 1870 now_floor = mn_now;
… …
1374#if EV_PERIODIC_ENABLE 1886#if EV_PERIODIC_ENABLE
1375 periodics_reschedule (EV_A); 1887 periodics_reschedule (EV_A);
1376#endif 1888#endif
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1889 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1890 for (i = 0; i < timercnt; ++i)
1891 {
1892 ANHE *he = timers + i + HEAP0;
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1893 ANHE_w (*he)->at += ev_rt_now - mn_now;
1894 ANHE_at_cache (*he);
1895 }
1380 } 1896 }
1381 1897
1382 mn_now = ev_rt_now; 1898 mn_now = ev_rt_now;
1383 } 1899 }
1384} 1900}
… …
1398static int loop_done; 1914static int loop_done;
1399 1915
1400void 1916void
1401ev_loop (EV_P_ int flags) 1917ev_loop (EV_P_ int flags)
1402{ 1918{
1403 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1919 loop_done = EVUNLOOP_CANCEL;
1404 ? EVUNLOOP_ONE
1405 : EVUNLOOP_CANCEL;
1406 1920
1407 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1921 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1408 1922
1409 do 1923 do
1410 { 1924 {
1925#if EV_VERIFY >= 2
1926 ev_loop_verify (EV_A);
1927#endif
1928
1411#ifndef _WIN32 1929#ifndef _WIN32
1412 if (expect_false (curpid)) /* penalise the forking check even more */ 1930 if (expect_false (curpid)) /* penalise the forking check even more */
1413 if (expect_false (getpid () != curpid)) 1931 if (expect_false (getpid () != curpid))
1414 { 1932 {
1415 curpid = getpid (); 1933 curpid = getpid ();
… …
1444 /* update fd-related kernel structures */ 1962 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1963 fd_reify (EV_A);
1446 1964
1447 /* calculate blocking time */ 1965 /* calculate blocking time */
1448 { 1966 {
1449 ev_tstamp block; 1967 ev_tstamp waittime = 0.;
1968 ev_tstamp sleeptime = 0.;
1450 1969
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1970 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1971 {
1455 /* update time to cancel out callback processing overhead */ 1972 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1973 time_update (EV_A_ 1e100);
1457 1974
1458 block = MAX_BLOCKTIME; 1975 waittime = MAX_BLOCKTIME;
1459 1976
1460 if (timercnt) 1977 if (timercnt)
1461 { 1978 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1979 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1463 if (block > to) block = to; 1980 if (waittime > to) waittime = to;
1464 } 1981 }
1465 1982
1466#if EV_PERIODIC_ENABLE 1983#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1984 if (periodiccnt)
1468 { 1985 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1986 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1987 if (waittime > to) waittime = to;
1471 } 1988 }
1472#endif 1989#endif
1473 1990
1474 if (expect_false (block < 0.)) block = 0.; 1991 if (expect_false (waittime < timeout_blocktime))
1992 waittime = timeout_blocktime;
1993
1994 sleeptime = waittime - backend_fudge;
1995
1996 if (expect_true (sleeptime > io_blocktime))
1997 sleeptime = io_blocktime;
1998
1999 if (sleeptime)
2000 {
2001 ev_sleep (sleeptime);
2002 waittime -= sleeptime;
2003 }
1475 } 2004 }
1476 2005
1477 ++loop_count; 2006 ++loop_count;
1478 backend_poll (EV_A_ block); 2007 backend_poll (EV_A_ waittime);
1479 2008
1480 /* update ev_rt_now, do magic */ 2009 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 2010 time_update (EV_A_ waittime + sleeptime);
1482 } 2011 }
1483 2012
1484 /* queue pending timers and reschedule them */ 2013 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 2014 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 2015#if EV_PERIODIC_ENABLE
… …
1495 /* queue check watchers, to be executed first */ 2024 /* queue check watchers, to be executed first */
1496 if (expect_false (checkcnt)) 2025 if (expect_false (checkcnt))
1497 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2026 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1498 2027
1499 call_pending (EV_A); 2028 call_pending (EV_A);
1500
1501 } 2029 }
1502 while (expect_true (activecnt && !loop_done)); 2030 while (expect_true (
2031 activecnt
2032 && !loop_done
2033 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2034 ));
1503 2035
1504 if (loop_done == EVUNLOOP_ONE) 2036 if (loop_done == EVUNLOOP_ONE)
1505 loop_done = EVUNLOOP_CANCEL; 2037 loop_done = EVUNLOOP_CANCEL;
1506} 2038}
1507 2039
… …
1596 if (expect_false (ev_is_active (w))) 2128 if (expect_false (ev_is_active (w)))
1597 return; 2129 return;
1598 2130
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 2131 assert (("ev_io_start called with negative fd", fd >= 0));
1600 2132
2133 EV_FREQUENT_CHECK;
2134
1601 ev_start (EV_A_ (W)w, 1); 2135 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2136 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 2137 wlist_add (&anfds[fd].head, (WL)w);
1604 2138
1605 fd_change (EV_A_ fd); 2139 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2140 w->events &= ~EV_IOFDSET;
2141
2142 EV_FREQUENT_CHECK;
1606} 2143}
1607 2144
1608void noinline 2145void noinline
1609ev_io_stop (EV_P_ ev_io *w) 2146ev_io_stop (EV_P_ ev_io *w)
1610{ 2147{
1611 clear_pending (EV_A_ (W)w); 2148 clear_pending (EV_A_ (W)w);
1612 if (expect_false (!ev_is_active (w))) 2149 if (expect_false (!ev_is_active (w)))
1613 return; 2150 return;
1614 2151
1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2152 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1616 2153
2154 EV_FREQUENT_CHECK;
2155
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 2156 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 2157 ev_stop (EV_A_ (W)w);
1619 2158
1620 fd_change (EV_A_ w->fd); 2159 fd_change (EV_A_ w->fd, 1);
2160
2161 EV_FREQUENT_CHECK;
1621} 2162}
1622 2163
1623void noinline 2164void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 2165ev_timer_start (EV_P_ ev_timer *w)
1625{ 2166{
1626 if (expect_false (ev_is_active (w))) 2167 if (expect_false (ev_is_active (w)))
1627 return; 2168 return;
1628 2169
1629 ((WT)w)->at += mn_now; 2170 ev_at (w) += mn_now;
1630 2171
1631 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2172 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1632 2173
2174 EV_FREQUENT_CHECK;
2175
2176 ++timercnt;
1633 ev_start (EV_A_ (W)w, ++timercnt); 2177 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 2178 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1635 timers [timercnt - 1] = w; 2179 ANHE_w (timers [ev_active (w)]) = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 2180 ANHE_at_cache (timers [ev_active (w)]);
2181 upheap (timers, ev_active (w));
1637 2182
2183 EV_FREQUENT_CHECK;
2184
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 2185 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1639} 2186}
1640 2187
1641void noinline 2188void noinline
1642ev_timer_stop (EV_P_ ev_timer *w) 2189ev_timer_stop (EV_P_ ev_timer *w)
1643{ 2190{
1644 clear_pending (EV_A_ (W)w); 2191 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 2192 if (expect_false (!ev_is_active (w)))
1646 return; 2193 return;
1647 2194
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 2195 EV_FREQUENT_CHECK;
1649 2196
1650 { 2197 {
1651 int active = ((W)w)->active; 2198 int active = ev_active (w);
1652 2199
2200 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2201
2202 --timercnt;
2203
1653 if (expect_true (--active < --timercnt)) 2204 if (expect_true (active < timercnt + HEAP0))
1654 { 2205 {
1655 timers [active] = timers [timercnt]; 2206 timers [active] = timers [timercnt + HEAP0];
1656 adjustheap ((WT *)timers, timercnt, active); 2207 adjustheap (timers, timercnt, active);
1657 } 2208 }
1658 } 2209 }
1659 2210
1660 ((WT)w)->at -= mn_now; 2211 EV_FREQUENT_CHECK;
2212
2213 ev_at (w) -= mn_now;
1661 2214
1662 ev_stop (EV_A_ (W)w); 2215 ev_stop (EV_A_ (W)w);
1663} 2216}
1664 2217
1665void noinline 2218void noinline
1666ev_timer_again (EV_P_ ev_timer *w) 2219ev_timer_again (EV_P_ ev_timer *w)
1667{ 2220{
2221 EV_FREQUENT_CHECK;
2222
1668 if (ev_is_active (w)) 2223 if (ev_is_active (w))
1669 { 2224 {
1670 if (w->repeat) 2225 if (w->repeat)
1671 { 2226 {
1672 ((WT)w)->at = mn_now + w->repeat; 2227 ev_at (w) = mn_now + w->repeat;
2228 ANHE_at_cache (timers [ev_active (w)]);
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2229 adjustheap (timers, timercnt, ev_active (w));
1674 } 2230 }
1675 else 2231 else
1676 ev_timer_stop (EV_A_ w); 2232 ev_timer_stop (EV_A_ w);
1677 } 2233 }
1678 else if (w->repeat) 2234 else if (w->repeat)
1679 { 2235 {
1680 w->at = w->repeat; 2236 ev_at (w) = w->repeat;
1681 ev_timer_start (EV_A_ w); 2237 ev_timer_start (EV_A_ w);
1682 } 2238 }
2239
2240 EV_FREQUENT_CHECK;
1683} 2241}
1684 2242
1685#if EV_PERIODIC_ENABLE 2243#if EV_PERIODIC_ENABLE
1686void noinline 2244void noinline
1687ev_periodic_start (EV_P_ ev_periodic *w) 2245ev_periodic_start (EV_P_ ev_periodic *w)
1688{ 2246{
1689 if (expect_false (ev_is_active (w))) 2247 if (expect_false (ev_is_active (w)))
1690 return; 2248 return;
1691 2249
1692 if (w->reschedule_cb) 2250 if (w->reschedule_cb)
1693 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2251 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1694 else if (w->interval) 2252 else if (w->interval)
1695 { 2253 {
1696 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2254 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1697 /* this formula differs from the one in periodic_reify because we do not always round up */ 2255 /* this formula differs from the one in periodic_reify because we do not always round up */
1698 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2256 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1699 } 2257 }
1700 else 2258 else
1701 ((WT)w)->at = w->offset; 2259 ev_at (w) = w->offset;
1702 2260
2261 EV_FREQUENT_CHECK;
2262
2263 ++periodiccnt;
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 2264 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2265 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 2266 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 2267 ANHE_at_cache (periodics [ev_active (w)]);
2268 upheap (periodics, ev_active (w));
1707 2269
2270 EV_FREQUENT_CHECK;
2271
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2272 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1709} 2273}
1710 2274
1711void noinline 2275void noinline
1712ev_periodic_stop (EV_P_ ev_periodic *w) 2276ev_periodic_stop (EV_P_ ev_periodic *w)
1713{ 2277{
1714 clear_pending (EV_A_ (W)w); 2278 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 2279 if (expect_false (!ev_is_active (w)))
1716 return; 2280 return;
1717 2281
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 2282 EV_FREQUENT_CHECK;
1719 2283
1720 { 2284 {
1721 int active = ((W)w)->active; 2285 int active = ev_active (w);
1722 2286
2287 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2288
2289 --periodiccnt;
2290
1723 if (expect_true (--active < --periodiccnt)) 2291 if (expect_true (active < periodiccnt + HEAP0))
1724 { 2292 {
1725 periodics [active] = periodics [periodiccnt]; 2293 periodics [active] = periodics [periodiccnt + HEAP0];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 2294 adjustheap (periodics, periodiccnt, active);
1727 } 2295 }
1728 } 2296 }
2297
2298 EV_FREQUENT_CHECK;
1729 2299
1730 ev_stop (EV_A_ (W)w); 2300 ev_stop (EV_A_ (W)w);
1731} 2301}
1732 2302
1733void noinline 2303void noinline
… …
1751#endif 2321#endif
1752 if (expect_false (ev_is_active (w))) 2322 if (expect_false (ev_is_active (w)))
1753 return; 2323 return;
1754 2324
1755 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2325 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2326
2327 evpipe_init (EV_A);
2328
2329 EV_FREQUENT_CHECK;
1756 2330
1757 { 2331 {
1758#ifndef _WIN32 2332#ifndef _WIN32
1759 sigset_t full, prev; 2333 sigset_t full, prev;
1760 sigfillset (&full); 2334 sigfillset (&full);
… …
1767 sigprocmask (SIG_SETMASK, &prev, 0); 2341 sigprocmask (SIG_SETMASK, &prev, 0);
1768#endif 2342#endif
1769 } 2343 }
1770 2344
1771 ev_start (EV_A_ (W)w, 1); 2345 ev_start (EV_A_ (W)w, 1);
1772 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2346 wlist_add (&signals [w->signum - 1].head, (WL)w);
1773 2347
1774 if (!((WL)w)->next) 2348 if (!((WL)w)->next)
1775 { 2349 {
1776#if _WIN32 2350#if _WIN32
1777 signal (w->signum, sighandler); 2351 signal (w->signum, ev_sighandler);
1778#else 2352#else
1779 struct sigaction sa; 2353 struct sigaction sa;
1780 sa.sa_handler = sighandler; 2354 sa.sa_handler = ev_sighandler;
1781 sigfillset (&sa.sa_mask); 2355 sigfillset (&sa.sa_mask);
1782 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2356 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1783 sigaction (w->signum, &sa, 0); 2357 sigaction (w->signum, &sa, 0);
1784#endif 2358#endif
1785 } 2359 }
2360
2361 EV_FREQUENT_CHECK;
1786} 2362}
1787 2363
1788void noinline 2364void noinline
1789ev_signal_stop (EV_P_ ev_signal *w) 2365ev_signal_stop (EV_P_ ev_signal *w)
1790{ 2366{
1791 clear_pending (EV_A_ (W)w); 2367 clear_pending (EV_A_ (W)w);
1792 if (expect_false (!ev_is_active (w))) 2368 if (expect_false (!ev_is_active (w)))
1793 return; 2369 return;
1794 2370
2371 EV_FREQUENT_CHECK;
2372
1795 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2373 wlist_del (&signals [w->signum - 1].head, (WL)w);
1796 ev_stop (EV_A_ (W)w); 2374 ev_stop (EV_A_ (W)w);
1797 2375
1798 if (!signals [w->signum - 1].head) 2376 if (!signals [w->signum - 1].head)
1799 signal (w->signum, SIG_DFL); 2377 signal (w->signum, SIG_DFL);
2378
2379 EV_FREQUENT_CHECK;
1800} 2380}
1801 2381
1802void 2382void
1803ev_child_start (EV_P_ ev_child *w) 2383ev_child_start (EV_P_ ev_child *w)
1804{ 2384{
… …
1806 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2386 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1807#endif 2387#endif
1808 if (expect_false (ev_is_active (w))) 2388 if (expect_false (ev_is_active (w)))
1809 return; 2389 return;
1810 2390
2391 EV_FREQUENT_CHECK;
2392
1811 ev_start (EV_A_ (W)w, 1); 2393 ev_start (EV_A_ (W)w, 1);
1812 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2394 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2395
2396 EV_FREQUENT_CHECK;
1813} 2397}
1814 2398
1815void 2399void
1816ev_child_stop (EV_P_ ev_child *w) 2400ev_child_stop (EV_P_ ev_child *w)
1817{ 2401{
1818 clear_pending (EV_A_ (W)w); 2402 clear_pending (EV_A_ (W)w);
1819 if (expect_false (!ev_is_active (w))) 2403 if (expect_false (!ev_is_active (w)))
1820 return; 2404 return;
1821 2405
2406 EV_FREQUENT_CHECK;
2407
1822 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2408 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1823 ev_stop (EV_A_ (W)w); 2409 ev_stop (EV_A_ (W)w);
2410
2411 EV_FREQUENT_CHECK;
1824} 2412}
1825 2413
1826#if EV_STAT_ENABLE 2414#if EV_STAT_ENABLE
1827 2415
1828# ifdef _WIN32 2416# ifdef _WIN32
… …
1846 if (w->wd < 0) 2434 if (w->wd < 0)
1847 { 2435 {
1848 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2436 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1849 2437
1850 /* monitor some parent directory for speedup hints */ 2438 /* monitor some parent directory for speedup hints */
2439 /* note that exceeding the hardcoded limit is not a correctness issue, */
2440 /* but an efficiency issue only */
1851 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2441 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1852 { 2442 {
1853 char path [4096]; 2443 char path [4096];
1854 strcpy (path, w->path); 2444 strcpy (path, w->path);
1855 2445
… …
1981 } 2571 }
1982 2572
1983 } 2573 }
1984} 2574}
1985 2575
2576#endif
2577
2578#ifdef _WIN32
2579# define EV_LSTAT(p,b) _stati64 (p, b)
2580#else
2581# define EV_LSTAT(p,b) lstat (p, b)
1986#endif 2582#endif
1987 2583
1988void 2584void
1989ev_stat_stat (EV_P_ ev_stat *w) 2585ev_stat_stat (EV_P_ ev_stat *w)
1990{ 2586{
… …
2054 else 2650 else
2055#endif 2651#endif
2056 ev_timer_start (EV_A_ &w->timer); 2652 ev_timer_start (EV_A_ &w->timer);
2057 2653
2058 ev_start (EV_A_ (W)w, 1); 2654 ev_start (EV_A_ (W)w, 1);
2655
2656 EV_FREQUENT_CHECK;
2059} 2657}
2060 2658
2061void 2659void
2062ev_stat_stop (EV_P_ ev_stat *w) 2660ev_stat_stop (EV_P_ ev_stat *w)
2063{ 2661{
2064 clear_pending (EV_A_ (W)w); 2662 clear_pending (EV_A_ (W)w);
2065 if (expect_false (!ev_is_active (w))) 2663 if (expect_false (!ev_is_active (w)))
2066 return; 2664 return;
2067 2665
2666 EV_FREQUENT_CHECK;
2667
2068#if EV_USE_INOTIFY 2668#if EV_USE_INOTIFY
2069 infy_del (EV_A_ w); 2669 infy_del (EV_A_ w);
2070#endif 2670#endif
2071 ev_timer_stop (EV_A_ &w->timer); 2671 ev_timer_stop (EV_A_ &w->timer);
2072 2672
2073 ev_stop (EV_A_ (W)w); 2673 ev_stop (EV_A_ (W)w);
2674
2675 EV_FREQUENT_CHECK;
2074} 2676}
2075#endif 2677#endif
2076 2678
2077#if EV_IDLE_ENABLE 2679#if EV_IDLE_ENABLE
2078void 2680void
… …
2080{ 2682{
2081 if (expect_false (ev_is_active (w))) 2683 if (expect_false (ev_is_active (w)))
2082 return; 2684 return;
2083 2685
2084 pri_adjust (EV_A_ (W)w); 2686 pri_adjust (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2085 2689
2086 { 2690 {
2087 int active = ++idlecnt [ABSPRI (w)]; 2691 int active = ++idlecnt [ABSPRI (w)];
2088 2692
2089 ++idleall; 2693 ++idleall;
2090 ev_start (EV_A_ (W)w, active); 2694 ev_start (EV_A_ (W)w, active);
2091 2695
2092 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2696 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2093 idles [ABSPRI (w)][active - 1] = w; 2697 idles [ABSPRI (w)][active - 1] = w;
2094 } 2698 }
2699
2700 EV_FREQUENT_CHECK;
2095} 2701}
2096 2702
2097void 2703void
2098ev_idle_stop (EV_P_ ev_idle *w) 2704ev_idle_stop (EV_P_ ev_idle *w)
2099{ 2705{
2100 clear_pending (EV_A_ (W)w); 2706 clear_pending (EV_A_ (W)w);
2101 if (expect_false (!ev_is_active (w))) 2707 if (expect_false (!ev_is_active (w)))
2102 return; 2708 return;
2103 2709
2710 EV_FREQUENT_CHECK;
2711
2104 { 2712 {
2105 int active = ((W)w)->active; 2713 int active = ev_active (w);
2106 2714
2107 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2715 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2108 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2716 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2109 2717
2110 ev_stop (EV_A_ (W)w); 2718 ev_stop (EV_A_ (W)w);
2111 --idleall; 2719 --idleall;
2112 } 2720 }
2721
2722 EV_FREQUENT_CHECK;
2113} 2723}
2114#endif 2724#endif
2115 2725
2116void 2726void
2117ev_prepare_start (EV_P_ ev_prepare *w) 2727ev_prepare_start (EV_P_ ev_prepare *w)
2118{ 2728{
2119 if (expect_false (ev_is_active (w))) 2729 if (expect_false (ev_is_active (w)))
2120 return; 2730 return;
2731
2732 EV_FREQUENT_CHECK;
2121 2733
2122 ev_start (EV_A_ (W)w, ++preparecnt); 2734 ev_start (EV_A_ (W)w, ++preparecnt);
2123 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2735 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2124 prepares [preparecnt - 1] = w; 2736 prepares [preparecnt - 1] = w;
2737
2738 EV_FREQUENT_CHECK;
2125} 2739}
2126 2740
2127void 2741void
2128ev_prepare_stop (EV_P_ ev_prepare *w) 2742ev_prepare_stop (EV_P_ ev_prepare *w)
2129{ 2743{
2130 clear_pending (EV_A_ (W)w); 2744 clear_pending (EV_A_ (W)w);
2131 if (expect_false (!ev_is_active (w))) 2745 if (expect_false (!ev_is_active (w)))
2132 return; 2746 return;
2133 2747
2748 EV_FREQUENT_CHECK;
2749
2134 { 2750 {
2135 int active = ((W)w)->active; 2751 int active = ev_active (w);
2752
2136 prepares [active - 1] = prepares [--preparecnt]; 2753 prepares [active - 1] = prepares [--preparecnt];
2137 ((W)prepares [active - 1])->active = active; 2754 ev_active (prepares [active - 1]) = active;
2138 } 2755 }
2139 2756
2140 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2758
2759 EV_FREQUENT_CHECK;
2141} 2760}
2142 2761
2143void 2762void
2144ev_check_start (EV_P_ ev_check *w) 2763ev_check_start (EV_P_ ev_check *w)
2145{ 2764{
2146 if (expect_false (ev_is_active (w))) 2765 if (expect_false (ev_is_active (w)))
2147 return; 2766 return;
2767
2768 EV_FREQUENT_CHECK;
2148 2769
2149 ev_start (EV_A_ (W)w, ++checkcnt); 2770 ev_start (EV_A_ (W)w, ++checkcnt);
2150 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2771 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2151 checks [checkcnt - 1] = w; 2772 checks [checkcnt - 1] = w;
2773
2774 EV_FREQUENT_CHECK;
2152} 2775}
2153 2776
2154void 2777void
2155ev_check_stop (EV_P_ ev_check *w) 2778ev_check_stop (EV_P_ ev_check *w)
2156{ 2779{
2157 clear_pending (EV_A_ (W)w); 2780 clear_pending (EV_A_ (W)w);
2158 if (expect_false (!ev_is_active (w))) 2781 if (expect_false (!ev_is_active (w)))
2159 return; 2782 return;
2160 2783
2784 EV_FREQUENT_CHECK;
2785
2161 { 2786 {
2162 int active = ((W)w)->active; 2787 int active = ev_active (w);
2788
2163 checks [active - 1] = checks [--checkcnt]; 2789 checks [active - 1] = checks [--checkcnt];
2164 ((W)checks [active - 1])->active = active; 2790 ev_active (checks [active - 1]) = active;
2165 } 2791 }
2166 2792
2167 ev_stop (EV_A_ (W)w); 2793 ev_stop (EV_A_ (W)w);
2794
2795 EV_FREQUENT_CHECK;
2168} 2796}
2169 2797
2170#if EV_EMBED_ENABLE 2798#if EV_EMBED_ENABLE
2171void noinline 2799void noinline
2172ev_embed_sweep (EV_P_ ev_embed *w) 2800ev_embed_sweep (EV_P_ ev_embed *w)
2173{ 2801{
2174 ev_loop (w->loop, EVLOOP_NONBLOCK); 2802 ev_loop (w->other, EVLOOP_NONBLOCK);
2175} 2803}
2176 2804
2177static void 2805static void
2178embed_cb (EV_P_ ev_io *io, int revents) 2806embed_io_cb (EV_P_ ev_io *io, int revents)
2179{ 2807{
2180 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2808 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2181 2809
2182 if (ev_cb (w)) 2810 if (ev_cb (w))
2183 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2811 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2184 else 2812 else
2185 ev_embed_sweep (loop, w); 2813 ev_loop (w->other, EVLOOP_NONBLOCK);
2186} 2814}
2815
2816static void
2817embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2818{
2819 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2820
2821 {
2822 struct ev_loop *loop = w->other;
2823
2824 while (fdchangecnt)
2825 {
2826 fd_reify (EV_A);
2827 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2828 }
2829 }
2830}
2831
2832#if 0
2833static void
2834embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2835{
2836 ev_idle_stop (EV_A_ idle);
2837}
2838#endif
2187 2839
2188void 2840void
2189ev_embed_start (EV_P_ ev_embed *w) 2841ev_embed_start (EV_P_ ev_embed *w)
2190{ 2842{
2191 if (expect_false (ev_is_active (w))) 2843 if (expect_false (ev_is_active (w)))
2192 return; 2844 return;
2193 2845
2194 { 2846 {
2195 struct ev_loop *loop = w->loop; 2847 struct ev_loop *loop = w->other;
2196 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2848 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2197 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2849 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2198 } 2850 }
2851
2852 EV_FREQUENT_CHECK;
2199 2853
2200 ev_set_priority (&w->io, ev_priority (w)); 2854 ev_set_priority (&w->io, ev_priority (w));
2201 ev_io_start (EV_A_ &w->io); 2855 ev_io_start (EV_A_ &w->io);
2202 2856
2857 ev_prepare_init (&w->prepare, embed_prepare_cb);
2858 ev_set_priority (&w->prepare, EV_MINPRI);
2859 ev_prepare_start (EV_A_ &w->prepare);
2860
2861 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2862
2203 ev_start (EV_A_ (W)w, 1); 2863 ev_start (EV_A_ (W)w, 1);
2864
2865 EV_FREQUENT_CHECK;
2204} 2866}
2205 2867
2206void 2868void
2207ev_embed_stop (EV_P_ ev_embed *w) 2869ev_embed_stop (EV_P_ ev_embed *w)
2208{ 2870{
2209 clear_pending (EV_A_ (W)w); 2871 clear_pending (EV_A_ (W)w);
2210 if (expect_false (!ev_is_active (w))) 2872 if (expect_false (!ev_is_active (w)))
2211 return; 2873 return;
2212 2874
2875 EV_FREQUENT_CHECK;
2876
2213 ev_io_stop (EV_A_ &w->io); 2877 ev_io_stop (EV_A_ &w->io);
2878 ev_prepare_stop (EV_A_ &w->prepare);
2214 2879
2215 ev_stop (EV_A_ (W)w); 2880 ev_stop (EV_A_ (W)w);
2881
2882 EV_FREQUENT_CHECK;
2216} 2883}
2217#endif 2884#endif
2218 2885
2219#if EV_FORK_ENABLE 2886#if EV_FORK_ENABLE
2220void 2887void
2221ev_fork_start (EV_P_ ev_fork *w) 2888ev_fork_start (EV_P_ ev_fork *w)
2222{ 2889{
2223 if (expect_false (ev_is_active (w))) 2890 if (expect_false (ev_is_active (w)))
2224 return; 2891 return;
2892
2893 EV_FREQUENT_CHECK;
2225 2894
2226 ev_start (EV_A_ (W)w, ++forkcnt); 2895 ev_start (EV_A_ (W)w, ++forkcnt);
2227 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 2896 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2228 forks [forkcnt - 1] = w; 2897 forks [forkcnt - 1] = w;
2898
2899 EV_FREQUENT_CHECK;
2229} 2900}
2230 2901
2231void 2902void
2232ev_fork_stop (EV_P_ ev_fork *w) 2903ev_fork_stop (EV_P_ ev_fork *w)
2233{ 2904{
2234 clear_pending (EV_A_ (W)w); 2905 clear_pending (EV_A_ (W)w);
2235 if (expect_false (!ev_is_active (w))) 2906 if (expect_false (!ev_is_active (w)))
2236 return; 2907 return;
2237 2908
2909 EV_FREQUENT_CHECK;
2910
2238 { 2911 {
2239 int active = ((W)w)->active; 2912 int active = ev_active (w);
2913
2240 forks [active - 1] = forks [--forkcnt]; 2914 forks [active - 1] = forks [--forkcnt];
2241 ((W)forks [active - 1])->active = active; 2915 ev_active (forks [active - 1]) = active;
2242 } 2916 }
2243 2917
2244 ev_stop (EV_A_ (W)w); 2918 ev_stop (EV_A_ (W)w);
2919
2920 EV_FREQUENT_CHECK;
2921}
2922#endif
2923
2924#if EV_ASYNC_ENABLE
2925void
2926ev_async_start (EV_P_ ev_async *w)
2927{
2928 if (expect_false (ev_is_active (w)))
2929 return;
2930
2931 evpipe_init (EV_A);
2932
2933 EV_FREQUENT_CHECK;
2934
2935 ev_start (EV_A_ (W)w, ++asynccnt);
2936 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2937 asyncs [asynccnt - 1] = w;
2938
2939 EV_FREQUENT_CHECK;
2940}
2941
2942void
2943ev_async_stop (EV_P_ ev_async *w)
2944{
2945 clear_pending (EV_A_ (W)w);
2946 if (expect_false (!ev_is_active (w)))
2947 return;
2948
2949 EV_FREQUENT_CHECK;
2950
2951 {
2952 int active = ev_active (w);
2953
2954 asyncs [active - 1] = asyncs [--asynccnt];
2955 ev_active (asyncs [active - 1]) = active;
2956 }
2957
2958 ev_stop (EV_A_ (W)w);
2959
2960 EV_FREQUENT_CHECK;
2961}
2962
2963void
2964ev_async_send (EV_P_ ev_async *w)
2965{
2966 w->sent = 1;
2967 evpipe_write (EV_A_ &gotasync);
2245} 2968}
2246#endif 2969#endif
2247 2970
2248/*****************************************************************************/ 2971/*****************************************************************************/
2249 2972
… …
2259once_cb (EV_P_ struct ev_once *once, int revents) 2982once_cb (EV_P_ struct ev_once *once, int revents)
2260{ 2983{
2261 void (*cb)(int revents, void *arg) = once->cb; 2984 void (*cb)(int revents, void *arg) = once->cb;
2262 void *arg = once->arg; 2985 void *arg = once->arg;
2263 2986
2264 ev_io_stop (EV_A_ &once->io); 2987 ev_io_stop (EV_A_ &once->io);
2265 ev_timer_stop (EV_A_ &once->to); 2988 ev_timer_stop (EV_A_ &once->to);
2266 ev_free (once); 2989 ev_free (once);
2267 2990
2268 cb (revents, arg); 2991 cb (revents, arg);
2269} 2992}
… …
2307 ev_timer_set (&once->to, timeout, 0.); 3030 ev_timer_set (&once->to, timeout, 0.);
2308 ev_timer_start (EV_A_ &once->to); 3031 ev_timer_start (EV_A_ &once->to);
2309 } 3032 }
2310} 3033}
2311 3034
3035#if EV_MULTIPLICITY
3036 #include "ev_wrap.h"
3037#endif
3038
2312#ifdef __cplusplus 3039#ifdef __cplusplus
2313} 3040}
2314#endif 3041#endif
2315 3042

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines