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

Comparing libev/ev.c (file contents):
Revision 1.179 by root, Tue Dec 11 21:04:40 2007 UTC vs.
Revision 1.235 by root, Wed May 7 14:45:17 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
51# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 61# define EV_USE_MONOTONIC 0
53# endif 62# endif
54# ifndef EV_USE_REALTIME 63# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 64# define EV_USE_REALTIME 0
65# endif
66# endif
67
68# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1
71# else
72# define EV_USE_NANOSLEEP 0
56# endif 73# endif
57# endif 74# endif
58 75
59# ifndef EV_USE_SELECT 76# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 77# if HAVE_SELECT && HAVE_SYS_SELECT_H
102# else 119# else
103# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
104# endif 121# endif
105# endif 122# endif
106 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
107#endif 132#endif
108 133
109#include <math.h> 134#include <math.h>
110#include <stdlib.h> 135#include <stdlib.h>
111#include <fcntl.h> 136#include <fcntl.h>
136# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
138# endif 163# endif
139#endif 164#endif
140 165
141/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
142 167
143#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
144# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
145#endif 170#endif
146 171
147#ifndef EV_USE_REALTIME 172#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 173# define EV_USE_REALTIME 0
174#endif
175
176#ifndef EV_USE_NANOSLEEP
177# define EV_USE_NANOSLEEP 0
149#endif 178#endif
150 179
151#ifndef EV_USE_SELECT 180#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 181# define EV_USE_SELECT 1
153#endif 182#endif
159# define EV_USE_POLL 1 188# define EV_USE_POLL 1
160# endif 189# endif
161#endif 190#endif
162 191
163#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
164# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
165#endif 198#endif
166 199
167#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
169#endif 202#endif
171#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
172# define EV_USE_PORT 0 205# define EV_USE_PORT 0
173#endif 206#endif
174 207
175#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
176# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
177#endif 214#endif
178 215
179#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL 217# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
190# else 227# else
191# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
192# endif 229# endif
193#endif 230#endif
194 231
195/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 241
197#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
200#endif 245#endif
202#ifndef CLOCK_REALTIME 247#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 248# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 249# define EV_USE_REALTIME 0
205#endif 250#endif
206 251
252#if !EV_STAT_ENABLE
253# undef EV_USE_INOTIFY
254# define EV_USE_INOTIFY 0
255#endif
256
257#if !EV_USE_NANOSLEEP
258# ifndef _WIN32
259# include <sys/select.h>
260# endif
261#endif
262
263#if EV_USE_INOTIFY
264# include <sys/inotify.h>
265#endif
266
207#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 268# include <winsock.h>
209#endif 269#endif
210 270
211#if !EV_STAT_ENABLE 271#if EV_USE_EVENTFD
212# define EV_USE_INOTIFY 0 272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
213#endif 276# endif
214 277int eventfd (unsigned int initval, int flags);
215#if EV_USE_INOTIFY 278# ifdef __cplusplus
216# include <sys/inotify.h> 279}
280# endif
217#endif 281#endif
218 282
219/**/ 283/**/
220 284
221/* 285/*
230 294
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 295#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 296#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 297/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 298
235#if __GNUC__ >= 3 299#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
238#else 302#else
239# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
240# define noinline 304# define noinline
241# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
242# define inline 306# define inline
243# endif 307# endif
244#endif 308#endif
245 309
246#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
261 325
262typedef ev_watcher *W; 326typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
265 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
333#if EV_USE_MONOTONIC
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
335/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
267 338
268#ifdef _WIN32 339#ifdef _WIN32
269# include "ev_win32.c" 340# include "ev_win32.c"
270#endif 341#endif
271 342
292 perror (msg); 363 perror (msg);
293 abort (); 364 abort ();
294 } 365 }
295} 366}
296 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
297static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
298 384
299void 385void
300ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
301{ 387{
302 alloc = cb; 388 alloc = cb;
303} 389}
304 390
305inline_speed void * 391inline_speed void *
306ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
307{ 393{
308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
309 395
310 if (!ptr && size) 396 if (!ptr && size)
311 { 397 {
312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
313 abort (); 399 abort ();
407{ 493{
408 return ev_rt_now; 494 return ev_rt_now;
409} 495}
410#endif 496#endif
411 497
498void
499ev_sleep (ev_tstamp delay)
500{
501 if (delay > 0.)
502 {
503#if EV_USE_NANOSLEEP
504 struct timespec ts;
505
506 ts.tv_sec = (time_t)delay;
507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
508
509 nanosleep (&ts, 0);
510#elif defined(_WIN32)
511 Sleep ((unsigned long)(delay * 1e3));
512#else
513 struct timeval tv;
514
515 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517
518 select (0, 0, 0, 0, &tv);
519#endif
520 }
521}
522
523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
412int inline_size 527int inline_size
413array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
414{ 529{
415 int ncur = cur + 1; 530 int ncur = cur + 1;
416 531
417 do 532 do
418 ncur <<= 1; 533 ncur <<= 1;
419 while (cnt > ncur); 534 while (cnt > ncur);
420 535
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
423 { 538 {
424 ncur *= elem; 539 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
426 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem; 542 ncur /= elem;
428 } 543 }
429 544
430 return ncur; 545 return ncur;
533 { 648 {
534 int fd = fdchanges [i]; 649 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 650 ANFD *anfd = anfds + fd;
536 ev_io *w; 651 ev_io *w;
537 652
538 int events = 0; 653 unsigned char events = 0;
539 654
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 655 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 656 events |= (unsigned char)w->events;
542 657
543#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
544 if (events) 659 if (events)
545 { 660 {
546 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
547 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 668 }
550#endif 669#endif
551 670
671 {
672 unsigned char o_events = anfd->events;
673 unsigned char o_reify = anfd->reify;
674
552 anfd->reify = 0; 675 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 676 anfd->events = events;
677
678 if (o_events != events || o_reify & EV_IOFDSET)
679 backend_modify (EV_A_ fd, o_events, events);
680 }
556 } 681 }
557 682
558 fdchangecnt = 0; 683 fdchangecnt = 0;
559} 684}
560 685
561void inline_size 686void inline_size
562fd_change (EV_P_ int fd) 687fd_change (EV_P_ int fd, int flags)
563{ 688{
564 if (expect_false (anfds [fd].reify)) 689 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 690 anfds [fd].reify |= flags;
568 691
692 if (expect_true (!reify))
693 {
569 ++fdchangecnt; 694 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 695 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 696 fdchanges [fdchangecnt - 1] = fd;
697 }
572} 698}
573 699
574void inline_speed 700void inline_speed
575fd_kill (EV_P_ int fd) 701fd_kill (EV_P_ int fd)
576{ 702{
627 753
628 for (fd = 0; fd < anfdmax; ++fd) 754 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 755 if (anfds [fd].events)
630 { 756 {
631 anfds [fd].events = 0; 757 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 758 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 759 }
634} 760}
635 761
636/*****************************************************************************/ 762/*****************************************************************************/
637 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define HEAP0 3 /* index of first element in heap */
774
775/* towards the root */
638void inline_speed 776void inline_speed
639upheap (WT *heap, int k) 777upheap (WT *heap, int k)
640{ 778{
641 WT w = heap [k]; 779 WT w = heap [k];
642 780
643 while (k) 781 for (;;)
644 { 782 {
645 int p = (k - 1) >> 1; 783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
646 784
647 if (heap [p]->at <= w->at) 785 if (p >= HEAP0 || heap [p]->at <= w->at)
648 break; 786 break;
649 787
650 heap [k] = heap [p]; 788 heap [k] = heap [p];
651 ((W)heap [k])->active = k + 1; 789 ev_active (heap [k]) = k;
652 k = p; 790 k = p;
653 } 791 }
654 792
655 heap [k] = w; 793 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 794 ev_active (heap [k]) = k;
657
658} 795}
659 796
797/* away from the root */
660void inline_speed 798void inline_speed
661downheap (WT *heap, int N, int k) 799downheap (WT *heap, int N, int k)
662{ 800{
663 WT w = heap [k]; 801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
664 803
665 for (;;) 804 for (;;)
666 { 805 {
806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
809
810 // find minimum child
811 if (expect_true (pos +3 < E))
812 {
813 (minpos = pos + 0), (minat = (*minpos)->at);
814 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
815 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
816 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
817 }
818 else
819 {
820 if (pos >= E)
821 break;
822
823 (minpos = pos + 0), (minat = (*minpos)->at);
824 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
825 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
826 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
827 }
828
829 if (w->at <= minat)
830 break;
831
832 ev_active (*minpos) = k;
833 heap [k] = *minpos;
834
835 k = minpos - heap;
836 }
837
838 heap [k] = w;
839 ev_active (heap [k]) = k;
840}
841
842#else // 4HEAP
843
844#define HEAP0 1
845
846/* towards the root */
847void inline_speed
848upheap (WT *heap, int k)
849{
850 WT w = heap [k];
851
852 for (;;)
853 {
854 int p = k >> 1;
855
856 /* maybe we could use a dummy element at heap [0]? */
857 if (!p || heap [p]->at <= w->at)
858 break;
859
860 heap [k] = heap [p];
861 ev_active (heap [k]) = k;
862 k = p;
863 }
864
865 heap [k] = w;
866 ev_active (heap [k]) = k;
867}
868
869/* away from the root */
870void inline_speed
871downheap (WT *heap, int N, int k)
872{
873 WT w = heap [k];
874
875 for (;;)
876 {
667 int c = (k << 1) + 1; 877 int c = k << 1;
668 878
669 if (c >= N) 879 if (c > N)
670 break; 880 break;
671 881
672 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 882 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
673 ? 1 : 0; 883 ? 1 : 0;
674 884
675 if (w->at <= heap [c]->at) 885 if (w->at <= heap [c]->at)
676 break; 886 break;
677 887
678 heap [k] = heap [c]; 888 heap [k] = heap [c];
679 ((W)heap [k])->active = k + 1; 889 ((W)heap [k])->active = k;
680 890
681 k = c; 891 k = c;
682 } 892 }
683 893
684 heap [k] = w; 894 heap [k] = w;
685 ((W)heap [k])->active = k + 1; 895 ev_active (heap [k]) = k;
686} 896}
897#endif
687 898
688void inline_size 899void inline_size
689adjustheap (WT *heap, int N, int k) 900adjustheap (WT *heap, int N, int k)
690{ 901{
691 upheap (heap, k); 902 upheap (heap, k);
695/*****************************************************************************/ 906/*****************************************************************************/
696 907
697typedef struct 908typedef struct
698{ 909{
699 WL head; 910 WL head;
700 sig_atomic_t volatile gotsig; 911 EV_ATOMIC_T gotsig;
701} ANSIG; 912} ANSIG;
702 913
703static ANSIG *signals; 914static ANSIG *signals;
704static int signalmax; 915static int signalmax;
705 916
706static int sigpipe [2]; 917static EV_ATOMIC_T gotsig;
707static sig_atomic_t volatile gotsig;
708static ev_io sigev;
709 918
710void inline_size 919void inline_size
711signals_init (ANSIG *base, int count) 920signals_init (ANSIG *base, int count)
712{ 921{
713 while (count--) 922 while (count--)
717 926
718 ++base; 927 ++base;
719 } 928 }
720} 929}
721 930
722static void 931/*****************************************************************************/
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 932
773void inline_speed 933void inline_speed
774fd_intern (int fd) 934fd_intern (int fd)
775{ 935{
776#ifdef _WIN32 936#ifdef _WIN32
781 fcntl (fd, F_SETFL, O_NONBLOCK); 941 fcntl (fd, F_SETFL, O_NONBLOCK);
782#endif 942#endif
783} 943}
784 944
785static void noinline 945static void noinline
786siginit (EV_P) 946evpipe_init (EV_P)
787{ 947{
948 if (!ev_is_active (&pipeev))
949 {
950#if EV_USE_EVENTFD
951 if ((evfd = eventfd (0, 0)) >= 0)
952 {
953 evpipe [0] = -1;
954 fd_intern (evfd);
955 ev_io_set (&pipeev, evfd, EV_READ);
956 }
957 else
958#endif
959 {
960 while (pipe (evpipe))
961 syserr ("(libev) error creating signal/async pipe");
962
788 fd_intern (sigpipe [0]); 963 fd_intern (evpipe [0]);
789 fd_intern (sigpipe [1]); 964 fd_intern (evpipe [1]);
965 ev_io_set (&pipeev, evpipe [0], EV_READ);
966 }
790 967
791 ev_io_set (&sigev, sigpipe [0], EV_READ);
792 ev_io_start (EV_A_ &sigev); 968 ev_io_start (EV_A_ &pipeev);
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 969 ev_unref (EV_A); /* watcher should not keep loop alive */
970 }
971}
972
973void inline_size
974evpipe_write (EV_P_ EV_ATOMIC_T *flag)
975{
976 if (!*flag)
977 {
978 int old_errno = errno; /* save errno because write might clobber it */
979
980 *flag = 1;
981
982#if EV_USE_EVENTFD
983 if (evfd >= 0)
984 {
985 uint64_t counter = 1;
986 write (evfd, &counter, sizeof (uint64_t));
987 }
988 else
989#endif
990 write (evpipe [1], &old_errno, 1);
991
992 errno = old_errno;
993 }
994}
995
996static void
997pipecb (EV_P_ ev_io *iow, int revents)
998{
999#if EV_USE_EVENTFD
1000 if (evfd >= 0)
1001 {
1002 uint64_t counter;
1003 read (evfd, &counter, sizeof (uint64_t));
1004 }
1005 else
1006#endif
1007 {
1008 char dummy;
1009 read (evpipe [0], &dummy, 1);
1010 }
1011
1012 if (gotsig && ev_is_default_loop (EV_A))
1013 {
1014 int signum;
1015 gotsig = 0;
1016
1017 for (signum = signalmax; signum--; )
1018 if (signals [signum].gotsig)
1019 ev_feed_signal_event (EV_A_ signum + 1);
1020 }
1021
1022#if EV_ASYNC_ENABLE
1023 if (gotasync)
1024 {
1025 int i;
1026 gotasync = 0;
1027
1028 for (i = asynccnt; i--; )
1029 if (asyncs [i]->sent)
1030 {
1031 asyncs [i]->sent = 0;
1032 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1033 }
1034 }
1035#endif
794} 1036}
795 1037
796/*****************************************************************************/ 1038/*****************************************************************************/
797 1039
1040static void
1041ev_sighandler (int signum)
1042{
1043#if EV_MULTIPLICITY
1044 struct ev_loop *loop = &default_loop_struct;
1045#endif
1046
1047#if _WIN32
1048 signal (signum, ev_sighandler);
1049#endif
1050
1051 signals [signum - 1].gotsig = 1;
1052 evpipe_write (EV_A_ &gotsig);
1053}
1054
1055void noinline
1056ev_feed_signal_event (EV_P_ int signum)
1057{
1058 WL w;
1059
1060#if EV_MULTIPLICITY
1061 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1062#endif
1063
1064 --signum;
1065
1066 if (signum < 0 || signum >= signalmax)
1067 return;
1068
1069 signals [signum].gotsig = 0;
1070
1071 for (w = signals [signum].head; w; w = w->next)
1072 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1073}
1074
1075/*****************************************************************************/
1076
798static ev_child *childs [EV_PID_HASHSIZE]; 1077static WL childs [EV_PID_HASHSIZE];
799 1078
800#ifndef _WIN32 1079#ifndef _WIN32
801 1080
802static ev_signal childev; 1081static ev_signal childev;
803 1082
1083#ifndef WIFCONTINUED
1084# define WIFCONTINUED(status) 0
1085#endif
1086
804void inline_speed 1087void inline_speed
805child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1088child_reap (EV_P_ int chain, int pid, int status)
806{ 1089{
807 ev_child *w; 1090 ev_child *w;
1091 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
808 1092
809 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1093 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1094 {
810 if (w->pid == pid || !w->pid) 1095 if ((w->pid == pid || !w->pid)
1096 && (!traced || (w->flags & 1)))
811 { 1097 {
812 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1098 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; 1099 w->rpid = pid;
814 w->rstatus = status; 1100 w->rstatus = status;
815 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1101 ev_feed_event (EV_A_ (W)w, EV_CHILD);
816 } 1102 }
1103 }
817} 1104}
818 1105
819#ifndef WCONTINUED 1106#ifndef WCONTINUED
820# define WCONTINUED 0 1107# define WCONTINUED 0
821#endif 1108#endif
830 if (!WCONTINUED 1117 if (!WCONTINUED
831 || errno != EINVAL 1118 || errno != EINVAL
832 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1119 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
833 return; 1120 return;
834 1121
835 /* make sure we are called again until all childs have been reaped */ 1122 /* 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 */ 1123 /* 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); 1124 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
838 1125
839 child_reap (EV_A_ sw, pid, pid, status); 1126 child_reap (EV_A_ pid, pid, status);
840 if (EV_PID_HASHSIZE > 1) 1127 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 */ 1128 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
842} 1129}
843 1130
844#endif 1131#endif
845 1132
846/*****************************************************************************/ 1133/*****************************************************************************/
918} 1205}
919 1206
920unsigned int 1207unsigned int
921ev_embeddable_backends (void) 1208ev_embeddable_backends (void)
922{ 1209{
923 return EVBACKEND_EPOLL 1210 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
924 | EVBACKEND_KQUEUE 1211
925 | EVBACKEND_PORT; 1212 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1213 /* please fix it and tell me how to detect the fix */
1214 flags &= ~EVBACKEND_EPOLL;
1215
1216 return flags;
926} 1217}
927 1218
928unsigned int 1219unsigned int
929ev_backend (EV_P) 1220ev_backend (EV_P)
930{ 1221{
933 1224
934unsigned int 1225unsigned int
935ev_loop_count (EV_P) 1226ev_loop_count (EV_P)
936{ 1227{
937 return loop_count; 1228 return loop_count;
1229}
1230
1231void
1232ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1233{
1234 io_blocktime = interval;
1235}
1236
1237void
1238ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1239{
1240 timeout_blocktime = interval;
938} 1241}
939 1242
940static void noinline 1243static void noinline
941loop_init (EV_P_ unsigned int flags) 1244loop_init (EV_P_ unsigned int flags)
942{ 1245{
948 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1251 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
949 have_monotonic = 1; 1252 have_monotonic = 1;
950 } 1253 }
951#endif 1254#endif
952 1255
953 ev_rt_now = ev_time (); 1256 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1257 mn_now = get_clock ();
955 now_floor = mn_now; 1258 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1259 rtmn_diff = ev_rt_now - mn_now;
1260
1261 io_blocktime = 0.;
1262 timeout_blocktime = 0.;
1263 backend = 0;
1264 backend_fd = -1;
1265 gotasync = 0;
1266#if EV_USE_INOTIFY
1267 fs_fd = -2;
1268#endif
957 1269
958 /* pid check not overridable via env */ 1270 /* pid check not overridable via env */
959#ifndef _WIN32 1271#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1272 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1273 curpid = getpid ();
964 if (!(flags & EVFLAG_NOENV) 1276 if (!(flags & EVFLAG_NOENV)
965 && !enable_secure () 1277 && !enable_secure ()
966 && getenv ("LIBEV_FLAGS")) 1278 && getenv ("LIBEV_FLAGS"))
967 flags = atoi (getenv ("LIBEV_FLAGS")); 1279 flags = atoi (getenv ("LIBEV_FLAGS"));
968 1280
969 if (!(flags & 0x0000ffffUL)) 1281 if (!(flags & 0x0000ffffU))
970 flags |= ev_recommended_backends (); 1282 flags |= ev_recommended_backends ();
971
972 backend = 0;
973 backend_fd = -1;
974#if EV_USE_INOTIFY
975 fs_fd = -2;
976#endif
977 1283
978#if EV_USE_PORT 1284#if EV_USE_PORT
979 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1285 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
980#endif 1286#endif
981#if EV_USE_KQUEUE 1287#if EV_USE_KQUEUE
989#endif 1295#endif
990#if EV_USE_SELECT 1296#if EV_USE_SELECT
991 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1297 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
992#endif 1298#endif
993 1299
994 ev_init (&sigev, sigcb); 1300 ev_init (&pipeev, pipecb);
995 ev_set_priority (&sigev, EV_MAXPRI); 1301 ev_set_priority (&pipeev, EV_MAXPRI);
996 } 1302 }
997} 1303}
998 1304
999static void noinline 1305static void noinline
1000loop_destroy (EV_P) 1306loop_destroy (EV_P)
1001{ 1307{
1002 int i; 1308 int i;
1309
1310 if (ev_is_active (&pipeev))
1311 {
1312 ev_ref (EV_A); /* signal watcher */
1313 ev_io_stop (EV_A_ &pipeev);
1314
1315#if EV_USE_EVENTFD
1316 if (evfd >= 0)
1317 close (evfd);
1318#endif
1319
1320 if (evpipe [0] >= 0)
1321 {
1322 close (evpipe [0]);
1323 close (evpipe [1]);
1324 }
1325 }
1003 1326
1004#if EV_USE_INOTIFY 1327#if EV_USE_INOTIFY
1005 if (fs_fd >= 0) 1328 if (fs_fd >= 0)
1006 close (fs_fd); 1329 close (fs_fd);
1007#endif 1330#endif
1030 array_free (pending, [i]); 1353 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1354#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1355 array_free (idle, [i]);
1033#endif 1356#endif
1034 } 1357 }
1358
1359 ev_free (anfds); anfdmax = 0;
1035 1360
1036 /* have to use the microsoft-never-gets-it-right macro */ 1361 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1362 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1363 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1364#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1365 array_free (periodic, EMPTY);
1041#endif 1366#endif
1367#if EV_FORK_ENABLE
1368 array_free (fork, EMPTY);
1369#endif
1042 array_free (prepare, EMPTY); 1370 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1371 array_free (check, EMPTY);
1372#if EV_ASYNC_ENABLE
1373 array_free (async, EMPTY);
1374#endif
1044 1375
1045 backend = 0; 1376 backend = 0;
1046} 1377}
1047 1378
1379#if EV_USE_INOTIFY
1048void inline_size infy_fork (EV_P); 1380void inline_size infy_fork (EV_P);
1381#endif
1049 1382
1050void inline_size 1383void inline_size
1051loop_fork (EV_P) 1384loop_fork (EV_P)
1052{ 1385{
1053#if EV_USE_PORT 1386#if EV_USE_PORT
1061#endif 1394#endif
1062#if EV_USE_INOTIFY 1395#if EV_USE_INOTIFY
1063 infy_fork (EV_A); 1396 infy_fork (EV_A);
1064#endif 1397#endif
1065 1398
1066 if (ev_is_active (&sigev)) 1399 if (ev_is_active (&pipeev))
1067 { 1400 {
1068 /* default loop */ 1401 /* this "locks" the handlers against writing to the pipe */
1402 /* while we modify the fd vars */
1403 gotsig = 1;
1404#if EV_ASYNC_ENABLE
1405 gotasync = 1;
1406#endif
1069 1407
1070 ev_ref (EV_A); 1408 ev_ref (EV_A);
1071 ev_io_stop (EV_A_ &sigev); 1409 ev_io_stop (EV_A_ &pipeev);
1410
1411#if EV_USE_EVENTFD
1412 if (evfd >= 0)
1413 close (evfd);
1414#endif
1415
1416 if (evpipe [0] >= 0)
1417 {
1072 close (sigpipe [0]); 1418 close (evpipe [0]);
1073 close (sigpipe [1]); 1419 close (evpipe [1]);
1420 }
1074 1421
1075 while (pipe (sigpipe))
1076 syserr ("(libev) error creating pipe");
1077
1078 siginit (EV_A); 1422 evpipe_init (EV_A);
1423 /* now iterate over everything, in case we missed something */
1424 pipecb (EV_A_ &pipeev, EV_READ);
1079 } 1425 }
1080 1426
1081 postfork = 0; 1427 postfork = 0;
1082} 1428}
1083 1429
1105} 1451}
1106 1452
1107void 1453void
1108ev_loop_fork (EV_P) 1454ev_loop_fork (EV_P)
1109{ 1455{
1110 postfork = 1; 1456 postfork = 1; /* must be in line with ev_default_fork */
1111} 1457}
1112
1113#endif 1458#endif
1114 1459
1115#if EV_MULTIPLICITY 1460#if EV_MULTIPLICITY
1116struct ev_loop * 1461struct ev_loop *
1117ev_default_loop_init (unsigned int flags) 1462ev_default_loop_init (unsigned int flags)
1118#else 1463#else
1119int 1464int
1120ev_default_loop (unsigned int flags) 1465ev_default_loop (unsigned int flags)
1121#endif 1466#endif
1122{ 1467{
1123 if (sigpipe [0] == sigpipe [1])
1124 if (pipe (sigpipe))
1125 return 0;
1126
1127 if (!ev_default_loop_ptr) 1468 if (!ev_default_loop_ptr)
1128 { 1469 {
1129#if EV_MULTIPLICITY 1470#if EV_MULTIPLICITY
1130 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1471 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1131#else 1472#else
1134 1475
1135 loop_init (EV_A_ flags); 1476 loop_init (EV_A_ flags);
1136 1477
1137 if (ev_backend (EV_A)) 1478 if (ev_backend (EV_A))
1138 { 1479 {
1139 siginit (EV_A);
1140
1141#ifndef _WIN32 1480#ifndef _WIN32
1142 ev_signal_init (&childev, childcb, SIGCHLD); 1481 ev_signal_init (&childev, childcb, SIGCHLD);
1143 ev_set_priority (&childev, EV_MAXPRI); 1482 ev_set_priority (&childev, EV_MAXPRI);
1144 ev_signal_start (EV_A_ &childev); 1483 ev_signal_start (EV_A_ &childev);
1145 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1484 ev_unref (EV_A); /* child watcher should not keep loop alive */
1162#ifndef _WIN32 1501#ifndef _WIN32
1163 ev_ref (EV_A); /* child watcher */ 1502 ev_ref (EV_A); /* child watcher */
1164 ev_signal_stop (EV_A_ &childev); 1503 ev_signal_stop (EV_A_ &childev);
1165#endif 1504#endif
1166 1505
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); 1506 loop_destroy (EV_A);
1174} 1507}
1175 1508
1176void 1509void
1177ev_default_fork (void) 1510ev_default_fork (void)
1179#if EV_MULTIPLICITY 1512#if EV_MULTIPLICITY
1180 struct ev_loop *loop = ev_default_loop_ptr; 1513 struct ev_loop *loop = ev_default_loop_ptr;
1181#endif 1514#endif
1182 1515
1183 if (backend) 1516 if (backend)
1184 postfork = 1; 1517 postfork = 1; /* must be in line with ev_loop_fork */
1185} 1518}
1186 1519
1187/*****************************************************************************/ 1520/*****************************************************************************/
1188 1521
1189void 1522void
1209 p->w->pending = 0; 1542 p->w->pending = 0;
1210 EV_CB_INVOKE (p->w, p->events); 1543 EV_CB_INVOKE (p->w, p->events);
1211 } 1544 }
1212 } 1545 }
1213} 1546}
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 1547
1295#if EV_IDLE_ENABLE 1548#if EV_IDLE_ENABLE
1296void inline_size 1549void inline_size
1297idle_reify (EV_P) 1550idle_reify (EV_P)
1298{ 1551{
1310 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1563 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1311 break; 1564 break;
1312 } 1565 }
1313 } 1566 }
1314 } 1567 }
1568}
1569#endif
1570
1571void inline_size
1572timers_reify (EV_P)
1573{
1574 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1575 {
1576 ev_timer *w = (ev_timer *)timers [HEAP0];
1577
1578 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1579
1580 /* first reschedule or stop timer */
1581 if (w->repeat)
1582 {
1583 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1584
1585 ev_at (w) += w->repeat;
1586 if (ev_at (w) < mn_now)
1587 ev_at (w) = mn_now;
1588
1589 downheap (timers, timercnt, HEAP0);
1590 }
1591 else
1592 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1593
1594 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1595 }
1596}
1597
1598#if EV_PERIODIC_ENABLE
1599void inline_size
1600periodics_reify (EV_P)
1601{
1602 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1603 {
1604 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1605
1606 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1607
1608 /* first reschedule or stop timer */
1609 if (w->reschedule_cb)
1610 {
1611 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1612 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1613 downheap (periodics, periodiccnt, 1);
1614 }
1615 else if (w->interval)
1616 {
1617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1618 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1619 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1620 downheap (periodics, periodiccnt, HEAP0);
1621 }
1622 else
1623 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1624
1625 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1626 }
1627}
1628
1629static void noinline
1630periodics_reschedule (EV_P)
1631{
1632 int i;
1633
1634 /* adjust periodics after time jump */
1635 for (i = 1; i <= periodiccnt; ++i)
1636 {
1637 ev_periodic *w = (ev_periodic *)periodics [i];
1638
1639 if (w->reschedule_cb)
1640 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1641 else if (w->interval)
1642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1643 }
1644
1645 /* now rebuild the heap */
1646 for (i = periodiccnt >> 1; --i; )
1647 downheap (periodics, periodiccnt, i + HEAP0);
1315} 1648}
1316#endif 1649#endif
1317 1650
1318void inline_speed 1651void inline_speed
1319time_update (EV_P_ ev_tstamp max_block) 1652time_update (EV_P_ ev_tstamp max_block)
1348 */ 1681 */
1349 for (i = 4; --i; ) 1682 for (i = 4; --i; )
1350 { 1683 {
1351 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1352 1685
1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1686 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1354 return; /* all is well */ 1687 return; /* all is well */
1355 1688
1356 ev_rt_now = ev_time (); 1689 ev_rt_now = ev_time ();
1357 mn_now = get_clock (); 1690 mn_now = get_clock ();
1358 now_floor = mn_now; 1691 now_floor = mn_now;
1373 { 1706 {
1374#if EV_PERIODIC_ENABLE 1707#if EV_PERIODIC_ENABLE
1375 periodics_reschedule (EV_A); 1708 periodics_reschedule (EV_A);
1376#endif 1709#endif
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1710 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1711 for (i = 1; i <= timercnt; ++i)
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1712 ev_at (timers [i]) += ev_rt_now - mn_now;
1380 } 1713 }
1381 1714
1382 mn_now = ev_rt_now; 1715 mn_now = ev_rt_now;
1383 } 1716 }
1384} 1717}
1398static int loop_done; 1731static int loop_done;
1399 1732
1400void 1733void
1401ev_loop (EV_P_ int flags) 1734ev_loop (EV_P_ int flags)
1402{ 1735{
1403 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1736 loop_done = EVUNLOOP_CANCEL;
1404 ? EVUNLOOP_ONE
1405 : EVUNLOOP_CANCEL;
1406 1737
1407 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1738 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1408 1739
1409 do 1740 do
1410 { 1741 {
1444 /* update fd-related kernel structures */ 1775 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1776 fd_reify (EV_A);
1446 1777
1447 /* calculate blocking time */ 1778 /* calculate blocking time */
1448 { 1779 {
1449 ev_tstamp block; 1780 ev_tstamp waittime = 0.;
1781 ev_tstamp sleeptime = 0.;
1450 1782
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1783 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1784 {
1455 /* update time to cancel out callback processing overhead */ 1785 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1786 time_update (EV_A_ 1e100);
1457 1787
1458 block = MAX_BLOCKTIME; 1788 waittime = MAX_BLOCKTIME;
1459 1789
1460 if (timercnt) 1790 if (timercnt)
1461 { 1791 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1792 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1463 if (block > to) block = to; 1793 if (waittime > to) waittime = to;
1464 } 1794 }
1465 1795
1466#if EV_PERIODIC_ENABLE 1796#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1797 if (periodiccnt)
1468 { 1798 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1799 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1800 if (waittime > to) waittime = to;
1471 } 1801 }
1472#endif 1802#endif
1473 1803
1474 if (expect_false (block < 0.)) block = 0.; 1804 if (expect_false (waittime < timeout_blocktime))
1805 waittime = timeout_blocktime;
1806
1807 sleeptime = waittime - backend_fudge;
1808
1809 if (expect_true (sleeptime > io_blocktime))
1810 sleeptime = io_blocktime;
1811
1812 if (sleeptime)
1813 {
1814 ev_sleep (sleeptime);
1815 waittime -= sleeptime;
1816 }
1475 } 1817 }
1476 1818
1477 ++loop_count; 1819 ++loop_count;
1478 backend_poll (EV_A_ block); 1820 backend_poll (EV_A_ waittime);
1479 1821
1480 /* update ev_rt_now, do magic */ 1822 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1823 time_update (EV_A_ waittime + sleeptime);
1482 } 1824 }
1483 1825
1484 /* queue pending timers and reschedule them */ 1826 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1827 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1828#if EV_PERIODIC_ENABLE
1495 /* queue check watchers, to be executed first */ 1837 /* queue check watchers, to be executed first */
1496 if (expect_false (checkcnt)) 1838 if (expect_false (checkcnt))
1497 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1839 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1498 1840
1499 call_pending (EV_A); 1841 call_pending (EV_A);
1500
1501 } 1842 }
1502 while (expect_true (activecnt && !loop_done)); 1843 while (expect_true (
1844 activecnt
1845 && !loop_done
1846 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1847 ));
1503 1848
1504 if (loop_done == EVUNLOOP_ONE) 1849 if (loop_done == EVUNLOOP_ONE)
1505 loop_done = EVUNLOOP_CANCEL; 1850 loop_done = EVUNLOOP_CANCEL;
1506} 1851}
1507 1852
1598 1943
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1944 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1945
1601 ev_start (EV_A_ (W)w, 1); 1946 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1947 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1948 wlist_add (&anfds[fd].head, (WL)w);
1604 1949
1605 fd_change (EV_A_ fd); 1950 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1951 w->events &= ~EV_IOFDSET;
1606} 1952}
1607 1953
1608void noinline 1954void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1955ev_io_stop (EV_P_ ev_io *w)
1610{ 1956{
1612 if (expect_false (!ev_is_active (w))) 1958 if (expect_false (!ev_is_active (w)))
1613 return; 1959 return;
1614 1960
1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1961 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1616 1962
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1963 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1964 ev_stop (EV_A_ (W)w);
1619 1965
1620 fd_change (EV_A_ w->fd); 1966 fd_change (EV_A_ w->fd, 1);
1621} 1967}
1622 1968
1623void noinline 1969void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1970ev_timer_start (EV_P_ ev_timer *w)
1625{ 1971{
1626 if (expect_false (ev_is_active (w))) 1972 if (expect_false (ev_is_active (w)))
1627 return; 1973 return;
1628 1974
1629 ((WT)w)->at += mn_now; 1975 ev_at (w) += mn_now;
1630 1976
1631 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1977 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1632 1978
1633 ev_start (EV_A_ (W)w, ++timercnt); 1979 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1980 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1635 timers [timercnt - 1] = w; 1981 timers [ev_active (w)] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1982 upheap (timers, ev_active (w));
1637 1983
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1984 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1639} 1985}
1640 1986
1641void noinline 1987void noinline
1642ev_timer_stop (EV_P_ ev_timer *w) 1988ev_timer_stop (EV_P_ ev_timer *w)
1643{ 1989{
1644 clear_pending (EV_A_ (W)w); 1990 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1991 if (expect_false (!ev_is_active (w)))
1646 return; 1992 return;
1647 1993
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1649
1650 { 1994 {
1651 int active = ((W)w)->active; 1995 int active = ev_active (w);
1652 1996
1997 assert (("internal timer heap corruption", timers [active] == (WT)w));
1998
1653 if (expect_true (--active < --timercnt)) 1999 if (expect_true (active < timercnt + HEAP0 - 1))
1654 { 2000 {
1655 timers [active] = timers [timercnt]; 2001 timers [active] = timers [timercnt + HEAP0 - 1];
1656 adjustheap ((WT *)timers, timercnt, active); 2002 adjustheap (timers, timercnt, active);
1657 } 2003 }
2004
2005 --timercnt;
1658 } 2006 }
1659 2007
1660 ((WT)w)->at -= mn_now; 2008 ev_at (w) -= mn_now;
1661 2009
1662 ev_stop (EV_A_ (W)w); 2010 ev_stop (EV_A_ (W)w);
1663} 2011}
1664 2012
1665void noinline 2013void noinline
1667{ 2015{
1668 if (ev_is_active (w)) 2016 if (ev_is_active (w))
1669 { 2017 {
1670 if (w->repeat) 2018 if (w->repeat)
1671 { 2019 {
1672 ((WT)w)->at = mn_now + w->repeat; 2020 ev_at (w) = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 2021 adjustheap (timers, timercnt, ev_active (w));
1674 } 2022 }
1675 else 2023 else
1676 ev_timer_stop (EV_A_ w); 2024 ev_timer_stop (EV_A_ w);
1677 } 2025 }
1678 else if (w->repeat) 2026 else if (w->repeat)
1679 { 2027 {
1680 w->at = w->repeat; 2028 ev_at (w) = w->repeat;
1681 ev_timer_start (EV_A_ w); 2029 ev_timer_start (EV_A_ w);
1682 } 2030 }
1683} 2031}
1684 2032
1685#if EV_PERIODIC_ENABLE 2033#if EV_PERIODIC_ENABLE
1688{ 2036{
1689 if (expect_false (ev_is_active (w))) 2037 if (expect_false (ev_is_active (w)))
1690 return; 2038 return;
1691 2039
1692 if (w->reschedule_cb) 2040 if (w->reschedule_cb)
1693 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2041 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1694 else if (w->interval) 2042 else if (w->interval)
1695 { 2043 {
1696 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2044 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 */ 2045 /* 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; 2046 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1699 } 2047 }
1700 else 2048 else
1701 ((WT)w)->at = w->offset; 2049 ev_at (w) = w->offset;
1702 2050
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 2051 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 2052 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 2053 periodics [ev_active (w)] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 2054 upheap (periodics, ev_active (w));
1707 2055
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2056 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1709} 2057}
1710 2058
1711void noinline 2059void noinline
1712ev_periodic_stop (EV_P_ ev_periodic *w) 2060ev_periodic_stop (EV_P_ ev_periodic *w)
1713{ 2061{
1714 clear_pending (EV_A_ (W)w); 2062 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 2063 if (expect_false (!ev_is_active (w)))
1716 return; 2064 return;
1717 2065
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1719
1720 { 2066 {
1721 int active = ((W)w)->active; 2067 int active = ev_active (w);
1722 2068
2069 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2070
1723 if (expect_true (--active < --periodiccnt)) 2071 if (expect_true (active < periodiccnt + HEAP0 - 1))
1724 { 2072 {
1725 periodics [active] = periodics [periodiccnt]; 2073 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 2074 adjustheap (periodics, periodiccnt, active);
1727 } 2075 }
2076
2077 --periodiccnt;
1728 } 2078 }
1729 2079
1730 ev_stop (EV_A_ (W)w); 2080 ev_stop (EV_A_ (W)w);
1731} 2081}
1732 2082
1752 if (expect_false (ev_is_active (w))) 2102 if (expect_false (ev_is_active (w)))
1753 return; 2103 return;
1754 2104
1755 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2105 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1756 2106
2107 evpipe_init (EV_A);
2108
2109 {
2110#ifndef _WIN32
2111 sigset_t full, prev;
2112 sigfillset (&full);
2113 sigprocmask (SIG_SETMASK, &full, &prev);
2114#endif
2115
2116 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2117
2118#ifndef _WIN32
2119 sigprocmask (SIG_SETMASK, &prev, 0);
2120#endif
2121 }
2122
1757 ev_start (EV_A_ (W)w, 1); 2123 ev_start (EV_A_ (W)w, 1);
1758 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1759 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2124 wlist_add (&signals [w->signum - 1].head, (WL)w);
1760 2125
1761 if (!((WL)w)->next) 2126 if (!((WL)w)->next)
1762 { 2127 {
1763#if _WIN32 2128#if _WIN32
1764 signal (w->signum, sighandler); 2129 signal (w->signum, ev_sighandler);
1765#else 2130#else
1766 struct sigaction sa; 2131 struct sigaction sa;
1767 sa.sa_handler = sighandler; 2132 sa.sa_handler = ev_sighandler;
1768 sigfillset (&sa.sa_mask); 2133 sigfillset (&sa.sa_mask);
1769 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2134 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1770 sigaction (w->signum, &sa, 0); 2135 sigaction (w->signum, &sa, 0);
1771#endif 2136#endif
1772 } 2137 }
1777{ 2142{
1778 clear_pending (EV_A_ (W)w); 2143 clear_pending (EV_A_ (W)w);
1779 if (expect_false (!ev_is_active (w))) 2144 if (expect_false (!ev_is_active (w)))
1780 return; 2145 return;
1781 2146
1782 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2147 wlist_del (&signals [w->signum - 1].head, (WL)w);
1783 ev_stop (EV_A_ (W)w); 2148 ev_stop (EV_A_ (W)w);
1784 2149
1785 if (!signals [w->signum - 1].head) 2150 if (!signals [w->signum - 1].head)
1786 signal (w->signum, SIG_DFL); 2151 signal (w->signum, SIG_DFL);
1787} 2152}
1794#endif 2159#endif
1795 if (expect_false (ev_is_active (w))) 2160 if (expect_false (ev_is_active (w)))
1796 return; 2161 return;
1797 2162
1798 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
1799 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2164 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1800} 2165}
1801 2166
1802void 2167void
1803ev_child_stop (EV_P_ ev_child *w) 2168ev_child_stop (EV_P_ ev_child *w)
1804{ 2169{
1805 clear_pending (EV_A_ (W)w); 2170 clear_pending (EV_A_ (W)w);
1806 if (expect_false (!ev_is_active (w))) 2171 if (expect_false (!ev_is_active (w)))
1807 return; 2172 return;
1808 2173
1809 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2174 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1810 ev_stop (EV_A_ (W)w); 2175 ev_stop (EV_A_ (W)w);
1811} 2176}
1812 2177
1813#if EV_STAT_ENABLE 2178#if EV_STAT_ENABLE
1814 2179
1833 if (w->wd < 0) 2198 if (w->wd < 0)
1834 { 2199 {
1835 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2200 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1836 2201
1837 /* monitor some parent directory for speedup hints */ 2202 /* monitor some parent directory for speedup hints */
2203 /* note that exceeding the hardcoded limit is not a correctness issue, */
2204 /* but an efficiency issue only */
1838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2205 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1839 { 2206 {
1840 char path [4096]; 2207 char path [4096];
1841 strcpy (path, w->path); 2208 strcpy (path, w->path);
1842 2209
2087 clear_pending (EV_A_ (W)w); 2454 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2455 if (expect_false (!ev_is_active (w)))
2089 return; 2456 return;
2090 2457
2091 { 2458 {
2092 int active = ((W)w)->active; 2459 int active = ev_active (w);
2093 2460
2094 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2461 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2095 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2462 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2096 2463
2097 ev_stop (EV_A_ (W)w); 2464 ev_stop (EV_A_ (W)w);
2098 --idleall; 2465 --idleall;
2099 } 2466 }
2100} 2467}
2117 clear_pending (EV_A_ (W)w); 2484 clear_pending (EV_A_ (W)w);
2118 if (expect_false (!ev_is_active (w))) 2485 if (expect_false (!ev_is_active (w)))
2119 return; 2486 return;
2120 2487
2121 { 2488 {
2122 int active = ((W)w)->active; 2489 int active = ev_active (w);
2490
2123 prepares [active - 1] = prepares [--preparecnt]; 2491 prepares [active - 1] = prepares [--preparecnt];
2124 ((W)prepares [active - 1])->active = active; 2492 ev_active (prepares [active - 1]) = active;
2125 } 2493 }
2126 2494
2127 ev_stop (EV_A_ (W)w); 2495 ev_stop (EV_A_ (W)w);
2128} 2496}
2129 2497
2144 clear_pending (EV_A_ (W)w); 2512 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2513 if (expect_false (!ev_is_active (w)))
2146 return; 2514 return;
2147 2515
2148 { 2516 {
2149 int active = ((W)w)->active; 2517 int active = ev_active (w);
2518
2150 checks [active - 1] = checks [--checkcnt]; 2519 checks [active - 1] = checks [--checkcnt];
2151 ((W)checks [active - 1])->active = active; 2520 ev_active (checks [active - 1]) = active;
2152 } 2521 }
2153 2522
2154 ev_stop (EV_A_ (W)w); 2523 ev_stop (EV_A_ (W)w);
2155} 2524}
2156 2525
2157#if EV_EMBED_ENABLE 2526#if EV_EMBED_ENABLE
2158void noinline 2527void noinline
2159ev_embed_sweep (EV_P_ ev_embed *w) 2528ev_embed_sweep (EV_P_ ev_embed *w)
2160{ 2529{
2161 ev_loop (w->loop, EVLOOP_NONBLOCK); 2530 ev_loop (w->other, EVLOOP_NONBLOCK);
2162} 2531}
2163 2532
2164static void 2533static void
2165embed_cb (EV_P_ ev_io *io, int revents) 2534embed_io_cb (EV_P_ ev_io *io, int revents)
2166{ 2535{
2167 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2536 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2168 2537
2169 if (ev_cb (w)) 2538 if (ev_cb (w))
2170 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2539 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2171 else 2540 else
2172 ev_embed_sweep (loop, w); 2541 ev_loop (w->other, EVLOOP_NONBLOCK);
2173} 2542}
2543
2544static void
2545embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2546{
2547 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2548
2549 {
2550 struct ev_loop *loop = w->other;
2551
2552 while (fdchangecnt)
2553 {
2554 fd_reify (EV_A);
2555 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2556 }
2557 }
2558}
2559
2560#if 0
2561static void
2562embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2563{
2564 ev_idle_stop (EV_A_ idle);
2565}
2566#endif
2174 2567
2175void 2568void
2176ev_embed_start (EV_P_ ev_embed *w) 2569ev_embed_start (EV_P_ ev_embed *w)
2177{ 2570{
2178 if (expect_false (ev_is_active (w))) 2571 if (expect_false (ev_is_active (w)))
2179 return; 2572 return;
2180 2573
2181 { 2574 {
2182 struct ev_loop *loop = w->loop; 2575 struct ev_loop *loop = w->other;
2183 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2576 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2184 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2577 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2185 } 2578 }
2186 2579
2187 ev_set_priority (&w->io, ev_priority (w)); 2580 ev_set_priority (&w->io, ev_priority (w));
2188 ev_io_start (EV_A_ &w->io); 2581 ev_io_start (EV_A_ &w->io);
2582
2583 ev_prepare_init (&w->prepare, embed_prepare_cb);
2584 ev_set_priority (&w->prepare, EV_MINPRI);
2585 ev_prepare_start (EV_A_ &w->prepare);
2586
2587 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2189 2588
2190 ev_start (EV_A_ (W)w, 1); 2589 ev_start (EV_A_ (W)w, 1);
2191} 2590}
2192 2591
2193void 2592void
2196 clear_pending (EV_A_ (W)w); 2595 clear_pending (EV_A_ (W)w);
2197 if (expect_false (!ev_is_active (w))) 2596 if (expect_false (!ev_is_active (w)))
2198 return; 2597 return;
2199 2598
2200 ev_io_stop (EV_A_ &w->io); 2599 ev_io_stop (EV_A_ &w->io);
2600 ev_prepare_stop (EV_A_ &w->prepare);
2201 2601
2202 ev_stop (EV_A_ (W)w); 2602 ev_stop (EV_A_ (W)w);
2203} 2603}
2204#endif 2604#endif
2205 2605
2221 clear_pending (EV_A_ (W)w); 2621 clear_pending (EV_A_ (W)w);
2222 if (expect_false (!ev_is_active (w))) 2622 if (expect_false (!ev_is_active (w)))
2223 return; 2623 return;
2224 2624
2225 { 2625 {
2226 int active = ((W)w)->active; 2626 int active = ev_active (w);
2627
2227 forks [active - 1] = forks [--forkcnt]; 2628 forks [active - 1] = forks [--forkcnt];
2228 ((W)forks [active - 1])->active = active; 2629 ev_active (forks [active - 1]) = active;
2229 } 2630 }
2230 2631
2231 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633}
2634#endif
2635
2636#if EV_ASYNC_ENABLE
2637void
2638ev_async_start (EV_P_ ev_async *w)
2639{
2640 if (expect_false (ev_is_active (w)))
2641 return;
2642
2643 evpipe_init (EV_A);
2644
2645 ev_start (EV_A_ (W)w, ++asynccnt);
2646 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2647 asyncs [asynccnt - 1] = w;
2648}
2649
2650void
2651ev_async_stop (EV_P_ ev_async *w)
2652{
2653 clear_pending (EV_A_ (W)w);
2654 if (expect_false (!ev_is_active (w)))
2655 return;
2656
2657 {
2658 int active = ev_active (w);
2659
2660 asyncs [active - 1] = asyncs [--asynccnt];
2661 ev_active (asyncs [active - 1]) = active;
2662 }
2663
2664 ev_stop (EV_A_ (W)w);
2665}
2666
2667void
2668ev_async_send (EV_P_ ev_async *w)
2669{
2670 w->sent = 1;
2671 evpipe_write (EV_A_ &gotasync);
2232} 2672}
2233#endif 2673#endif
2234 2674
2235/*****************************************************************************/ 2675/*****************************************************************************/
2236 2676
2294 ev_timer_set (&once->to, timeout, 0.); 2734 ev_timer_set (&once->to, timeout, 0.);
2295 ev_timer_start (EV_A_ &once->to); 2735 ev_timer_start (EV_A_ &once->to);
2296 } 2736 }
2297} 2737}
2298 2738
2739#if EV_MULTIPLICITY
2740 #include "ev_wrap.h"
2741#endif
2742
2299#ifdef __cplusplus 2743#ifdef __cplusplus
2300} 2744}
2301#endif 2745#endif
2302 2746

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines