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

Comparing libev/ev.c (file contents):
Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC vs.
Revision 1.233 by root, Tue May 6 23:34:16 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/*
222 * This is used to avoid floating point rounding problems. 286 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics 287 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding 288 * to ensure progress, time-wise, even when rounding
225 * errors are against us. 289 * errors are against us.
226 * This value is good at least till the year 4000 290 * This value is good at least till the year 4000.
227 * and intervals up to 20 years.
228 * Better solutions welcome. 291 * Better solutions welcome.
229 */ 292 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 293#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
231 294
232#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) */
233#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) */
234/*#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 */
235 298
236#if __GNUC__ >= 3 299#if __GNUC__ >= 4
237# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
238# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
239#else 302#else
240# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
241# define noinline 304# define noinline
242# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
243# define inline 306# define inline
244# endif 307# endif
245#endif 308#endif
246 309
247#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
262 325
263typedef ev_watcher *W; 326typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
266 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 */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
268 338
269#ifdef _WIN32 339#ifdef _WIN32
270# include "ev_win32.c" 340# include "ev_win32.c"
271#endif 341#endif
272 342
293 perror (msg); 363 perror (msg);
294 abort (); 364 abort ();
295 } 365 }
296} 366}
297 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
298static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
299 384
300void 385void
301ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
302{ 387{
303 alloc = cb; 388 alloc = cb;
304} 389}
305 390
306inline_speed void * 391inline_speed void *
307ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
308{ 393{
309 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
310 395
311 if (!ptr && size) 396 if (!ptr && size)
312 { 397 {
313 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
314 abort (); 399 abort ();
408{ 493{
409 return ev_rt_now; 494 return ev_rt_now;
410} 495}
411#endif 496#endif
412 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
413int inline_size 527int inline_size
414array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
415{ 529{
416 int ncur = cur + 1; 530 int ncur = cur + 1;
417 531
418 do 532 do
419 ncur <<= 1; 533 ncur <<= 1;
420 while (cnt > ncur); 534 while (cnt > ncur);
421 535
422 /* 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 */
423 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
424 { 538 {
425 ncur *= elem; 539 ncur *= elem;
426 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
427 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
428 ncur /= elem; 542 ncur /= elem;
429 } 543 }
430 544
431 return ncur; 545 return ncur;
477 pendings [pri][w_->pending - 1].w = w_; 591 pendings [pri][w_->pending - 1].w = w_;
478 pendings [pri][w_->pending - 1].events = revents; 592 pendings [pri][w_->pending - 1].events = revents;
479 } 593 }
480} 594}
481 595
482void inline_size 596void inline_speed
483queue_events (EV_P_ W *events, int eventcnt, int type) 597queue_events (EV_P_ W *events, int eventcnt, int type)
484{ 598{
485 int i; 599 int i;
486 600
487 for (i = 0; i < eventcnt; ++i) 601 for (i = 0; i < eventcnt; ++i)
534 { 648 {
535 int fd = fdchanges [i]; 649 int fd = fdchanges [i];
536 ANFD *anfd = anfds + fd; 650 ANFD *anfd = anfds + fd;
537 ev_io *w; 651 ev_io *w;
538 652
539 int events = 0; 653 unsigned char events = 0;
540 654
541 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)
542 events |= w->events; 656 events |= (unsigned char)w->events;
543 657
544#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
545 if (events) 659 if (events)
546 { 660 {
547 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
548 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
549 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));
550 } 668 }
551#endif 669#endif
552 670
671 {
672 unsigned char o_events = anfd->events;
673 unsigned char o_reify = anfd->reify;
674
553 anfd->reify = 0; 675 anfd->reify = 0;
554
555 backend_modify (EV_A_ fd, anfd->events, events);
556 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 }
557 } 681 }
558 682
559 fdchangecnt = 0; 683 fdchangecnt = 0;
560} 684}
561 685
562void inline_size 686void inline_size
563fd_change (EV_P_ int fd) 687fd_change (EV_P_ int fd, int flags)
564{ 688{
565 if (expect_false (anfds [fd].reify)) 689 unsigned char reify = anfds [fd].reify;
566 return;
567
568 anfds [fd].reify = 1; 690 anfds [fd].reify |= flags;
569 691
692 if (expect_true (!reify))
693 {
570 ++fdchangecnt; 694 ++fdchangecnt;
571 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 695 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
572 fdchanges [fdchangecnt - 1] = fd; 696 fdchanges [fdchangecnt - 1] = fd;
697 }
573} 698}
574 699
575void inline_speed 700void inline_speed
576fd_kill (EV_P_ int fd) 701fd_kill (EV_P_ int fd)
577{ 702{
628 753
629 for (fd = 0; fd < anfdmax; ++fd) 754 for (fd = 0; fd < anfdmax; ++fd)
630 if (anfds [fd].events) 755 if (anfds [fd].events)
631 { 756 {
632 anfds [fd].events = 0; 757 anfds [fd].events = 0;
633 fd_change (EV_A_ fd); 758 fd_change (EV_A_ fd, EV_IOFDSET | 1);
634 } 759 }
635} 760}
636 761
637/*****************************************************************************/ 762/*****************************************************************************/
638 763
764/* towards the root */
639void inline_speed 765void inline_speed
640upheap (WT *heap, int k) 766upheap (WT *heap, int k)
641{ 767{
642 WT w = heap [k]; 768 WT w = heap [k];
643 769
644 while (k && heap [k >> 1]->at > w->at) 770 for (;;)
645 { 771 {
772 int p = k >> 1;
773
774 /* maybe we could use a dummy element at heap [0]? */
775 if (!p || heap [p]->at <= w->at)
776 break;
777
646 heap [k] = heap [k >> 1]; 778 heap [k] = heap [p];
647 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
648 k >>= 1; 780 k = p;
649 } 781 }
650 782
651 heap [k] = w; 783 heap [k] = w;
652 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
653
654} 785}
655 786
787/* away from the root */
656void inline_speed 788void inline_speed
657downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
658{ 790{
659 WT w = heap [k]; 791 WT w = heap [k];
660 792
661 while (k < (N >> 1)) 793 for (;;)
662 { 794 {
663 int j = k << 1; 795 int c = k << 1;
664 796
665 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 797 if (c > N)
666 ++j;
667
668 if (w->at <= heap [j]->at)
669 break; 798 break;
670 799
800 c += c < N && heap [c]->at > heap [c + 1]->at
801 ? 1 : 0;
802
803 if (w->at <= heap [c]->at)
804 break;
805
671 heap [k] = heap [j]; 806 heap [k] = heap [c];
672 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
808
673 k = j; 809 k = c;
674 } 810 }
675 811
676 heap [k] = w; 812 heap [k] = w;
677 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
678} 814}
679 815
680void inline_size 816void inline_size
681adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
682{ 818{
687/*****************************************************************************/ 823/*****************************************************************************/
688 824
689typedef struct 825typedef struct
690{ 826{
691 WL head; 827 WL head;
692 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
693} ANSIG; 829} ANSIG;
694 830
695static ANSIG *signals; 831static ANSIG *signals;
696static int signalmax; 832static int signalmax;
697 833
698static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
699static sig_atomic_t volatile gotsig;
700static ev_io sigev;
701 835
702void inline_size 836void inline_size
703signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
704{ 838{
705 while (count--) 839 while (count--)
709 843
710 ++base; 844 ++base;
711 } 845 }
712} 846}
713 847
714static void 848/*****************************************************************************/
715sighandler (int signum)
716{
717#if _WIN32
718 signal (signum, sighandler);
719#endif
720
721 signals [signum - 1].gotsig = 1;
722
723 if (!gotsig)
724 {
725 int old_errno = errno;
726 gotsig = 1;
727 write (sigpipe [1], &signum, 1);
728 errno = old_errno;
729 }
730}
731
732void noinline
733ev_feed_signal_event (EV_P_ int signum)
734{
735 WL w;
736
737#if EV_MULTIPLICITY
738 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
739#endif
740
741 --signum;
742
743 if (signum < 0 || signum >= signalmax)
744 return;
745
746 signals [signum].gotsig = 0;
747
748 for (w = signals [signum].head; w; w = w->next)
749 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
750}
751
752static void
753sigcb (EV_P_ ev_io *iow, int revents)
754{
755 int signum;
756
757 read (sigpipe [0], &revents, 1);
758 gotsig = 0;
759
760 for (signum = signalmax; signum--; )
761 if (signals [signum].gotsig)
762 ev_feed_signal_event (EV_A_ signum + 1);
763}
764 849
765void inline_speed 850void inline_speed
766fd_intern (int fd) 851fd_intern (int fd)
767{ 852{
768#ifdef _WIN32 853#ifdef _WIN32
773 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
774#endif 859#endif
775} 860}
776 861
777static void noinline 862static void noinline
778siginit (EV_P) 863evpipe_init (EV_P)
779{ 864{
865 if (!ev_is_active (&pipeev))
866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
877 while (pipe (evpipe))
878 syserr ("(libev) error creating signal/async pipe");
879
780 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
781 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
782 884
783 ev_io_set (&sigev, sigpipe [0], EV_READ);
784 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
785 ev_unref (EV_A); /* child watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
887 }
888}
889
890void inline_size
891evpipe_write (EV_P_ EV_ATOMIC_T *flag)
892{
893 if (!*flag)
894 {
895 int old_errno = errno; /* save errno because write might clobber it */
896
897 *flag = 1;
898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
907 write (evpipe [1], &old_errno, 1);
908
909 errno = old_errno;
910 }
911}
912
913static void
914pipecb (EV_P_ ev_io *iow, int revents)
915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
918 {
919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
926 read (evpipe [0], &dummy, 1);
927 }
928
929 if (gotsig && ev_is_default_loop (EV_A))
930 {
931 int signum;
932 gotsig = 0;
933
934 for (signum = signalmax; signum--; )
935 if (signals [signum].gotsig)
936 ev_feed_signal_event (EV_A_ signum + 1);
937 }
938
939#if EV_ASYNC_ENABLE
940 if (gotasync)
941 {
942 int i;
943 gotasync = 0;
944
945 for (i = asynccnt; i--; )
946 if (asyncs [i]->sent)
947 {
948 asyncs [i]->sent = 0;
949 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
950 }
951 }
952#endif
786} 953}
787 954
788/*****************************************************************************/ 955/*****************************************************************************/
789 956
957static void
958ev_sighandler (int signum)
959{
960#if EV_MULTIPLICITY
961 struct ev_loop *loop = &default_loop_struct;
962#endif
963
964#if _WIN32
965 signal (signum, ev_sighandler);
966#endif
967
968 signals [signum - 1].gotsig = 1;
969 evpipe_write (EV_A_ &gotsig);
970}
971
972void noinline
973ev_feed_signal_event (EV_P_ int signum)
974{
975 WL w;
976
977#if EV_MULTIPLICITY
978 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
979#endif
980
981 --signum;
982
983 if (signum < 0 || signum >= signalmax)
984 return;
985
986 signals [signum].gotsig = 0;
987
988 for (w = signals [signum].head; w; w = w->next)
989 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
990}
991
992/*****************************************************************************/
993
790static ev_child *childs [EV_PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
791 995
792#ifndef _WIN32 996#ifndef _WIN32
793 997
794static ev_signal childev; 998static ev_signal childev;
795 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
796void inline_speed 1004void inline_speed
797child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
798{ 1006{
799 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
800 1009
801 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1010 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1011 {
802 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
803 { 1014 {
804 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1015 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
805 w->rpid = pid; 1016 w->rpid = pid;
806 w->rstatus = status; 1017 w->rstatus = status;
807 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
808 } 1019 }
1020 }
809} 1021}
810 1022
811#ifndef WCONTINUED 1023#ifndef WCONTINUED
812# define WCONTINUED 0 1024# define WCONTINUED 0
813#endif 1025#endif
822 if (!WCONTINUED 1034 if (!WCONTINUED
823 || errno != EINVAL 1035 || errno != EINVAL
824 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
825 return; 1037 return;
826 1038
827 /* make sure we are called again until all childs have been reaped */ 1039 /* make sure we are called again until all children have been reaped */
828 /* we need to do it this way so that the callback gets called before we continue */ 1040 /* we need to do it this way so that the callback gets called before we continue */
829 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
830 1042
831 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
832 if (EV_PID_HASHSIZE > 1) 1044 if (EV_PID_HASHSIZE > 1)
833 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
834} 1046}
835 1047
836#endif 1048#endif
837 1049
838/*****************************************************************************/ 1050/*****************************************************************************/
910} 1122}
911 1123
912unsigned int 1124unsigned int
913ev_embeddable_backends (void) 1125ev_embeddable_backends (void)
914{ 1126{
915 return EVBACKEND_EPOLL 1127 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
916 | EVBACKEND_KQUEUE 1128
917 | EVBACKEND_PORT; 1129 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1130 /* please fix it and tell me how to detect the fix */
1131 flags &= ~EVBACKEND_EPOLL;
1132
1133 return flags;
918} 1134}
919 1135
920unsigned int 1136unsigned int
921ev_backend (EV_P) 1137ev_backend (EV_P)
922{ 1138{
925 1141
926unsigned int 1142unsigned int
927ev_loop_count (EV_P) 1143ev_loop_count (EV_P)
928{ 1144{
929 return loop_count; 1145 return loop_count;
1146}
1147
1148void
1149ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1150{
1151 io_blocktime = interval;
1152}
1153
1154void
1155ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1156{
1157 timeout_blocktime = interval;
930} 1158}
931 1159
932static void noinline 1160static void noinline
933loop_init (EV_P_ unsigned int flags) 1161loop_init (EV_P_ unsigned int flags)
934{ 1162{
940 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
941 have_monotonic = 1; 1169 have_monotonic = 1;
942 } 1170 }
943#endif 1171#endif
944 1172
945 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
946 mn_now = get_clock (); 1174 mn_now = get_clock ();
947 now_floor = mn_now; 1175 now_floor = mn_now;
948 rtmn_diff = ev_rt_now - mn_now; 1176 rtmn_diff = ev_rt_now - mn_now;
1177
1178 io_blocktime = 0.;
1179 timeout_blocktime = 0.;
1180 backend = 0;
1181 backend_fd = -1;
1182 gotasync = 0;
1183#if EV_USE_INOTIFY
1184 fs_fd = -2;
1185#endif
949 1186
950 /* pid check not overridable via env */ 1187 /* pid check not overridable via env */
951#ifndef _WIN32 1188#ifndef _WIN32
952 if (flags & EVFLAG_FORKCHECK) 1189 if (flags & EVFLAG_FORKCHECK)
953 curpid = getpid (); 1190 curpid = getpid ();
956 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
957 && !enable_secure () 1194 && !enable_secure ()
958 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
959 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
960 1197
961 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
962 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
963
964 backend = 0;
965 backend_fd = -1;
966#if EV_USE_INOTIFY
967 fs_fd = -2;
968#endif
969 1200
970#if EV_USE_PORT 1201#if EV_USE_PORT
971 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
972#endif 1203#endif
973#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
981#endif 1212#endif
982#if EV_USE_SELECT 1213#if EV_USE_SELECT
983 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
984#endif 1215#endif
985 1216
986 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
987 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
988 } 1219 }
989} 1220}
990 1221
991static void noinline 1222static void noinline
992loop_destroy (EV_P) 1223loop_destroy (EV_P)
993{ 1224{
994 int i; 1225 int i;
1226
1227 if (ev_is_active (&pipeev))
1228 {
1229 ev_ref (EV_A); /* signal watcher */
1230 ev_io_stop (EV_A_ &pipeev);
1231
1232#if EV_USE_EVENTFD
1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1242 }
995 1243
996#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
997 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
998 close (fs_fd); 1246 close (fs_fd);
999#endif 1247#endif
1022 array_free (pending, [i]); 1270 array_free (pending, [i]);
1023#if EV_IDLE_ENABLE 1271#if EV_IDLE_ENABLE
1024 array_free (idle, [i]); 1272 array_free (idle, [i]);
1025#endif 1273#endif
1026 } 1274 }
1275
1276 ev_free (anfds); anfdmax = 0;
1027 1277
1028 /* have to use the microsoft-never-gets-it-right macro */ 1278 /* have to use the microsoft-never-gets-it-right macro */
1029 array_free (fdchange, EMPTY); 1279 array_free (fdchange, EMPTY);
1030 array_free (timer, EMPTY); 1280 array_free (timer, EMPTY);
1031#if EV_PERIODIC_ENABLE 1281#if EV_PERIODIC_ENABLE
1032 array_free (periodic, EMPTY); 1282 array_free (periodic, EMPTY);
1033#endif 1283#endif
1284#if EV_FORK_ENABLE
1285 array_free (fork, EMPTY);
1286#endif
1034 array_free (prepare, EMPTY); 1287 array_free (prepare, EMPTY);
1035 array_free (check, EMPTY); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
1036 1292
1037 backend = 0; 1293 backend = 0;
1038} 1294}
1039 1295
1296#if EV_USE_INOTIFY
1040void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1041 1299
1042void inline_size 1300void inline_size
1043loop_fork (EV_P) 1301loop_fork (EV_P)
1044{ 1302{
1045#if EV_USE_PORT 1303#if EV_USE_PORT
1053#endif 1311#endif
1054#if EV_USE_INOTIFY 1312#if EV_USE_INOTIFY
1055 infy_fork (EV_A); 1313 infy_fork (EV_A);
1056#endif 1314#endif
1057 1315
1058 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
1059 { 1317 {
1060 /* default loop */ 1318 /* this "locks" the handlers against writing to the pipe */
1319 /* while we modify the fd vars */
1320 gotsig = 1;
1321#if EV_ASYNC_ENABLE
1322 gotasync = 1;
1323#endif
1061 1324
1062 ev_ref (EV_A); 1325 ev_ref (EV_A);
1063 ev_io_stop (EV_A_ &sigev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
1064 close (sigpipe [0]); 1335 close (evpipe [0]);
1065 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
1066 1338
1067 while (pipe (sigpipe))
1068 syserr ("(libev) error creating pipe");
1069
1070 siginit (EV_A); 1339 evpipe_init (EV_A);
1340 /* now iterate over everything, in case we missed something */
1341 pipecb (EV_A_ &pipeev, EV_READ);
1071 } 1342 }
1072 1343
1073 postfork = 0; 1344 postfork = 0;
1074} 1345}
1075 1346
1097} 1368}
1098 1369
1099void 1370void
1100ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1101{ 1372{
1102 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
1103} 1374}
1104 1375
1105#endif 1376#endif
1106 1377
1107#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
1110#else 1381#else
1111int 1382int
1112ev_default_loop (unsigned int flags) 1383ev_default_loop (unsigned int flags)
1113#endif 1384#endif
1114{ 1385{
1115 if (sigpipe [0] == sigpipe [1])
1116 if (pipe (sigpipe))
1117 return 0;
1118
1119 if (!ev_default_loop_ptr) 1386 if (!ev_default_loop_ptr)
1120 { 1387 {
1121#if EV_MULTIPLICITY 1388#if EV_MULTIPLICITY
1122 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1389 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1123#else 1390#else
1126 1393
1127 loop_init (EV_A_ flags); 1394 loop_init (EV_A_ flags);
1128 1395
1129 if (ev_backend (EV_A)) 1396 if (ev_backend (EV_A))
1130 { 1397 {
1131 siginit (EV_A);
1132
1133#ifndef _WIN32 1398#ifndef _WIN32
1134 ev_signal_init (&childev, childcb, SIGCHLD); 1399 ev_signal_init (&childev, childcb, SIGCHLD);
1135 ev_set_priority (&childev, EV_MAXPRI); 1400 ev_set_priority (&childev, EV_MAXPRI);
1136 ev_signal_start (EV_A_ &childev); 1401 ev_signal_start (EV_A_ &childev);
1137 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1402 ev_unref (EV_A); /* child watcher should not keep loop alive */
1154#ifndef _WIN32 1419#ifndef _WIN32
1155 ev_ref (EV_A); /* child watcher */ 1420 ev_ref (EV_A); /* child watcher */
1156 ev_signal_stop (EV_A_ &childev); 1421 ev_signal_stop (EV_A_ &childev);
1157#endif 1422#endif
1158 1423
1159 ev_ref (EV_A); /* signal watcher */
1160 ev_io_stop (EV_A_ &sigev);
1161
1162 close (sigpipe [0]); sigpipe [0] = 0;
1163 close (sigpipe [1]); sigpipe [1] = 0;
1164
1165 loop_destroy (EV_A); 1424 loop_destroy (EV_A);
1166} 1425}
1167 1426
1168void 1427void
1169ev_default_fork (void) 1428ev_default_fork (void)
1171#if EV_MULTIPLICITY 1430#if EV_MULTIPLICITY
1172 struct ev_loop *loop = ev_default_loop_ptr; 1431 struct ev_loop *loop = ev_default_loop_ptr;
1173#endif 1432#endif
1174 1433
1175 if (backend) 1434 if (backend)
1176 postfork = 1; 1435 postfork = 1; /* must be in line with ev_loop_fork */
1177} 1436}
1178 1437
1179/*****************************************************************************/ 1438/*****************************************************************************/
1180 1439
1181void 1440void
1205} 1464}
1206 1465
1207void inline_size 1466void inline_size
1208timers_reify (EV_P) 1467timers_reify (EV_P)
1209{ 1468{
1210 while (timercnt && ((WT)timers [0])->at <= mn_now) 1469 while (timercnt && ev_at (timers [1]) <= mn_now)
1211 { 1470 {
1212 ev_timer *w = timers [0]; 1471 ev_timer *w = (ev_timer *)timers [1];
1213 1472
1214 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1473 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1215 1474
1216 /* first reschedule or stop timer */ 1475 /* first reschedule or stop timer */
1217 if (w->repeat) 1476 if (w->repeat)
1218 { 1477 {
1219 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1478 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1220 1479
1221 ((WT)w)->at += w->repeat; 1480 ev_at (w) += w->repeat;
1222 if (((WT)w)->at < mn_now) 1481 if (ev_at (w) < mn_now)
1223 ((WT)w)->at = mn_now; 1482 ev_at (w) = mn_now;
1224 1483
1225 downheap ((WT *)timers, timercnt, 0); 1484 downheap (timers, timercnt, 1);
1226 } 1485 }
1227 else 1486 else
1228 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1487 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1229 1488
1230 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1489 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1233 1492
1234#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1235void inline_size 1494void inline_size
1236periodics_reify (EV_P) 1495periodics_reify (EV_P)
1237{ 1496{
1238 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1497 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1239 { 1498 {
1240 ev_periodic *w = periodics [0]; 1499 ev_periodic *w = (ev_periodic *)periodics [1];
1241 1500
1242 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1501 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1243 1502
1244 /* first reschedule or stop timer */ 1503 /* first reschedule or stop timer */
1245 if (w->reschedule_cb) 1504 if (w->reschedule_cb)
1246 { 1505 {
1247 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1506 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1248 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1507 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1249 downheap ((WT *)periodics, periodiccnt, 0); 1508 downheap (periodics, periodiccnt, 1);
1250 } 1509 }
1251 else if (w->interval) 1510 else if (w->interval)
1252 { 1511 {
1253 ((WT)w)->at = w->offset + floor ((ev_rt_now + TIME_EPSILON - w->offset) / w->interval + 1.) * w->interval; 1512 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1513 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1514 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1255 downheap ((WT *)periodics, periodiccnt, 0); 1515 downheap (periodics, periodiccnt, 1);
1256 } 1516 }
1257 else 1517 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1518 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1519
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1520 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1265periodics_reschedule (EV_P) 1525periodics_reschedule (EV_P)
1266{ 1526{
1267 int i; 1527 int i;
1268 1528
1269 /* adjust periodics after time jump */ 1529 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1530 for (i = 1; i <= periodiccnt; ++i)
1271 { 1531 {
1272 ev_periodic *w = periodics [i]; 1532 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1533
1274 if (w->reschedule_cb) 1534 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1535 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1536 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1537 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1538 }
1279 1539
1280 /* now rebuild the heap */ 1540 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1541 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1542 downheap (periodics, periodiccnt, i);
1283} 1543}
1284#endif 1544#endif
1285 1545
1286#if EV_IDLE_ENABLE 1546#if EV_IDLE_ENABLE
1287void inline_size 1547void inline_size
1304 } 1564 }
1305 } 1565 }
1306} 1566}
1307#endif 1567#endif
1308 1568
1309int inline_size 1569void inline_speed
1310time_update_monotonic (EV_P) 1570time_update (EV_P_ ev_tstamp max_block)
1311{ 1571{
1572 int i;
1573
1574#if EV_USE_MONOTONIC
1575 if (expect_true (have_monotonic))
1576 {
1577 ev_tstamp odiff = rtmn_diff;
1578
1312 mn_now = get_clock (); 1579 mn_now = get_clock ();
1313 1580
1581 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1582 /* interpolate in the meantime */
1314 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1583 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1315 { 1584 {
1316 ev_rt_now = rtmn_diff + mn_now; 1585 ev_rt_now = rtmn_diff + mn_now;
1317 return 0; 1586 return;
1318 } 1587 }
1319 else 1588
1320 {
1321 now_floor = mn_now; 1589 now_floor = mn_now;
1322 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1323 return 1;
1324 }
1325}
1326 1591
1327void inline_size 1592 /* loop a few times, before making important decisions.
1328time_update (EV_P) 1593 * on the choice of "4": one iteration isn't enough,
1329{ 1594 * in case we get preempted during the calls to
1330 int i; 1595 * ev_time and get_clock. a second call is almost guaranteed
1331 1596 * to succeed in that case, though. and looping a few more times
1332#if EV_USE_MONOTONIC 1597 * doesn't hurt either as we only do this on time-jumps or
1333 if (expect_true (have_monotonic)) 1598 * in the unlikely event of having been preempted here.
1334 { 1599 */
1335 if (time_update_monotonic (EV_A)) 1600 for (i = 4; --i; )
1336 { 1601 {
1337 ev_tstamp odiff = rtmn_diff;
1338
1339 /* loop a few times, before making important decisions.
1340 * on the choice of "4": one iteration isn't enough,
1341 * in case we get preempted during the calls to
1342 * ev_time and get_clock. a second call is almost guaranteed
1343 * to succeed in that case, though. and looping a few more times
1344 * doesn't hurt either as we only do this on time-jumps or
1345 * in the unlikely event of having been preempted here.
1346 */
1347 for (i = 4; --i; )
1348 {
1349 rtmn_diff = ev_rt_now - mn_now; 1602 rtmn_diff = ev_rt_now - mn_now;
1350 1603
1351 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1604 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1352 return; /* all is well */ 1605 return; /* all is well */
1353 1606
1354 ev_rt_now = ev_time (); 1607 ev_rt_now = ev_time ();
1355 mn_now = get_clock (); 1608 mn_now = get_clock ();
1356 now_floor = mn_now; 1609 now_floor = mn_now;
1357 } 1610 }
1358 1611
1359# if EV_PERIODIC_ENABLE 1612# if EV_PERIODIC_ENABLE
1360 periodics_reschedule (EV_A); 1613 periodics_reschedule (EV_A);
1361# endif 1614# endif
1362 /* no timer adjustment, as the monotonic clock doesn't jump */ 1615 /* no timer adjustment, as the monotonic clock doesn't jump */
1363 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1616 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1364 }
1365 } 1617 }
1366 else 1618 else
1367#endif 1619#endif
1368 { 1620 {
1369 ev_rt_now = ev_time (); 1621 ev_rt_now = ev_time ();
1370 1622
1371 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1623 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1372 { 1624 {
1373#if EV_PERIODIC_ENABLE 1625#if EV_PERIODIC_ENABLE
1374 periodics_reschedule (EV_A); 1626 periodics_reschedule (EV_A);
1375#endif 1627#endif
1376
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1628 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1629 for (i = 1; i <= timercnt; ++i)
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1630 ev_at (timers [i]) += ev_rt_now - mn_now;
1380 } 1631 }
1381 1632
1382 mn_now = ev_rt_now; 1633 mn_now = ev_rt_now;
1383 } 1634 }
1384} 1635}
1398static int loop_done; 1649static int loop_done;
1399 1650
1400void 1651void
1401ev_loop (EV_P_ int flags) 1652ev_loop (EV_P_ int flags)
1402{ 1653{
1403 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1654 loop_done = EVUNLOOP_CANCEL;
1404 ? EVUNLOOP_ONE
1405 : EVUNLOOP_CANCEL;
1406 1655
1407 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1656 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1408 1657
1409 do 1658 do
1410 { 1659 {
1444 /* update fd-related kernel structures */ 1693 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1694 fd_reify (EV_A);
1446 1695
1447 /* calculate blocking time */ 1696 /* calculate blocking time */
1448 { 1697 {
1449 ev_tstamp block; 1698 ev_tstamp waittime = 0.;
1699 ev_tstamp sleeptime = 0.;
1450 1700
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1701 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1702 {
1455 /* update time to cancel out callback processing overhead */ 1703 /* update time to cancel out callback processing overhead */
1456#if EV_USE_MONOTONIC
1457 if (expect_true (have_monotonic))
1458 time_update_monotonic (EV_A); 1704 time_update (EV_A_ 1e100);
1459 else
1460#endif
1461 {
1462 ev_rt_now = ev_time ();
1463 mn_now = ev_rt_now;
1464 }
1465 1705
1466 block = MAX_BLOCKTIME; 1706 waittime = MAX_BLOCKTIME;
1467 1707
1468 if (timercnt) 1708 if (timercnt)
1469 { 1709 {
1470 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1710 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1471 if (block > to) block = to; 1711 if (waittime > to) waittime = to;
1472 } 1712 }
1473 1713
1474#if EV_PERIODIC_ENABLE 1714#if EV_PERIODIC_ENABLE
1475 if (periodiccnt) 1715 if (periodiccnt)
1476 { 1716 {
1477 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1717 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1478 if (block > to) block = to; 1718 if (waittime > to) waittime = to;
1479 } 1719 }
1480#endif 1720#endif
1481 1721
1482 if (expect_false (block < 0.)) block = 0.; 1722 if (expect_false (waittime < timeout_blocktime))
1723 waittime = timeout_blocktime;
1724
1725 sleeptime = waittime - backend_fudge;
1726
1727 if (expect_true (sleeptime > io_blocktime))
1728 sleeptime = io_blocktime;
1729
1730 if (sleeptime)
1731 {
1732 ev_sleep (sleeptime);
1733 waittime -= sleeptime;
1734 }
1483 } 1735 }
1484 1736
1485 ++loop_count; 1737 ++loop_count;
1486 backend_poll (EV_A_ block); 1738 backend_poll (EV_A_ waittime);
1739
1740 /* update ev_rt_now, do magic */
1741 time_update (EV_A_ waittime + sleeptime);
1487 } 1742 }
1488
1489 /* update ev_rt_now, do magic */
1490 time_update (EV_A);
1491 1743
1492 /* queue pending timers and reschedule them */ 1744 /* queue pending timers and reschedule them */
1493 timers_reify (EV_A); /* relative timers called last */ 1745 timers_reify (EV_A); /* relative timers called last */
1494#if EV_PERIODIC_ENABLE 1746#if EV_PERIODIC_ENABLE
1495 periodics_reify (EV_A); /* absolute timers called first */ 1747 periodics_reify (EV_A); /* absolute timers called first */
1503 /* queue check watchers, to be executed first */ 1755 /* queue check watchers, to be executed first */
1504 if (expect_false (checkcnt)) 1756 if (expect_false (checkcnt))
1505 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1757 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1506 1758
1507 call_pending (EV_A); 1759 call_pending (EV_A);
1508
1509 } 1760 }
1510 while (expect_true (activecnt && !loop_done)); 1761 while (expect_true (
1762 activecnt
1763 && !loop_done
1764 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1765 ));
1511 1766
1512 if (loop_done == EVUNLOOP_ONE) 1767 if (loop_done == EVUNLOOP_ONE)
1513 loop_done = EVUNLOOP_CANCEL; 1768 loop_done = EVUNLOOP_CANCEL;
1514} 1769}
1515 1770
1606 1861
1607 assert (("ev_io_start called with negative fd", fd >= 0)); 1862 assert (("ev_io_start called with negative fd", fd >= 0));
1608 1863
1609 ev_start (EV_A_ (W)w, 1); 1864 ev_start (EV_A_ (W)w, 1);
1610 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1865 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1611 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1866 wlist_add (&anfds[fd].head, (WL)w);
1612 1867
1613 fd_change (EV_A_ fd); 1868 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1869 w->events &= ~EV_IOFDSET;
1614} 1870}
1615 1871
1616void noinline 1872void noinline
1617ev_io_stop (EV_P_ ev_io *w) 1873ev_io_stop (EV_P_ ev_io *w)
1618{ 1874{
1620 if (expect_false (!ev_is_active (w))) 1876 if (expect_false (!ev_is_active (w)))
1621 return; 1877 return;
1622 1878
1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1879 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1624 1880
1625 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1881 wlist_del (&anfds[w->fd].head, (WL)w);
1626 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1627 1883
1628 fd_change (EV_A_ w->fd); 1884 fd_change (EV_A_ w->fd, 1);
1629} 1885}
1630 1886
1631void noinline 1887void noinline
1632ev_timer_start (EV_P_ ev_timer *w) 1888ev_timer_start (EV_P_ ev_timer *w)
1633{ 1889{
1634 if (expect_false (ev_is_active (w))) 1890 if (expect_false (ev_is_active (w)))
1635 return; 1891 return;
1636 1892
1637 ((WT)w)->at += mn_now; 1893 ev_at (w) += mn_now;
1638 1894
1639 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1895 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1640 1896
1641 ev_start (EV_A_ (W)w, ++timercnt); 1897 ev_start (EV_A_ (W)w, ++timercnt);
1642 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1898 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1643 timers [timercnt - 1] = w; 1899 timers [timercnt] = (WT)w;
1644 upheap ((WT *)timers, timercnt - 1); 1900 upheap (timers, timercnt);
1645 1901
1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1902 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1647} 1903}
1648 1904
1649void noinline 1905void noinline
1650ev_timer_stop (EV_P_ ev_timer *w) 1906ev_timer_stop (EV_P_ ev_timer *w)
1651{ 1907{
1652 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1653 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1654 return; 1910 return;
1655 1911
1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1657
1658 { 1912 {
1659 int active = ((W)w)->active; 1913 int active = ev_active (w);
1660 1914
1915 assert (("internal timer heap corruption", timers [active] == (WT)w));
1916
1661 if (expect_true (--active < --timercnt)) 1917 if (expect_true (active < timercnt))
1662 { 1918 {
1663 timers [active] = timers [timercnt]; 1919 timers [active] = timers [timercnt];
1664 adjustheap ((WT *)timers, timercnt, active); 1920 adjustheap (timers, timercnt, active);
1665 } 1921 }
1922
1923 --timercnt;
1666 } 1924 }
1667 1925
1668 ((WT)w)->at -= mn_now; 1926 ev_at (w) -= mn_now;
1669 1927
1670 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1671} 1929}
1672 1930
1673void noinline 1931void noinline
1675{ 1933{
1676 if (ev_is_active (w)) 1934 if (ev_is_active (w))
1677 { 1935 {
1678 if (w->repeat) 1936 if (w->repeat)
1679 { 1937 {
1680 ((WT)w)->at = mn_now + w->repeat; 1938 ev_at (w) = mn_now + w->repeat;
1681 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1939 adjustheap (timers, timercnt, ev_active (w));
1682 } 1940 }
1683 else 1941 else
1684 ev_timer_stop (EV_A_ w); 1942 ev_timer_stop (EV_A_ w);
1685 } 1943 }
1686 else if (w->repeat) 1944 else if (w->repeat)
1687 { 1945 {
1688 w->at = w->repeat; 1946 ev_at (w) = w->repeat;
1689 ev_timer_start (EV_A_ w); 1947 ev_timer_start (EV_A_ w);
1690 } 1948 }
1691} 1949}
1692 1950
1693#if EV_PERIODIC_ENABLE 1951#if EV_PERIODIC_ENABLE
1696{ 1954{
1697 if (expect_false (ev_is_active (w))) 1955 if (expect_false (ev_is_active (w)))
1698 return; 1956 return;
1699 1957
1700 if (w->reschedule_cb) 1958 if (w->reschedule_cb)
1701 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1959 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1702 else if (w->interval) 1960 else if (w->interval)
1703 { 1961 {
1704 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1962 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1705 /* this formula differs from the one in periodic_reify because we do not always round up */ 1963 /* this formula differs from the one in periodic_reify because we do not always round up */
1706 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1964 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1707 } 1965 }
1708 else 1966 else
1709 ((WT)w)->at = w->offset; 1967 ev_at (w) = w->offset;
1710 1968
1711 ev_start (EV_A_ (W)w, ++periodiccnt); 1969 ev_start (EV_A_ (W)w, ++periodiccnt);
1712 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1970 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1713 periodics [periodiccnt - 1] = w; 1971 periodics [periodiccnt] = (WT)w;
1714 upheap ((WT *)periodics, periodiccnt - 1); 1972 upheap (periodics, periodiccnt);
1715 1973
1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1974 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1717} 1975}
1718 1976
1719void noinline 1977void noinline
1720ev_periodic_stop (EV_P_ ev_periodic *w) 1978ev_periodic_stop (EV_P_ ev_periodic *w)
1721{ 1979{
1722 clear_pending (EV_A_ (W)w); 1980 clear_pending (EV_A_ (W)w);
1723 if (expect_false (!ev_is_active (w))) 1981 if (expect_false (!ev_is_active (w)))
1724 return; 1982 return;
1725 1983
1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1727
1728 { 1984 {
1729 int active = ((W)w)->active; 1985 int active = ev_active (w);
1730 1986
1987 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1988
1731 if (expect_true (--active < --periodiccnt)) 1989 if (expect_true (active < periodiccnt))
1732 { 1990 {
1733 periodics [active] = periodics [periodiccnt]; 1991 periodics [active] = periodics [periodiccnt];
1734 adjustheap ((WT *)periodics, periodiccnt, active); 1992 adjustheap (periodics, periodiccnt, active);
1735 } 1993 }
1994
1995 --periodiccnt;
1736 } 1996 }
1737 1997
1738 ev_stop (EV_A_ (W)w); 1998 ev_stop (EV_A_ (W)w);
1739} 1999}
1740 2000
1760 if (expect_false (ev_is_active (w))) 2020 if (expect_false (ev_is_active (w)))
1761 return; 2021 return;
1762 2022
1763 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2023 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1764 2024
2025 evpipe_init (EV_A);
2026
2027 {
2028#ifndef _WIN32
2029 sigset_t full, prev;
2030 sigfillset (&full);
2031 sigprocmask (SIG_SETMASK, &full, &prev);
2032#endif
2033
2034 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
2035
2036#ifndef _WIN32
2037 sigprocmask (SIG_SETMASK, &prev, 0);
2038#endif
2039 }
2040
1765 ev_start (EV_A_ (W)w, 1); 2041 ev_start (EV_A_ (W)w, 1);
1766 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1767 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2042 wlist_add (&signals [w->signum - 1].head, (WL)w);
1768 2043
1769 if (!((WL)w)->next) 2044 if (!((WL)w)->next)
1770 { 2045 {
1771#if _WIN32 2046#if _WIN32
1772 signal (w->signum, sighandler); 2047 signal (w->signum, ev_sighandler);
1773#else 2048#else
1774 struct sigaction sa; 2049 struct sigaction sa;
1775 sa.sa_handler = sighandler; 2050 sa.sa_handler = ev_sighandler;
1776 sigfillset (&sa.sa_mask); 2051 sigfillset (&sa.sa_mask);
1777 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2052 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1778 sigaction (w->signum, &sa, 0); 2053 sigaction (w->signum, &sa, 0);
1779#endif 2054#endif
1780 } 2055 }
1785{ 2060{
1786 clear_pending (EV_A_ (W)w); 2061 clear_pending (EV_A_ (W)w);
1787 if (expect_false (!ev_is_active (w))) 2062 if (expect_false (!ev_is_active (w)))
1788 return; 2063 return;
1789 2064
1790 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2065 wlist_del (&signals [w->signum - 1].head, (WL)w);
1791 ev_stop (EV_A_ (W)w); 2066 ev_stop (EV_A_ (W)w);
1792 2067
1793 if (!signals [w->signum - 1].head) 2068 if (!signals [w->signum - 1].head)
1794 signal (w->signum, SIG_DFL); 2069 signal (w->signum, SIG_DFL);
1795} 2070}
1802#endif 2077#endif
1803 if (expect_false (ev_is_active (w))) 2078 if (expect_false (ev_is_active (w)))
1804 return; 2079 return;
1805 2080
1806 ev_start (EV_A_ (W)w, 1); 2081 ev_start (EV_A_ (W)w, 1);
1807 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2082 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1808} 2083}
1809 2084
1810void 2085void
1811ev_child_stop (EV_P_ ev_child *w) 2086ev_child_stop (EV_P_ ev_child *w)
1812{ 2087{
1813 clear_pending (EV_A_ (W)w); 2088 clear_pending (EV_A_ (W)w);
1814 if (expect_false (!ev_is_active (w))) 2089 if (expect_false (!ev_is_active (w)))
1815 return; 2090 return;
1816 2091
1817 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2092 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1818 ev_stop (EV_A_ (W)w); 2093 ev_stop (EV_A_ (W)w);
1819} 2094}
1820 2095
1821#if EV_STAT_ENABLE 2096#if EV_STAT_ENABLE
1822 2097
1841 if (w->wd < 0) 2116 if (w->wd < 0)
1842 { 2117 {
1843 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2118 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1844 2119
1845 /* monitor some parent directory for speedup hints */ 2120 /* monitor some parent directory for speedup hints */
2121 /* note that exceeding the hardcoded limit is not a correctness issue, */
2122 /* but an efficiency issue only */
1846 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2123 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1847 { 2124 {
1848 char path [4096]; 2125 char path [4096];
1849 strcpy (path, w->path); 2126 strcpy (path, w->path);
1850 2127
2095 clear_pending (EV_A_ (W)w); 2372 clear_pending (EV_A_ (W)w);
2096 if (expect_false (!ev_is_active (w))) 2373 if (expect_false (!ev_is_active (w)))
2097 return; 2374 return;
2098 2375
2099 { 2376 {
2100 int active = ((W)w)->active; 2377 int active = ev_active (w);
2101 2378
2102 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2379 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2103 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2380 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2104 2381
2105 ev_stop (EV_A_ (W)w); 2382 ev_stop (EV_A_ (W)w);
2106 --idleall; 2383 --idleall;
2107 } 2384 }
2108} 2385}
2125 clear_pending (EV_A_ (W)w); 2402 clear_pending (EV_A_ (W)w);
2126 if (expect_false (!ev_is_active (w))) 2403 if (expect_false (!ev_is_active (w)))
2127 return; 2404 return;
2128 2405
2129 { 2406 {
2130 int active = ((W)w)->active; 2407 int active = ev_active (w);
2408
2131 prepares [active - 1] = prepares [--preparecnt]; 2409 prepares [active - 1] = prepares [--preparecnt];
2132 ((W)prepares [active - 1])->active = active; 2410 ev_active (prepares [active - 1]) = active;
2133 } 2411 }
2134 2412
2135 ev_stop (EV_A_ (W)w); 2413 ev_stop (EV_A_ (W)w);
2136} 2414}
2137 2415
2152 clear_pending (EV_A_ (W)w); 2430 clear_pending (EV_A_ (W)w);
2153 if (expect_false (!ev_is_active (w))) 2431 if (expect_false (!ev_is_active (w)))
2154 return; 2432 return;
2155 2433
2156 { 2434 {
2157 int active = ((W)w)->active; 2435 int active = ev_active (w);
2436
2158 checks [active - 1] = checks [--checkcnt]; 2437 checks [active - 1] = checks [--checkcnt];
2159 ((W)checks [active - 1])->active = active; 2438 ev_active (checks [active - 1]) = active;
2160 } 2439 }
2161 2440
2162 ev_stop (EV_A_ (W)w); 2441 ev_stop (EV_A_ (W)w);
2163} 2442}
2164 2443
2165#if EV_EMBED_ENABLE 2444#if EV_EMBED_ENABLE
2166void noinline 2445void noinline
2167ev_embed_sweep (EV_P_ ev_embed *w) 2446ev_embed_sweep (EV_P_ ev_embed *w)
2168{ 2447{
2169 ev_loop (w->loop, EVLOOP_NONBLOCK); 2448 ev_loop (w->other, EVLOOP_NONBLOCK);
2170} 2449}
2171 2450
2172static void 2451static void
2173embed_cb (EV_P_ ev_io *io, int revents) 2452embed_io_cb (EV_P_ ev_io *io, int revents)
2174{ 2453{
2175 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2454 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2176 2455
2177 if (ev_cb (w)) 2456 if (ev_cb (w))
2178 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2457 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2179 else 2458 else
2180 ev_embed_sweep (loop, w); 2459 ev_loop (w->other, EVLOOP_NONBLOCK);
2181} 2460}
2461
2462static void
2463embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2464{
2465 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2466
2467 {
2468 struct ev_loop *loop = w->other;
2469
2470 while (fdchangecnt)
2471 {
2472 fd_reify (EV_A);
2473 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2474 }
2475 }
2476}
2477
2478#if 0
2479static void
2480embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2481{
2482 ev_idle_stop (EV_A_ idle);
2483}
2484#endif
2182 2485
2183void 2486void
2184ev_embed_start (EV_P_ ev_embed *w) 2487ev_embed_start (EV_P_ ev_embed *w)
2185{ 2488{
2186 if (expect_false (ev_is_active (w))) 2489 if (expect_false (ev_is_active (w)))
2187 return; 2490 return;
2188 2491
2189 { 2492 {
2190 struct ev_loop *loop = w->loop; 2493 struct ev_loop *loop = w->other;
2191 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2494 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2192 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2495 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2193 } 2496 }
2194 2497
2195 ev_set_priority (&w->io, ev_priority (w)); 2498 ev_set_priority (&w->io, ev_priority (w));
2196 ev_io_start (EV_A_ &w->io); 2499 ev_io_start (EV_A_ &w->io);
2197 2500
2501 ev_prepare_init (&w->prepare, embed_prepare_cb);
2502 ev_set_priority (&w->prepare, EV_MINPRI);
2503 ev_prepare_start (EV_A_ &w->prepare);
2504
2505 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2506
2198 ev_start (EV_A_ (W)w, 1); 2507 ev_start (EV_A_ (W)w, 1);
2199} 2508}
2200 2509
2201void 2510void
2202ev_embed_stop (EV_P_ ev_embed *w) 2511ev_embed_stop (EV_P_ ev_embed *w)
2204 clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2205 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2206 return; 2515 return;
2207 2516
2208 ev_io_stop (EV_A_ &w->io); 2517 ev_io_stop (EV_A_ &w->io);
2518 ev_prepare_stop (EV_A_ &w->prepare);
2209 2519
2210 ev_stop (EV_A_ (W)w); 2520 ev_stop (EV_A_ (W)w);
2211} 2521}
2212#endif 2522#endif
2213 2523
2229 clear_pending (EV_A_ (W)w); 2539 clear_pending (EV_A_ (W)w);
2230 if (expect_false (!ev_is_active (w))) 2540 if (expect_false (!ev_is_active (w)))
2231 return; 2541 return;
2232 2542
2233 { 2543 {
2234 int active = ((W)w)->active; 2544 int active = ev_active (w);
2545
2235 forks [active - 1] = forks [--forkcnt]; 2546 forks [active - 1] = forks [--forkcnt];
2236 ((W)forks [active - 1])->active = active; 2547 ev_active (forks [active - 1]) = active;
2237 } 2548 }
2238 2549
2239 ev_stop (EV_A_ (W)w); 2550 ev_stop (EV_A_ (W)w);
2551}
2552#endif
2553
2554#if EV_ASYNC_ENABLE
2555void
2556ev_async_start (EV_P_ ev_async *w)
2557{
2558 if (expect_false (ev_is_active (w)))
2559 return;
2560
2561 evpipe_init (EV_A);
2562
2563 ev_start (EV_A_ (W)w, ++asynccnt);
2564 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2565 asyncs [asynccnt - 1] = w;
2566}
2567
2568void
2569ev_async_stop (EV_P_ ev_async *w)
2570{
2571 clear_pending (EV_A_ (W)w);
2572 if (expect_false (!ev_is_active (w)))
2573 return;
2574
2575 {
2576 int active = ev_active (w);
2577
2578 asyncs [active - 1] = asyncs [--asynccnt];
2579 ev_active (asyncs [active - 1]) = active;
2580 }
2581
2582 ev_stop (EV_A_ (W)w);
2583}
2584
2585void
2586ev_async_send (EV_P_ ev_async *w)
2587{
2588 w->sent = 1;
2589 evpipe_write (EV_A_ &gotasync);
2240} 2590}
2241#endif 2591#endif
2242 2592
2243/*****************************************************************************/ 2593/*****************************************************************************/
2244 2594
2302 ev_timer_set (&once->to, timeout, 0.); 2652 ev_timer_set (&once->to, timeout, 0.);
2303 ev_timer_start (EV_A_ &once->to); 2653 ev_timer_start (EV_A_ &once->to);
2304 } 2654 }
2305} 2655}
2306 2656
2657#if EV_MULTIPLICITY
2658 #include "ev_wrap.h"
2659#endif
2660
2307#ifdef __cplusplus 2661#ifdef __cplusplus
2308} 2662}
2309#endif 2663#endif
2310 2664

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines