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

Comparing libev/ev.c (file contents):
Revision 1.181 by root, Wed Dec 12 00:17:08 2007 UTC vs.
Revision 1.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/*
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/* towards the root */
638void inline_speed 765void inline_speed
639upheap (WT *heap, int k) 766upheap (WT *heap, int k)
640{ 767{
641 WT w = heap [k]; 768 WT w = heap [k];
642 769
643 while (k) 770 for (;;)
644 { 771 {
645 int p = (k - 1) >> 1; 772 int p = k >> 1;
646 773
774 /* maybe we could use a dummy element at heap [0]? */
647 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
648 break; 776 break;
649 777
650 heap [k] = heap [p]; 778 heap [k] = heap [p];
651 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
652 k = p; 780 k = p;
653 } 781 }
654 782
655 heap [k] = w; 783 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
657} 785}
658 786
787/* away from the root */
659void inline_speed 788void inline_speed
660downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
661{ 790{
662 WT w = heap [k]; 791 WT w = heap [k];
663 792
664 for (;;) 793 for (;;)
665 { 794 {
666 int c = (k << 1) + 1; 795 int c = k << 1;
667 796
668 if (c >= N) 797 if (c > N)
669 break; 798 break;
670 799
671 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
672 ? 1 : 0; 801 ? 1 : 0;
673 802
674 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
675 break; 804 break;
676 805
677 heap [k] = heap [c]; 806 heap [k] = heap [c];
678 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
679 808
680 k = c; 809 k = c;
681 } 810 }
682 811
683 heap [k] = w; 812 heap [k] = w;
684 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
685} 814}
686 815
687void inline_size 816void inline_size
688adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
689{ 818{
694/*****************************************************************************/ 823/*****************************************************************************/
695 824
696typedef struct 825typedef struct
697{ 826{
698 WL head; 827 WL head;
699 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
700} ANSIG; 829} ANSIG;
701 830
702static ANSIG *signals; 831static ANSIG *signals;
703static int signalmax; 832static int signalmax;
704 833
705static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
706static sig_atomic_t volatile gotsig;
707static ev_io sigev;
708 835
709void inline_size 836void inline_size
710signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
711{ 838{
712 while (count--) 839 while (count--)
716 843
717 ++base; 844 ++base;
718 } 845 }
719} 846}
720 847
721static void 848/*****************************************************************************/
722sighandler (int signum)
723{
724#if _WIN32
725 signal (signum, sighandler);
726#endif
727
728 signals [signum - 1].gotsig = 1;
729
730 if (!gotsig)
731 {
732 int old_errno = errno;
733 gotsig = 1;
734 write (sigpipe [1], &signum, 1);
735 errno = old_errno;
736 }
737}
738
739void noinline
740ev_feed_signal_event (EV_P_ int signum)
741{
742 WL w;
743
744#if EV_MULTIPLICITY
745 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
746#endif
747
748 --signum;
749
750 if (signum < 0 || signum >= signalmax)
751 return;
752
753 signals [signum].gotsig = 0;
754
755 for (w = signals [signum].head; w; w = w->next)
756 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
757}
758
759static void
760sigcb (EV_P_ ev_io *iow, int revents)
761{
762 int signum;
763
764 read (sigpipe [0], &revents, 1);
765 gotsig = 0;
766
767 for (signum = signalmax; signum--; )
768 if (signals [signum].gotsig)
769 ev_feed_signal_event (EV_A_ signum + 1);
770}
771 849
772void inline_speed 850void inline_speed
773fd_intern (int fd) 851fd_intern (int fd)
774{ 852{
775#ifdef _WIN32 853#ifdef _WIN32
780 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
781#endif 859#endif
782} 860}
783 861
784static void noinline 862static void noinline
785siginit (EV_P) 863evpipe_init (EV_P)
786{ 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
787 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
788 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
789 884
790 ev_io_set (&sigev, sigpipe [0], EV_READ);
791 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
792 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
793} 953}
794 954
795/*****************************************************************************/ 955/*****************************************************************************/
796 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
797static ev_child *childs [EV_PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
798 995
799#ifndef _WIN32 996#ifndef _WIN32
800 997
801static ev_signal childev; 998static ev_signal childev;
802 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
803void inline_speed 1004void inline_speed
804child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
805{ 1006{
806 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
807 1009
808 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 {
809 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
810 { 1014 {
811 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 */
812 w->rpid = pid; 1016 w->rpid = pid;
813 w->rstatus = status; 1017 w->rstatus = status;
814 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
815 } 1019 }
1020 }
816} 1021}
817 1022
818#ifndef WCONTINUED 1023#ifndef WCONTINUED
819# define WCONTINUED 0 1024# define WCONTINUED 0
820#endif 1025#endif
829 if (!WCONTINUED 1034 if (!WCONTINUED
830 || errno != EINVAL 1035 || errno != EINVAL
831 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
832 return; 1037 return;
833 1038
834 /* 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 */
835 /* 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 */
836 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
837 1042
838 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
839 if (EV_PID_HASHSIZE > 1) 1044 if (EV_PID_HASHSIZE > 1)
840 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
841} 1046}
842 1047
843#endif 1048#endif
844 1049
845/*****************************************************************************/ 1050/*****************************************************************************/
917} 1122}
918 1123
919unsigned int 1124unsigned int
920ev_embeddable_backends (void) 1125ev_embeddable_backends (void)
921{ 1126{
922 return EVBACKEND_EPOLL 1127 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
923 | EVBACKEND_KQUEUE 1128
924 | 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;
925} 1134}
926 1135
927unsigned int 1136unsigned int
928ev_backend (EV_P) 1137ev_backend (EV_P)
929{ 1138{
932 1141
933unsigned int 1142unsigned int
934ev_loop_count (EV_P) 1143ev_loop_count (EV_P)
935{ 1144{
936 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;
937} 1158}
938 1159
939static void noinline 1160static void noinline
940loop_init (EV_P_ unsigned int flags) 1161loop_init (EV_P_ unsigned int flags)
941{ 1162{
947 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
948 have_monotonic = 1; 1169 have_monotonic = 1;
949 } 1170 }
950#endif 1171#endif
951 1172
952 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1174 mn_now = get_clock ();
954 now_floor = mn_now; 1175 now_floor = mn_now;
955 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
956 1186
957 /* pid check not overridable via env */ 1187 /* pid check not overridable via env */
958#ifndef _WIN32 1188#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1189 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1190 curpid = getpid ();
963 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
964 && !enable_secure () 1194 && !enable_secure ()
965 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
966 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
967 1197
968 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
969 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
970
971 backend = 0;
972 backend_fd = -1;
973#if EV_USE_INOTIFY
974 fs_fd = -2;
975#endif
976 1200
977#if EV_USE_PORT 1201#if EV_USE_PORT
978 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
979#endif 1203#endif
980#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
988#endif 1212#endif
989#if EV_USE_SELECT 1213#if EV_USE_SELECT
990 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
991#endif 1215#endif
992 1216
993 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
994 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
995 } 1219 }
996} 1220}
997 1221
998static void noinline 1222static void noinline
999loop_destroy (EV_P) 1223loop_destroy (EV_P)
1000{ 1224{
1001 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 }
1002 1243
1003#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
1004 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
1005 close (fs_fd); 1246 close (fs_fd);
1006#endif 1247#endif
1029 array_free (pending, [i]); 1270 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1271#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1272 array_free (idle, [i]);
1032#endif 1273#endif
1033 } 1274 }
1275
1276 ev_free (anfds); anfdmax = 0;
1034 1277
1035 /* have to use the microsoft-never-gets-it-right macro */ 1278 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1279 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1280 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1281#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1282 array_free (periodic, EMPTY);
1040#endif 1283#endif
1284#if EV_FORK_ENABLE
1285 array_free (fork, EMPTY);
1286#endif
1041 array_free (prepare, EMPTY); 1287 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
1043 1292
1044 backend = 0; 1293 backend = 0;
1045} 1294}
1046 1295
1296#if EV_USE_INOTIFY
1047void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1048 1299
1049void inline_size 1300void inline_size
1050loop_fork (EV_P) 1301loop_fork (EV_P)
1051{ 1302{
1052#if EV_USE_PORT 1303#if EV_USE_PORT
1060#endif 1311#endif
1061#if EV_USE_INOTIFY 1312#if EV_USE_INOTIFY
1062 infy_fork (EV_A); 1313 infy_fork (EV_A);
1063#endif 1314#endif
1064 1315
1065 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
1066 { 1317 {
1067 /* 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
1068 1324
1069 ev_ref (EV_A); 1325 ev_ref (EV_A);
1070 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 {
1071 close (sigpipe [0]); 1335 close (evpipe [0]);
1072 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
1073 1338
1074 while (pipe (sigpipe))
1075 syserr ("(libev) error creating pipe");
1076
1077 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);
1078 } 1342 }
1079 1343
1080 postfork = 0; 1344 postfork = 0;
1081} 1345}
1082 1346
1104} 1368}
1105 1369
1106void 1370void
1107ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1108{ 1372{
1109 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
1110} 1374}
1111 1375
1112#endif 1376#endif
1113 1377
1114#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
1117#else 1381#else
1118int 1382int
1119ev_default_loop (unsigned int flags) 1383ev_default_loop (unsigned int flags)
1120#endif 1384#endif
1121{ 1385{
1122 if (sigpipe [0] == sigpipe [1])
1123 if (pipe (sigpipe))
1124 return 0;
1125
1126 if (!ev_default_loop_ptr) 1386 if (!ev_default_loop_ptr)
1127 { 1387 {
1128#if EV_MULTIPLICITY 1388#if EV_MULTIPLICITY
1129 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1389 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1130#else 1390#else
1133 1393
1134 loop_init (EV_A_ flags); 1394 loop_init (EV_A_ flags);
1135 1395
1136 if (ev_backend (EV_A)) 1396 if (ev_backend (EV_A))
1137 { 1397 {
1138 siginit (EV_A);
1139
1140#ifndef _WIN32 1398#ifndef _WIN32
1141 ev_signal_init (&childev, childcb, SIGCHLD); 1399 ev_signal_init (&childev, childcb, SIGCHLD);
1142 ev_set_priority (&childev, EV_MAXPRI); 1400 ev_set_priority (&childev, EV_MAXPRI);
1143 ev_signal_start (EV_A_ &childev); 1401 ev_signal_start (EV_A_ &childev);
1144 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1402 ev_unref (EV_A); /* child watcher should not keep loop alive */
1161#ifndef _WIN32 1419#ifndef _WIN32
1162 ev_ref (EV_A); /* child watcher */ 1420 ev_ref (EV_A); /* child watcher */
1163 ev_signal_stop (EV_A_ &childev); 1421 ev_signal_stop (EV_A_ &childev);
1164#endif 1422#endif
1165 1423
1166 ev_ref (EV_A); /* signal watcher */
1167 ev_io_stop (EV_A_ &sigev);
1168
1169 close (sigpipe [0]); sigpipe [0] = 0;
1170 close (sigpipe [1]); sigpipe [1] = 0;
1171
1172 loop_destroy (EV_A); 1424 loop_destroy (EV_A);
1173} 1425}
1174 1426
1175void 1427void
1176ev_default_fork (void) 1428ev_default_fork (void)
1178#if EV_MULTIPLICITY 1430#if EV_MULTIPLICITY
1179 struct ev_loop *loop = ev_default_loop_ptr; 1431 struct ev_loop *loop = ev_default_loop_ptr;
1180#endif 1432#endif
1181 1433
1182 if (backend) 1434 if (backend)
1183 postfork = 1; 1435 postfork = 1; /* must be in line with ev_loop_fork */
1184} 1436}
1185 1437
1186/*****************************************************************************/ 1438/*****************************************************************************/
1187 1439
1188void 1440void
1212} 1464}
1213 1465
1214void inline_size 1466void inline_size
1215timers_reify (EV_P) 1467timers_reify (EV_P)
1216{ 1468{
1217 while (timercnt && ((WT)timers [0])->at <= mn_now) 1469 while (timercnt && ev_at (timers [1]) <= mn_now)
1218 { 1470 {
1219 ev_timer *w = (ev_timer *)timers [0]; 1471 ev_timer *w = (ev_timer *)timers [1];
1220 1472
1221 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1473 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1222 1474
1223 /* first reschedule or stop timer */ 1475 /* first reschedule or stop timer */
1224 if (w->repeat) 1476 if (w->repeat)
1225 { 1477 {
1226 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.));
1227 1479
1228 ((WT)w)->at += w->repeat; 1480 ev_at (w) += w->repeat;
1229 if (((WT)w)->at < mn_now) 1481 if (ev_at (w) < mn_now)
1230 ((WT)w)->at = mn_now; 1482 ev_at (w) = mn_now;
1231 1483
1232 downheap (timers, timercnt, 0); 1484 downheap (timers, timercnt, 1);
1233 } 1485 }
1234 else 1486 else
1235 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1487 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1236 1488
1237 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1489 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1240 1492
1241#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1242void inline_size 1494void inline_size
1243periodics_reify (EV_P) 1495periodics_reify (EV_P)
1244{ 1496{
1245 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1497 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1246 { 1498 {
1247 ev_periodic *w = (ev_periodic *)periodics [0]; 1499 ev_periodic *w = (ev_periodic *)periodics [1];
1248 1500
1249 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1501 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1250 1502
1251 /* first reschedule or stop timer */ 1503 /* first reschedule or stop timer */
1252 if (w->reschedule_cb) 1504 if (w->reschedule_cb)
1253 { 1505 {
1254 ((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);
1255 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));
1256 downheap (periodics, periodiccnt, 0); 1508 downheap (periodics, periodiccnt, 1);
1257 } 1509 }
1258 else if (w->interval) 1510 else if (w->interval)
1259 { 1511 {
1260 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1512 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1261 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1513 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1262 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));
1263 downheap (periodics, periodiccnt, 0); 1515 downheap (periodics, periodiccnt, 1);
1264 } 1516 }
1265 else 1517 else
1266 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1518 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1267 1519
1268 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1520 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1273periodics_reschedule (EV_P) 1525periodics_reschedule (EV_P)
1274{ 1526{
1275 int i; 1527 int i;
1276 1528
1277 /* adjust periodics after time jump */ 1529 /* adjust periodics after time jump */
1278 for (i = 0; i < periodiccnt; ++i) 1530 for (i = 1; i <= periodiccnt; ++i)
1279 { 1531 {
1280 ev_periodic *w = (ev_periodic *)periodics [i]; 1532 ev_periodic *w = (ev_periodic *)periodics [i];
1281 1533
1282 if (w->reschedule_cb) 1534 if (w->reschedule_cb)
1283 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1535 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1284 else if (w->interval) 1536 else if (w->interval)
1285 ((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;
1286 } 1538 }
1287 1539
1288 /* now rebuild the heap */ 1540 /* now rebuild the heap */
1289 for (i = periodiccnt >> 1; i--; ) 1541 for (i = periodiccnt >> 1; i--; )
1290 downheap (periodics, periodiccnt, i); 1542 downheap (periodics, periodiccnt, i);
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 /* 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 */
1377 for (i = 0; i < timercnt; ++i) 1629 for (i = 1; i <= timercnt; ++i)
1378 ((WT)timers [i])->at += ev_rt_now - mn_now; 1630 ev_at (timers [i]) += ev_rt_now - mn_now;
1379 } 1631 }
1380 1632
1381 mn_now = ev_rt_now; 1633 mn_now = ev_rt_now;
1382 } 1634 }
1383} 1635}
1397static int loop_done; 1649static int loop_done;
1398 1650
1399void 1651void
1400ev_loop (EV_P_ int flags) 1652ev_loop (EV_P_ int flags)
1401{ 1653{
1402 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1654 loop_done = EVUNLOOP_CANCEL;
1403 ? EVUNLOOP_ONE
1404 : EVUNLOOP_CANCEL;
1405 1655
1406 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 */
1407 1657
1408 do 1658 do
1409 { 1659 {
1443 /* update fd-related kernel structures */ 1693 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1694 fd_reify (EV_A);
1445 1695
1446 /* calculate blocking time */ 1696 /* calculate blocking time */
1447 { 1697 {
1448 ev_tstamp block; 1698 ev_tstamp waittime = 0.;
1699 ev_tstamp sleeptime = 0.;
1449 1700
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1701 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1702 {
1454 /* update time to cancel out callback processing overhead */ 1703 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 1704 time_update (EV_A_ 1e100);
1456 1705
1457 block = MAX_BLOCKTIME; 1706 waittime = MAX_BLOCKTIME;
1458 1707
1459 if (timercnt) 1708 if (timercnt)
1460 { 1709 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1710 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1462 if (block > to) block = to; 1711 if (waittime > to) waittime = to;
1463 } 1712 }
1464 1713
1465#if EV_PERIODIC_ENABLE 1714#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 1715 if (periodiccnt)
1467 { 1716 {
1468 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;
1469 if (block > to) block = to; 1718 if (waittime > to) waittime = to;
1470 } 1719 }
1471#endif 1720#endif
1472 1721
1473 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 }
1474 } 1735 }
1475 1736
1476 ++loop_count; 1737 ++loop_count;
1477 backend_poll (EV_A_ block); 1738 backend_poll (EV_A_ waittime);
1478 1739
1479 /* update ev_rt_now, do magic */ 1740 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 1741 time_update (EV_A_ waittime + sleeptime);
1481 } 1742 }
1482 1743
1483 /* queue pending timers and reschedule them */ 1744 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 1745 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 1746#if EV_PERIODIC_ENABLE
1494 /* queue check watchers, to be executed first */ 1755 /* queue check watchers, to be executed first */
1495 if (expect_false (checkcnt)) 1756 if (expect_false (checkcnt))
1496 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1757 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1497 1758
1498 call_pending (EV_A); 1759 call_pending (EV_A);
1499
1500 } 1760 }
1501 while (expect_true (activecnt && !loop_done)); 1761 while (expect_true (
1762 activecnt
1763 && !loop_done
1764 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1765 ));
1502 1766
1503 if (loop_done == EVUNLOOP_ONE) 1767 if (loop_done == EVUNLOOP_ONE)
1504 loop_done = EVUNLOOP_CANCEL; 1768 loop_done = EVUNLOOP_CANCEL;
1505} 1769}
1506 1770
1597 1861
1598 assert (("ev_io_start called with negative fd", fd >= 0)); 1862 assert (("ev_io_start called with negative fd", fd >= 0));
1599 1863
1600 ev_start (EV_A_ (W)w, 1); 1864 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1865 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1602 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1866 wlist_add (&anfds[fd].head, (WL)w);
1603 1867
1604 fd_change (EV_A_ fd); 1868 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1869 w->events &= ~EV_IOFDSET;
1605} 1870}
1606 1871
1607void noinline 1872void noinline
1608ev_io_stop (EV_P_ ev_io *w) 1873ev_io_stop (EV_P_ ev_io *w)
1609{ 1874{
1611 if (expect_false (!ev_is_active (w))) 1876 if (expect_false (!ev_is_active (w)))
1612 return; 1877 return;
1613 1878
1614 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));
1615 1880
1616 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1881 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1618 1883
1619 fd_change (EV_A_ w->fd); 1884 fd_change (EV_A_ w->fd, 1);
1620} 1885}
1621 1886
1622void noinline 1887void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 1888ev_timer_start (EV_P_ ev_timer *w)
1624{ 1889{
1625 if (expect_false (ev_is_active (w))) 1890 if (expect_false (ev_is_active (w)))
1626 return; 1891 return;
1627 1892
1628 ((WT)w)->at += mn_now; 1893 ev_at (w) += mn_now;
1629 1894
1630 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.));
1631 1896
1632 ev_start (EV_A_ (W)w, ++timercnt); 1897 ev_start (EV_A_ (W)w, ++timercnt);
1633 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1898 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1634 timers [timercnt - 1] = (WT)w; 1899 timers [timercnt] = (WT)w;
1635 upheap (timers, timercnt - 1); 1900 upheap (timers, timercnt);
1636 1901
1637 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1902 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1638} 1903}
1639 1904
1640void noinline 1905void noinline
1641ev_timer_stop (EV_P_ ev_timer *w) 1906ev_timer_stop (EV_P_ ev_timer *w)
1642{ 1907{
1643 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1644 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1645 return; 1910 return;
1646 1911
1647 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1648
1649 { 1912 {
1650 int active = ((W)w)->active; 1913 int active = ev_active (w);
1651 1914
1915 assert (("internal timer heap corruption", timers [active] == (WT)w));
1916
1652 if (expect_true (--active < --timercnt)) 1917 if (expect_true (active < timercnt))
1653 { 1918 {
1654 timers [active] = timers [timercnt]; 1919 timers [active] = timers [timercnt];
1655 adjustheap (timers, timercnt, active); 1920 adjustheap (timers, timercnt, active);
1656 } 1921 }
1922
1923 --timercnt;
1657 } 1924 }
1658 1925
1659 ((WT)w)->at -= mn_now; 1926 ev_at (w) -= mn_now;
1660 1927
1661 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1662} 1929}
1663 1930
1664void noinline 1931void noinline
1666{ 1933{
1667 if (ev_is_active (w)) 1934 if (ev_is_active (w))
1668 { 1935 {
1669 if (w->repeat) 1936 if (w->repeat)
1670 { 1937 {
1671 ((WT)w)->at = mn_now + w->repeat; 1938 ev_at (w) = mn_now + w->repeat;
1672 adjustheap (timers, timercnt, ((W)w)->active - 1); 1939 adjustheap (timers, timercnt, ev_active (w));
1673 } 1940 }
1674 else 1941 else
1675 ev_timer_stop (EV_A_ w); 1942 ev_timer_stop (EV_A_ w);
1676 } 1943 }
1677 else if (w->repeat) 1944 else if (w->repeat)
1678 { 1945 {
1679 w->at = w->repeat; 1946 ev_at (w) = w->repeat;
1680 ev_timer_start (EV_A_ w); 1947 ev_timer_start (EV_A_ w);
1681 } 1948 }
1682} 1949}
1683 1950
1684#if EV_PERIODIC_ENABLE 1951#if EV_PERIODIC_ENABLE
1687{ 1954{
1688 if (expect_false (ev_is_active (w))) 1955 if (expect_false (ev_is_active (w)))
1689 return; 1956 return;
1690 1957
1691 if (w->reschedule_cb) 1958 if (w->reschedule_cb)
1692 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1959 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1693 else if (w->interval) 1960 else if (w->interval)
1694 { 1961 {
1695 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.));
1696 /* 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 */
1697 ((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;
1698 } 1965 }
1699 else 1966 else
1700 ((WT)w)->at = w->offset; 1967 ev_at (w) = w->offset;
1701 1968
1702 ev_start (EV_A_ (W)w, ++periodiccnt); 1969 ev_start (EV_A_ (W)w, ++periodiccnt);
1703 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1970 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1704 periodics [periodiccnt - 1] = (WT)w; 1971 periodics [periodiccnt] = (WT)w;
1705 upheap (periodics, periodiccnt - 1); 1972 upheap (periodics, periodiccnt);
1706 1973
1707 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1974 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1708} 1975}
1709 1976
1710void noinline 1977void noinline
1711ev_periodic_stop (EV_P_ ev_periodic *w) 1978ev_periodic_stop (EV_P_ ev_periodic *w)
1712{ 1979{
1713 clear_pending (EV_A_ (W)w); 1980 clear_pending (EV_A_ (W)w);
1714 if (expect_false (!ev_is_active (w))) 1981 if (expect_false (!ev_is_active (w)))
1715 return; 1982 return;
1716 1983
1717 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1718
1719 { 1984 {
1720 int active = ((W)w)->active; 1985 int active = ev_active (w);
1721 1986
1987 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1988
1722 if (expect_true (--active < --periodiccnt)) 1989 if (expect_true (active < periodiccnt))
1723 { 1990 {
1724 periodics [active] = periodics [periodiccnt]; 1991 periodics [active] = periodics [periodiccnt];
1725 adjustheap (periodics, periodiccnt, active); 1992 adjustheap (periodics, periodiccnt, active);
1726 } 1993 }
1994
1995 --periodiccnt;
1727 } 1996 }
1728 1997
1729 ev_stop (EV_A_ (W)w); 1998 ev_stop (EV_A_ (W)w);
1730} 1999}
1731 2000
1750#endif 2019#endif
1751 if (expect_false (ev_is_active (w))) 2020 if (expect_false (ev_is_active (w)))
1752 return; 2021 return;
1753 2022
1754 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));
2024
2025 evpipe_init (EV_A);
1755 2026
1756 { 2027 {
1757#ifndef _WIN32 2028#ifndef _WIN32
1758 sigset_t full, prev; 2029 sigset_t full, prev;
1759 sigfillset (&full); 2030 sigfillset (&full);
1766 sigprocmask (SIG_SETMASK, &prev, 0); 2037 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif 2038#endif
1768 } 2039 }
1769 2040
1770 ev_start (EV_A_ (W)w, 1); 2041 ev_start (EV_A_ (W)w, 1);
1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2042 wlist_add (&signals [w->signum - 1].head, (WL)w);
1772 2043
1773 if (!((WL)w)->next) 2044 if (!((WL)w)->next)
1774 { 2045 {
1775#if _WIN32 2046#if _WIN32
1776 signal (w->signum, sighandler); 2047 signal (w->signum, ev_sighandler);
1777#else 2048#else
1778 struct sigaction sa; 2049 struct sigaction sa;
1779 sa.sa_handler = sighandler; 2050 sa.sa_handler = ev_sighandler;
1780 sigfillset (&sa.sa_mask); 2051 sigfillset (&sa.sa_mask);
1781 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 */
1782 sigaction (w->signum, &sa, 0); 2053 sigaction (w->signum, &sa, 0);
1783#endif 2054#endif
1784 } 2055 }
1789{ 2060{
1790 clear_pending (EV_A_ (W)w); 2061 clear_pending (EV_A_ (W)w);
1791 if (expect_false (!ev_is_active (w))) 2062 if (expect_false (!ev_is_active (w)))
1792 return; 2063 return;
1793 2064
1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2065 wlist_del (&signals [w->signum - 1].head, (WL)w);
1795 ev_stop (EV_A_ (W)w); 2066 ev_stop (EV_A_ (W)w);
1796 2067
1797 if (!signals [w->signum - 1].head) 2068 if (!signals [w->signum - 1].head)
1798 signal (w->signum, SIG_DFL); 2069 signal (w->signum, SIG_DFL);
1799} 2070}
1806#endif 2077#endif
1807 if (expect_false (ev_is_active (w))) 2078 if (expect_false (ev_is_active (w)))
1808 return; 2079 return;
1809 2080
1810 ev_start (EV_A_ (W)w, 1); 2081 ev_start (EV_A_ (W)w, 1);
1811 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2082 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1812} 2083}
1813 2084
1814void 2085void
1815ev_child_stop (EV_P_ ev_child *w) 2086ev_child_stop (EV_P_ ev_child *w)
1816{ 2087{
1817 clear_pending (EV_A_ (W)w); 2088 clear_pending (EV_A_ (W)w);
1818 if (expect_false (!ev_is_active (w))) 2089 if (expect_false (!ev_is_active (w)))
1819 return; 2090 return;
1820 2091
1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2092 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1822 ev_stop (EV_A_ (W)w); 2093 ev_stop (EV_A_ (W)w);
1823} 2094}
1824 2095
1825#if EV_STAT_ENABLE 2096#if EV_STAT_ENABLE
1826 2097
1845 if (w->wd < 0) 2116 if (w->wd < 0)
1846 { 2117 {
1847 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 */
1848 2119
1849 /* 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 */
1850 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2123 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1851 { 2124 {
1852 char path [4096]; 2125 char path [4096];
1853 strcpy (path, w->path); 2126 strcpy (path, w->path);
1854 2127
2099 clear_pending (EV_A_ (W)w); 2372 clear_pending (EV_A_ (W)w);
2100 if (expect_false (!ev_is_active (w))) 2373 if (expect_false (!ev_is_active (w)))
2101 return; 2374 return;
2102 2375
2103 { 2376 {
2104 int active = ((W)w)->active; 2377 int active = ev_active (w);
2105 2378
2106 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2379 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2107 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2380 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2108 2381
2109 ev_stop (EV_A_ (W)w); 2382 ev_stop (EV_A_ (W)w);
2110 --idleall; 2383 --idleall;
2111 } 2384 }
2112} 2385}
2129 clear_pending (EV_A_ (W)w); 2402 clear_pending (EV_A_ (W)w);
2130 if (expect_false (!ev_is_active (w))) 2403 if (expect_false (!ev_is_active (w)))
2131 return; 2404 return;
2132 2405
2133 { 2406 {
2134 int active = ((W)w)->active; 2407 int active = ev_active (w);
2408
2135 prepares [active - 1] = prepares [--preparecnt]; 2409 prepares [active - 1] = prepares [--preparecnt];
2136 ((W)prepares [active - 1])->active = active; 2410 ev_active (prepares [active - 1]) = active;
2137 } 2411 }
2138 2412
2139 ev_stop (EV_A_ (W)w); 2413 ev_stop (EV_A_ (W)w);
2140} 2414}
2141 2415
2156 clear_pending (EV_A_ (W)w); 2430 clear_pending (EV_A_ (W)w);
2157 if (expect_false (!ev_is_active (w))) 2431 if (expect_false (!ev_is_active (w)))
2158 return; 2432 return;
2159 2433
2160 { 2434 {
2161 int active = ((W)w)->active; 2435 int active = ev_active (w);
2436
2162 checks [active - 1] = checks [--checkcnt]; 2437 checks [active - 1] = checks [--checkcnt];
2163 ((W)checks [active - 1])->active = active; 2438 ev_active (checks [active - 1]) = active;
2164 } 2439 }
2165 2440
2166 ev_stop (EV_A_ (W)w); 2441 ev_stop (EV_A_ (W)w);
2167} 2442}
2168 2443
2169#if EV_EMBED_ENABLE 2444#if EV_EMBED_ENABLE
2170void noinline 2445void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2446ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2447{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2448 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2449}
2175 2450
2176static void 2451static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2452embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2453{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2454 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2455
2181 if (ev_cb (w)) 2456 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2457 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2458 else
2184 ev_embed_sweep (loop, w); 2459 ev_loop (w->other, EVLOOP_NONBLOCK);
2185} 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
2186 2485
2187void 2486void
2188ev_embed_start (EV_P_ ev_embed *w) 2487ev_embed_start (EV_P_ ev_embed *w)
2189{ 2488{
2190 if (expect_false (ev_is_active (w))) 2489 if (expect_false (ev_is_active (w)))
2191 return; 2490 return;
2192 2491
2193 { 2492 {
2194 struct ev_loop *loop = w->loop; 2493 struct ev_loop *loop = w->other;
2195 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 ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2495 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2496 }
2198 2497
2199 ev_set_priority (&w->io, ev_priority (w)); 2498 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2499 ev_io_start (EV_A_ &w->io);
2201 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
2202 ev_start (EV_A_ (W)w, 1); 2507 ev_start (EV_A_ (W)w, 1);
2203} 2508}
2204 2509
2205void 2510void
2206ev_embed_stop (EV_P_ ev_embed *w) 2511ev_embed_stop (EV_P_ ev_embed *w)
2208 clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2210 return; 2515 return;
2211 2516
2212 ev_io_stop (EV_A_ &w->io); 2517 ev_io_stop (EV_A_ &w->io);
2518 ev_prepare_stop (EV_A_ &w->prepare);
2213 2519
2214 ev_stop (EV_A_ (W)w); 2520 ev_stop (EV_A_ (W)w);
2215} 2521}
2216#endif 2522#endif
2217 2523
2233 clear_pending (EV_A_ (W)w); 2539 clear_pending (EV_A_ (W)w);
2234 if (expect_false (!ev_is_active (w))) 2540 if (expect_false (!ev_is_active (w)))
2235 return; 2541 return;
2236 2542
2237 { 2543 {
2238 int active = ((W)w)->active; 2544 int active = ev_active (w);
2545
2239 forks [active - 1] = forks [--forkcnt]; 2546 forks [active - 1] = forks [--forkcnt];
2240 ((W)forks [active - 1])->active = active; 2547 ev_active (forks [active - 1]) = active;
2241 } 2548 }
2242 2549
2243 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);
2244} 2590}
2245#endif 2591#endif
2246 2592
2247/*****************************************************************************/ 2593/*****************************************************************************/
2248 2594
2306 ev_timer_set (&once->to, timeout, 0.); 2652 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 2653 ev_timer_start (EV_A_ &once->to);
2308 } 2654 }
2309} 2655}
2310 2656
2657#if EV_MULTIPLICITY
2658 #include "ev_wrap.h"
2659#endif
2660
2311#ifdef __cplusplus 2661#ifdef __cplusplus
2312} 2662}
2313#endif 2663#endif
2314 2664

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines