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

Comparing libev/ev.c (file contents):
Revision 1.180 by root, Tue Dec 11 22:04:55 2007 UTC vs.
Revision 1.230 by root, Fri May 2 08:13: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
412int inline_size 525int inline_size
413array_nextsize (int elem, int cur, int cnt) 526array_nextsize (int elem, int cur, int cnt)
414{ 527{
415 int ncur = cur + 1; 528 int ncur = cur + 1;
416 529
533 { 646 {
534 int fd = fdchanges [i]; 647 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 648 ANFD *anfd = anfds + fd;
536 ev_io *w; 649 ev_io *w;
537 650
538 int events = 0; 651 unsigned char events = 0;
539 652
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 653 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 654 events |= (unsigned char)w->events;
542 655
543#if EV_SELECT_IS_WINSOCKET 656#if EV_SELECT_IS_WINSOCKET
544 if (events) 657 if (events)
545 { 658 {
546 unsigned long argp; 659 unsigned long argp;
660 #ifdef EV_FD_TO_WIN32_HANDLE
661 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
662 #else
547 anfd->handle = _get_osfhandle (fd); 663 anfd->handle = _get_osfhandle (fd);
664 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 665 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 666 }
550#endif 667#endif
551 668
669 {
670 unsigned char o_events = anfd->events;
671 unsigned char o_reify = anfd->reify;
672
552 anfd->reify = 0; 673 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 674 anfd->events = events;
675
676 if (o_events != events || o_reify & EV_IOFDSET)
677 backend_modify (EV_A_ fd, o_events, events);
678 }
556 } 679 }
557 680
558 fdchangecnt = 0; 681 fdchangecnt = 0;
559} 682}
560 683
561void inline_size 684void inline_size
562fd_change (EV_P_ int fd) 685fd_change (EV_P_ int fd, int flags)
563{ 686{
564 if (expect_false (anfds [fd].reify)) 687 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 688 anfds [fd].reify |= flags;
568 689
690 if (expect_true (!reify))
691 {
569 ++fdchangecnt; 692 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 693 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 694 fdchanges [fdchangecnt - 1] = fd;
695 }
572} 696}
573 697
574void inline_speed 698void inline_speed
575fd_kill (EV_P_ int fd) 699fd_kill (EV_P_ int fd)
576{ 700{
627 751
628 for (fd = 0; fd < anfdmax; ++fd) 752 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 753 if (anfds [fd].events)
630 { 754 {
631 anfds [fd].events = 0; 755 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 756 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 757 }
634} 758}
635 759
636/*****************************************************************************/ 760/*****************************************************************************/
637 761
762/* towards the root */
638void inline_speed 763void inline_speed
639upheap (WT *heap, int k) 764upheap (WT *heap, int k)
640{ 765{
641 WT w = heap [k]; 766 WT w = heap [k];
642 767
643 while (k) 768 for (;;)
644 { 769 {
645 int p = (k - 1) >> 1; 770 int p = k >> 1;
646 771
772 /* maybe we could use a dummy element at heap [0]? */
647 if (heap [p]->at <= w->at) 773 if (!p || heap [p]->at <= w->at)
648 break; 774 break;
649 775
650 heap [k] = heap [p]; 776 heap [k] = heap [p];
651 ((W)heap [k])->active = k + 1; 777 ev_active (heap [k]) = k;
652 k = p; 778 k = p;
653 } 779 }
654 780
655 heap [k] = w; 781 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 782 ev_active (heap [k]) = k;
657
658} 783}
659 784
785/* away from the root */
660void inline_speed 786void inline_speed
661downheap (WT *heap, int N, int k) 787downheap (WT *heap, int N, int k)
662{ 788{
663 WT w = heap [k]; 789 WT w = heap [k];
664 790
665 for (;;) 791 for (;;)
666 { 792 {
667 int c = (k << 1) + 1; 793 int c = k << 1;
668 794
669 if (c >= N) 795 if (c > N)
670 break; 796 break;
671 797
672 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 798 c += c < N && heap [c]->at > heap [c + 1]->at
673 ? 1 : 0; 799 ? 1 : 0;
674 800
675 if (w->at <= heap [c]->at) 801 if (w->at <= heap [c]->at)
676 break; 802 break;
677 803
678 heap [k] = heap [c]; 804 heap [k] = heap [c];
679 ((W)heap [k])->active = k + 1; 805 ev_active (heap [k]) = k;
680 806
681 k = c; 807 k = c;
682 } 808 }
683 809
684 heap [k] = w; 810 heap [k] = w;
685 ((W)heap [k])->active = k + 1; 811 ev_active (heap [k]) = k;
686} 812}
687 813
688void inline_size 814void inline_size
689adjustheap (WT *heap, int N, int k) 815adjustheap (WT *heap, int N, int k)
690{ 816{
695/*****************************************************************************/ 821/*****************************************************************************/
696 822
697typedef struct 823typedef struct
698{ 824{
699 WL head; 825 WL head;
700 sig_atomic_t volatile gotsig; 826 EV_ATOMIC_T gotsig;
701} ANSIG; 827} ANSIG;
702 828
703static ANSIG *signals; 829static ANSIG *signals;
704static int signalmax; 830static int signalmax;
705 831
706static int sigpipe [2]; 832static EV_ATOMIC_T gotsig;
707static sig_atomic_t volatile gotsig;
708static ev_io sigev;
709 833
710void inline_size 834void inline_size
711signals_init (ANSIG *base, int count) 835signals_init (ANSIG *base, int count)
712{ 836{
713 while (count--) 837 while (count--)
717 841
718 ++base; 842 ++base;
719 } 843 }
720} 844}
721 845
722static void 846/*****************************************************************************/
723sighandler (int signum)
724{
725#if _WIN32
726 signal (signum, sighandler);
727#endif
728
729 signals [signum - 1].gotsig = 1;
730
731 if (!gotsig)
732 {
733 int old_errno = errno;
734 gotsig = 1;
735 write (sigpipe [1], &signum, 1);
736 errno = old_errno;
737 }
738}
739
740void noinline
741ev_feed_signal_event (EV_P_ int signum)
742{
743 WL w;
744
745#if EV_MULTIPLICITY
746 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
747#endif
748
749 --signum;
750
751 if (signum < 0 || signum >= signalmax)
752 return;
753
754 signals [signum].gotsig = 0;
755
756 for (w = signals [signum].head; w; w = w->next)
757 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
758}
759
760static void
761sigcb (EV_P_ ev_io *iow, int revents)
762{
763 int signum;
764
765 read (sigpipe [0], &revents, 1);
766 gotsig = 0;
767
768 for (signum = signalmax; signum--; )
769 if (signals [signum].gotsig)
770 ev_feed_signal_event (EV_A_ signum + 1);
771}
772 847
773void inline_speed 848void inline_speed
774fd_intern (int fd) 849fd_intern (int fd)
775{ 850{
776#ifdef _WIN32 851#ifdef _WIN32
781 fcntl (fd, F_SETFL, O_NONBLOCK); 856 fcntl (fd, F_SETFL, O_NONBLOCK);
782#endif 857#endif
783} 858}
784 859
785static void noinline 860static void noinline
786siginit (EV_P) 861evpipe_init (EV_P)
787{ 862{
863 if (!ev_is_active (&pipeev))
864 {
865#if EV_USE_EVENTFD
866 if ((evfd = eventfd (0, 0)) >= 0)
867 {
868 evpipe [0] = -1;
869 fd_intern (evfd);
870 ev_io_set (&pipeev, evfd, EV_READ);
871 }
872 else
873#endif
874 {
875 while (pipe (evpipe))
876 syserr ("(libev) error creating signal/async pipe");
877
788 fd_intern (sigpipe [0]); 878 fd_intern (evpipe [0]);
789 fd_intern (sigpipe [1]); 879 fd_intern (evpipe [1]);
880 ev_io_set (&pipeev, evpipe [0], EV_READ);
881 }
790 882
791 ev_io_set (&sigev, sigpipe [0], EV_READ);
792 ev_io_start (EV_A_ &sigev); 883 ev_io_start (EV_A_ &pipeev);
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 884 ev_unref (EV_A); /* watcher should not keep loop alive */
885 }
886}
887
888void inline_size
889evpipe_write (EV_P_ EV_ATOMIC_T *flag)
890{
891 if (!*flag)
892 {
893 int old_errno = errno; /* save errno because write might clobber it */
894
895 *flag = 1;
896
897#if EV_USE_EVENTFD
898 if (evfd >= 0)
899 {
900 uint64_t counter = 1;
901 write (evfd, &counter, sizeof (uint64_t));
902 }
903 else
904#endif
905 write (evpipe [1], &old_errno, 1);
906
907 errno = old_errno;
908 }
909}
910
911static void
912pipecb (EV_P_ ev_io *iow, int revents)
913{
914#if EV_USE_EVENTFD
915 if (evfd >= 0)
916 {
917 uint64_t counter = 1;
918 read (evfd, &counter, sizeof (uint64_t));
919 }
920 else
921#endif
922 {
923 char dummy;
924 read (evpipe [0], &dummy, 1);
925 }
926
927 if (gotsig && ev_is_default_loop (EV_A))
928 {
929 int signum;
930 gotsig = 0;
931
932 for (signum = signalmax; signum--; )
933 if (signals [signum].gotsig)
934 ev_feed_signal_event (EV_A_ signum + 1);
935 }
936
937#if EV_ASYNC_ENABLE
938 if (gotasync)
939 {
940 int i;
941 gotasync = 0;
942
943 for (i = asynccnt; i--; )
944 if (asyncs [i]->sent)
945 {
946 asyncs [i]->sent = 0;
947 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
948 }
949 }
950#endif
794} 951}
795 952
796/*****************************************************************************/ 953/*****************************************************************************/
797 954
955static void
956ev_sighandler (int signum)
957{
958#if EV_MULTIPLICITY
959 struct ev_loop *loop = &default_loop_struct;
960#endif
961
962#if _WIN32
963 signal (signum, ev_sighandler);
964#endif
965
966 signals [signum - 1].gotsig = 1;
967 evpipe_write (EV_A_ &gotsig);
968}
969
970void noinline
971ev_feed_signal_event (EV_P_ int signum)
972{
973 WL w;
974
975#if EV_MULTIPLICITY
976 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
977#endif
978
979 --signum;
980
981 if (signum < 0 || signum >= signalmax)
982 return;
983
984 signals [signum].gotsig = 0;
985
986 for (w = signals [signum].head; w; w = w->next)
987 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
988}
989
990/*****************************************************************************/
991
798static ev_child *childs [EV_PID_HASHSIZE]; 992static WL childs [EV_PID_HASHSIZE];
799 993
800#ifndef _WIN32 994#ifndef _WIN32
801 995
802static ev_signal childev; 996static ev_signal childev;
803 997
998#ifndef WIFCONTINUED
999# define WIFCONTINUED(status) 0
1000#endif
1001
804void inline_speed 1002void inline_speed
805child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
806{ 1004{
807 ev_child *w; 1005 ev_child *w;
1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
808 1007
809 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1008 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1009 {
810 if (w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
1011 && (!traced || (w->flags & 1)))
811 { 1012 {
812 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1013 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
813 w->rpid = pid; 1014 w->rpid = pid;
814 w->rstatus = status; 1015 w->rstatus = status;
815 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
816 } 1017 }
1018 }
817} 1019}
818 1020
819#ifndef WCONTINUED 1021#ifndef WCONTINUED
820# define WCONTINUED 0 1022# define WCONTINUED 0
821#endif 1023#endif
830 if (!WCONTINUED 1032 if (!WCONTINUED
831 || errno != EINVAL 1033 || errno != EINVAL
832 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
833 return; 1035 return;
834 1036
835 /* make sure we are called again until all childs have been reaped */ 1037 /* make sure we are called again until all children have been reaped */
836 /* we need to do it this way so that the callback gets called before we continue */ 1038 /* we need to do it this way so that the callback gets called before we continue */
837 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
838 1040
839 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
840 if (EV_PID_HASHSIZE > 1) 1042 if (EV_PID_HASHSIZE > 1)
841 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1043 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
842} 1044}
843 1045
844#endif 1046#endif
845 1047
846/*****************************************************************************/ 1048/*****************************************************************************/
918} 1120}
919 1121
920unsigned int 1122unsigned int
921ev_embeddable_backends (void) 1123ev_embeddable_backends (void)
922{ 1124{
923 return EVBACKEND_EPOLL 1125 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
924 | EVBACKEND_KQUEUE 1126
925 | EVBACKEND_PORT; 1127 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1128 /* please fix it and tell me how to detect the fix */
1129 flags &= ~EVBACKEND_EPOLL;
1130
1131 return flags;
926} 1132}
927 1133
928unsigned int 1134unsigned int
929ev_backend (EV_P) 1135ev_backend (EV_P)
930{ 1136{
933 1139
934unsigned int 1140unsigned int
935ev_loop_count (EV_P) 1141ev_loop_count (EV_P)
936{ 1142{
937 return loop_count; 1143 return loop_count;
1144}
1145
1146void
1147ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1148{
1149 io_blocktime = interval;
1150}
1151
1152void
1153ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1154{
1155 timeout_blocktime = interval;
938} 1156}
939 1157
940static void noinline 1158static void noinline
941loop_init (EV_P_ unsigned int flags) 1159loop_init (EV_P_ unsigned int flags)
942{ 1160{
948 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1166 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
949 have_monotonic = 1; 1167 have_monotonic = 1;
950 } 1168 }
951#endif 1169#endif
952 1170
953 ev_rt_now = ev_time (); 1171 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1172 mn_now = get_clock ();
955 now_floor = mn_now; 1173 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1174 rtmn_diff = ev_rt_now - mn_now;
1175
1176 io_blocktime = 0.;
1177 timeout_blocktime = 0.;
1178 backend = 0;
1179 backend_fd = -1;
1180 gotasync = 0;
1181#if EV_USE_INOTIFY
1182 fs_fd = -2;
1183#endif
957 1184
958 /* pid check not overridable via env */ 1185 /* pid check not overridable via env */
959#ifndef _WIN32 1186#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1187 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1188 curpid = getpid ();
964 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
965 && !enable_secure () 1192 && !enable_secure ()
966 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
967 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
968 1195
969 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
970 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
971
972 backend = 0;
973 backend_fd = -1;
974#if EV_USE_INOTIFY
975 fs_fd = -2;
976#endif
977 1198
978#if EV_USE_PORT 1199#if EV_USE_PORT
979 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
980#endif 1201#endif
981#if EV_USE_KQUEUE 1202#if EV_USE_KQUEUE
989#endif 1210#endif
990#if EV_USE_SELECT 1211#if EV_USE_SELECT
991 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1212 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
992#endif 1213#endif
993 1214
994 ev_init (&sigev, sigcb); 1215 ev_init (&pipeev, pipecb);
995 ev_set_priority (&sigev, EV_MAXPRI); 1216 ev_set_priority (&pipeev, EV_MAXPRI);
996 } 1217 }
997} 1218}
998 1219
999static void noinline 1220static void noinline
1000loop_destroy (EV_P) 1221loop_destroy (EV_P)
1001{ 1222{
1002 int i; 1223 int i;
1224
1225 if (ev_is_active (&pipeev))
1226 {
1227 ev_ref (EV_A); /* signal watcher */
1228 ev_io_stop (EV_A_ &pipeev);
1229
1230#if EV_USE_EVENTFD
1231 if (evfd >= 0)
1232 close (evfd);
1233#endif
1234
1235 if (evpipe [0] >= 0)
1236 {
1237 close (evpipe [0]);
1238 close (evpipe [1]);
1239 }
1240 }
1003 1241
1004#if EV_USE_INOTIFY 1242#if EV_USE_INOTIFY
1005 if (fs_fd >= 0) 1243 if (fs_fd >= 0)
1006 close (fs_fd); 1244 close (fs_fd);
1007#endif 1245#endif
1030 array_free (pending, [i]); 1268 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1269#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1270 array_free (idle, [i]);
1033#endif 1271#endif
1034 } 1272 }
1273
1274 ev_free (anfds); anfdmax = 0;
1035 1275
1036 /* have to use the microsoft-never-gets-it-right macro */ 1276 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1277 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1278 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1279#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1280 array_free (periodic, EMPTY);
1041#endif 1281#endif
1282#if EV_FORK_ENABLE
1283 array_free (fork, EMPTY);
1284#endif
1042 array_free (prepare, EMPTY); 1285 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1286 array_free (check, EMPTY);
1287#if EV_ASYNC_ENABLE
1288 array_free (async, EMPTY);
1289#endif
1044 1290
1045 backend = 0; 1291 backend = 0;
1046} 1292}
1047 1293
1294#if EV_USE_INOTIFY
1048void inline_size infy_fork (EV_P); 1295void inline_size infy_fork (EV_P);
1296#endif
1049 1297
1050void inline_size 1298void inline_size
1051loop_fork (EV_P) 1299loop_fork (EV_P)
1052{ 1300{
1053#if EV_USE_PORT 1301#if EV_USE_PORT
1061#endif 1309#endif
1062#if EV_USE_INOTIFY 1310#if EV_USE_INOTIFY
1063 infy_fork (EV_A); 1311 infy_fork (EV_A);
1064#endif 1312#endif
1065 1313
1066 if (ev_is_active (&sigev)) 1314 if (ev_is_active (&pipeev))
1067 { 1315 {
1068 /* default loop */ 1316 /* this "locks" the handlers against writing to the pipe */
1317 /* while we modify the fd vars */
1318 gotsig = 1;
1319#if EV_ASYNC_ENABLE
1320 gotasync = 1;
1321#endif
1069 1322
1070 ev_ref (EV_A); 1323 ev_ref (EV_A);
1071 ev_io_stop (EV_A_ &sigev); 1324 ev_io_stop (EV_A_ &pipeev);
1325
1326#if EV_USE_EVENTFD
1327 if (evfd >= 0)
1328 close (evfd);
1329#endif
1330
1331 if (evpipe [0] >= 0)
1332 {
1072 close (sigpipe [0]); 1333 close (evpipe [0]);
1073 close (sigpipe [1]); 1334 close (evpipe [1]);
1335 }
1074 1336
1075 while (pipe (sigpipe))
1076 syserr ("(libev) error creating pipe");
1077
1078 siginit (EV_A); 1337 evpipe_init (EV_A);
1338 /* now iterate over everything, in case we missed something */
1339 pipecb (EV_A_ &pipeev, EV_READ);
1079 } 1340 }
1080 1341
1081 postfork = 0; 1342 postfork = 0;
1082} 1343}
1083 1344
1105} 1366}
1106 1367
1107void 1368void
1108ev_loop_fork (EV_P) 1369ev_loop_fork (EV_P)
1109{ 1370{
1110 postfork = 1; 1371 postfork = 1; /* must be in line with ev_default_fork */
1111} 1372}
1112 1373
1113#endif 1374#endif
1114 1375
1115#if EV_MULTIPLICITY 1376#if EV_MULTIPLICITY
1118#else 1379#else
1119int 1380int
1120ev_default_loop (unsigned int flags) 1381ev_default_loop (unsigned int flags)
1121#endif 1382#endif
1122{ 1383{
1123 if (sigpipe [0] == sigpipe [1])
1124 if (pipe (sigpipe))
1125 return 0;
1126
1127 if (!ev_default_loop_ptr) 1384 if (!ev_default_loop_ptr)
1128 { 1385 {
1129#if EV_MULTIPLICITY 1386#if EV_MULTIPLICITY
1130 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1387 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1131#else 1388#else
1134 1391
1135 loop_init (EV_A_ flags); 1392 loop_init (EV_A_ flags);
1136 1393
1137 if (ev_backend (EV_A)) 1394 if (ev_backend (EV_A))
1138 { 1395 {
1139 siginit (EV_A);
1140
1141#ifndef _WIN32 1396#ifndef _WIN32
1142 ev_signal_init (&childev, childcb, SIGCHLD); 1397 ev_signal_init (&childev, childcb, SIGCHLD);
1143 ev_set_priority (&childev, EV_MAXPRI); 1398 ev_set_priority (&childev, EV_MAXPRI);
1144 ev_signal_start (EV_A_ &childev); 1399 ev_signal_start (EV_A_ &childev);
1145 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1400 ev_unref (EV_A); /* child watcher should not keep loop alive */
1162#ifndef _WIN32 1417#ifndef _WIN32
1163 ev_ref (EV_A); /* child watcher */ 1418 ev_ref (EV_A); /* child watcher */
1164 ev_signal_stop (EV_A_ &childev); 1419 ev_signal_stop (EV_A_ &childev);
1165#endif 1420#endif
1166 1421
1167 ev_ref (EV_A); /* signal watcher */
1168 ev_io_stop (EV_A_ &sigev);
1169
1170 close (sigpipe [0]); sigpipe [0] = 0;
1171 close (sigpipe [1]); sigpipe [1] = 0;
1172
1173 loop_destroy (EV_A); 1422 loop_destroy (EV_A);
1174} 1423}
1175 1424
1176void 1425void
1177ev_default_fork (void) 1426ev_default_fork (void)
1179#if EV_MULTIPLICITY 1428#if EV_MULTIPLICITY
1180 struct ev_loop *loop = ev_default_loop_ptr; 1429 struct ev_loop *loop = ev_default_loop_ptr;
1181#endif 1430#endif
1182 1431
1183 if (backend) 1432 if (backend)
1184 postfork = 1; 1433 postfork = 1; /* must be in line with ev_loop_fork */
1185} 1434}
1186 1435
1187/*****************************************************************************/ 1436/*****************************************************************************/
1188 1437
1189void 1438void
1213} 1462}
1214 1463
1215void inline_size 1464void inline_size
1216timers_reify (EV_P) 1465timers_reify (EV_P)
1217{ 1466{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1219 { 1468 {
1220 ev_timer *w = timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1221 1470
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223 1472
1224 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1225 if (w->repeat) 1474 if (w->repeat)
1226 { 1475 {
1227 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1476 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1228 1477
1229 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1230 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1231 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1232 1481
1233 downheap ((WT *)timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1234 } 1483 }
1235 else 1484 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237 1486
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1241 1490
1242#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1243void inline_size 1492void inline_size
1244periodics_reify (EV_P) 1493periodics_reify (EV_P)
1245{ 1494{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1247 { 1496 {
1248 ev_periodic *w = periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1249 1498
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251 1500
1252 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1253 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1254 { 1503 {
1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1504 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1256 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1505 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1257 downheap ((WT *)periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1258 } 1507 }
1259 else if (w->interval) 1508 else if (w->interval)
1260 { 1509 {
1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1510 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1262 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1511 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1263 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1512 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1264 downheap ((WT *)periodics, periodiccnt, 0); 1513 downheap (periodics, periodiccnt, 1);
1265 } 1514 }
1266 else 1515 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268 1517
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1276 int i; 1525 int i;
1277 1526
1278 /* adjust periodics after time jump */ 1527 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 0; i < periodiccnt; ++i)
1280 { 1529 {
1281 ev_periodic *w = periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1282 1531
1283 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval) 1534 else if (w->interval)
1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1535 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1287 } 1536 }
1288 1537
1289 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1291 downheap ((WT *)periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
1292} 1541}
1293#endif 1542#endif
1294 1543
1295#if EV_IDLE_ENABLE 1544#if EV_IDLE_ENABLE
1296void inline_size 1545void inline_size
1373 { 1622 {
1374#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1375 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1376#endif 1625#endif
1377 /* adjust timers. this is easy, as the offset is the same for all of them */ 1626 /* adjust timers. this is easy, as the offset is the same for all of them */
1378 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1379 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1380 } 1629 }
1381 1630
1382 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1383 } 1632 }
1384} 1633}
1398static int loop_done; 1647static int loop_done;
1399 1648
1400void 1649void
1401ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1402{ 1651{
1403 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1404 ? EVUNLOOP_ONE
1405 : EVUNLOOP_CANCEL;
1406 1653
1407 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1654 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1408 1655
1409 do 1656 do
1410 { 1657 {
1444 /* update fd-related kernel structures */ 1691 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1692 fd_reify (EV_A);
1446 1693
1447 /* calculate blocking time */ 1694 /* calculate blocking time */
1448 { 1695 {
1449 ev_tstamp block; 1696 ev_tstamp waittime = 0.;
1697 ev_tstamp sleeptime = 0.;
1450 1698
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1699 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1700 {
1455 /* update time to cancel out callback processing overhead */ 1701 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1702 time_update (EV_A_ 1e100);
1457 1703
1458 block = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1459 1705
1460 if (timercnt) 1706 if (timercnt)
1461 { 1707 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1463 if (block > to) block = to; 1709 if (waittime > to) waittime = to;
1464 } 1710 }
1465 1711
1466#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1713 if (periodiccnt)
1468 { 1714 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1715 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1716 if (waittime > to) waittime = to;
1471 } 1717 }
1472#endif 1718#endif
1473 1719
1474 if (expect_false (block < 0.)) block = 0.; 1720 if (expect_false (waittime < timeout_blocktime))
1721 waittime = timeout_blocktime;
1722
1723 sleeptime = waittime - backend_fudge;
1724
1725 if (expect_true (sleeptime > io_blocktime))
1726 sleeptime = io_blocktime;
1727
1728 if (sleeptime)
1729 {
1730 ev_sleep (sleeptime);
1731 waittime -= sleeptime;
1732 }
1475 } 1733 }
1476 1734
1477 ++loop_count; 1735 ++loop_count;
1478 backend_poll (EV_A_ block); 1736 backend_poll (EV_A_ waittime);
1479 1737
1480 /* update ev_rt_now, do magic */ 1738 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1739 time_update (EV_A_ waittime + sleeptime);
1482 } 1740 }
1483 1741
1484 /* queue pending timers and reschedule them */ 1742 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1743 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1744#if EV_PERIODIC_ENABLE
1495 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1496 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1497 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1498 1756
1499 call_pending (EV_A); 1757 call_pending (EV_A);
1500
1501 } 1758 }
1502 while (expect_true (activecnt && !loop_done)); 1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1503 1764
1504 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1505 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1506} 1767}
1507 1768
1598 1859
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1860 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1861
1601 ev_start (EV_A_ (W)w, 1); 1862 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1863 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1864 wlist_add (&anfds[fd].head, (WL)w);
1604 1865
1605 fd_change (EV_A_ fd); 1866 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1867 w->events &= ~EV_IOFDSET;
1606} 1868}
1607 1869
1608void noinline 1870void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1871ev_io_stop (EV_P_ ev_io *w)
1610{ 1872{
1612 if (expect_false (!ev_is_active (w))) 1874 if (expect_false (!ev_is_active (w)))
1613 return; 1875 return;
1614 1876
1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1877 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1616 1878
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1879 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1880 ev_stop (EV_A_ (W)w);
1619 1881
1620 fd_change (EV_A_ w->fd); 1882 fd_change (EV_A_ w->fd, 1);
1621} 1883}
1622 1884
1623void noinline 1885void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1625{ 1887{
1626 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1627 return; 1889 return;
1628 1890
1629 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1630 1892
1631 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1893 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1632 1894
1633 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1635 timers [timercnt - 1] = w; 1897 timers [timercnt] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1898 upheap (timers, timercnt);
1637 1899
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1900 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1639} 1901}
1640 1902
1641void noinline 1903void noinline
1642ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1643{ 1905{
1644 clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1646 return; 1908 return;
1647 1909
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1649
1650 { 1910 {
1651 int active = ((W)w)->active; 1911 int active = ev_active (w);
1652 1912
1913 assert (("internal timer heap corruption", timers [active] == (WT)w));
1914
1653 if (expect_true (--active < --timercnt)) 1915 if (expect_true (active < timercnt))
1654 { 1916 {
1655 timers [active] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1656 adjustheap ((WT *)timers, timercnt, active); 1918 adjustheap (timers, timercnt, active);
1657 } 1919 }
1920
1921 --timercnt;
1658 } 1922 }
1659 1923
1660 ((WT)w)->at -= mn_now; 1924 ev_at (w) -= mn_now;
1661 1925
1662 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1663} 1927}
1664 1928
1665void noinline 1929void noinline
1667{ 1931{
1668 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1669 { 1933 {
1670 if (w->repeat) 1934 if (w->repeat)
1671 { 1935 {
1672 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ev_active (w));
1674 } 1938 }
1675 else 1939 else
1676 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1677 } 1941 }
1678 else if (w->repeat) 1942 else if (w->repeat)
1679 { 1943 {
1680 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1681 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1682 } 1946 }
1683} 1947}
1684 1948
1685#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
1688{ 1952{
1689 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1690 return; 1954 return;
1691 1955
1692 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1693 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1694 else if (w->interval) 1958 else if (w->interval)
1695 { 1959 {
1696 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1960 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1697 /* this formula differs from the one in periodic_reify because we do not always round up */ 1961 /* this formula differs from the one in periodic_reify because we do not always round up */
1698 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1962 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1699 } 1963 }
1700 else 1964 else
1701 ((WT)w)->at = w->offset; 1965 ev_at (w) = w->offset;
1702 1966
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 1969 periodics [periodiccnt] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1707 1971
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1972 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1709} 1973}
1710 1974
1711void noinline 1975void noinline
1712ev_periodic_stop (EV_P_ ev_periodic *w) 1976ev_periodic_stop (EV_P_ ev_periodic *w)
1713{ 1977{
1714 clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1716 return; 1980 return;
1717 1981
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1719
1720 { 1982 {
1721 int active = ((W)w)->active; 1983 int active = ev_active (w);
1722 1984
1985 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1986
1723 if (expect_true (--active < --periodiccnt)) 1987 if (expect_true (active < periodiccnt))
1724 { 1988 {
1725 periodics [active] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 1990 adjustheap (periodics, periodiccnt, active);
1727 } 1991 }
1992
1993 --periodiccnt;
1728 } 1994 }
1729 1995
1730 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1731} 1997}
1732 1998
1751#endif 2017#endif
1752 if (expect_false (ev_is_active (w))) 2018 if (expect_false (ev_is_active (w)))
1753 return; 2019 return;
1754 2020
1755 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2021 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2022
2023 evpipe_init (EV_A);
1756 2024
1757 { 2025 {
1758#ifndef _WIN32 2026#ifndef _WIN32
1759 sigset_t full, prev; 2027 sigset_t full, prev;
1760 sigfillset (&full); 2028 sigfillset (&full);
1767 sigprocmask (SIG_SETMASK, &prev, 0); 2035 sigprocmask (SIG_SETMASK, &prev, 0);
1768#endif 2036#endif
1769 } 2037 }
1770 2038
1771 ev_start (EV_A_ (W)w, 1); 2039 ev_start (EV_A_ (W)w, 1);
1772 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1773 2041
1774 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1775 { 2043 {
1776#if _WIN32 2044#if _WIN32
1777 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1778#else 2046#else
1779 struct sigaction sa; 2047 struct sigaction sa;
1780 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1781 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1782 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2050 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1783 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1784#endif 2052#endif
1785 } 2053 }
1790{ 2058{
1791 clear_pending (EV_A_ (W)w); 2059 clear_pending (EV_A_ (W)w);
1792 if (expect_false (!ev_is_active (w))) 2060 if (expect_false (!ev_is_active (w)))
1793 return; 2061 return;
1794 2062
1795 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 2063 wlist_del (&signals [w->signum - 1].head, (WL)w);
1796 ev_stop (EV_A_ (W)w); 2064 ev_stop (EV_A_ (W)w);
1797 2065
1798 if (!signals [w->signum - 1].head) 2066 if (!signals [w->signum - 1].head)
1799 signal (w->signum, SIG_DFL); 2067 signal (w->signum, SIG_DFL);
1800} 2068}
1807#endif 2075#endif
1808 if (expect_false (ev_is_active (w))) 2076 if (expect_false (ev_is_active (w)))
1809 return; 2077 return;
1810 2078
1811 ev_start (EV_A_ (W)w, 1); 2079 ev_start (EV_A_ (W)w, 1);
1812 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2080 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1813} 2081}
1814 2082
1815void 2083void
1816ev_child_stop (EV_P_ ev_child *w) 2084ev_child_stop (EV_P_ ev_child *w)
1817{ 2085{
1818 clear_pending (EV_A_ (W)w); 2086 clear_pending (EV_A_ (W)w);
1819 if (expect_false (!ev_is_active (w))) 2087 if (expect_false (!ev_is_active (w)))
1820 return; 2088 return;
1821 2089
1822 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2090 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1823 ev_stop (EV_A_ (W)w); 2091 ev_stop (EV_A_ (W)w);
1824} 2092}
1825 2093
1826#if EV_STAT_ENABLE 2094#if EV_STAT_ENABLE
1827 2095
2100 clear_pending (EV_A_ (W)w); 2368 clear_pending (EV_A_ (W)w);
2101 if (expect_false (!ev_is_active (w))) 2369 if (expect_false (!ev_is_active (w)))
2102 return; 2370 return;
2103 2371
2104 { 2372 {
2105 int active = ((W)w)->active; 2373 int active = ev_active (w);
2106 2374
2107 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2375 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2108 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2376 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2109 2377
2110 ev_stop (EV_A_ (W)w); 2378 ev_stop (EV_A_ (W)w);
2111 --idleall; 2379 --idleall;
2112 } 2380 }
2113} 2381}
2130 clear_pending (EV_A_ (W)w); 2398 clear_pending (EV_A_ (W)w);
2131 if (expect_false (!ev_is_active (w))) 2399 if (expect_false (!ev_is_active (w)))
2132 return; 2400 return;
2133 2401
2134 { 2402 {
2135 int active = ((W)w)->active; 2403 int active = ev_active (w);
2404
2136 prepares [active - 1] = prepares [--preparecnt]; 2405 prepares [active - 1] = prepares [--preparecnt];
2137 ((W)prepares [active - 1])->active = active; 2406 ev_active (prepares [active - 1]) = active;
2138 } 2407 }
2139 2408
2140 ev_stop (EV_A_ (W)w); 2409 ev_stop (EV_A_ (W)w);
2141} 2410}
2142 2411
2157 clear_pending (EV_A_ (W)w); 2426 clear_pending (EV_A_ (W)w);
2158 if (expect_false (!ev_is_active (w))) 2427 if (expect_false (!ev_is_active (w)))
2159 return; 2428 return;
2160 2429
2161 { 2430 {
2162 int active = ((W)w)->active; 2431 int active = ev_active (w);
2432
2163 checks [active - 1] = checks [--checkcnt]; 2433 checks [active - 1] = checks [--checkcnt];
2164 ((W)checks [active - 1])->active = active; 2434 ev_active (checks [active - 1]) = active;
2165 } 2435 }
2166 2436
2167 ev_stop (EV_A_ (W)w); 2437 ev_stop (EV_A_ (W)w);
2168} 2438}
2169 2439
2170#if EV_EMBED_ENABLE 2440#if EV_EMBED_ENABLE
2171void noinline 2441void noinline
2172ev_embed_sweep (EV_P_ ev_embed *w) 2442ev_embed_sweep (EV_P_ ev_embed *w)
2173{ 2443{
2174 ev_loop (w->loop, EVLOOP_NONBLOCK); 2444 ev_loop (w->other, EVLOOP_NONBLOCK);
2175} 2445}
2176 2446
2177static void 2447static void
2178embed_cb (EV_P_ ev_io *io, int revents) 2448embed_io_cb (EV_P_ ev_io *io, int revents)
2179{ 2449{
2180 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2450 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2181 2451
2182 if (ev_cb (w)) 2452 if (ev_cb (w))
2183 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2453 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2184 else 2454 else
2185 ev_embed_sweep (loop, w); 2455 ev_loop (w->other, EVLOOP_NONBLOCK);
2186} 2456}
2457
2458static void
2459embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2460{
2461 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2462
2463 {
2464 struct ev_loop *loop = w->other;
2465
2466 while (fdchangecnt)
2467 {
2468 fd_reify (EV_A);
2469 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2470 }
2471 }
2472}
2473
2474#if 0
2475static void
2476embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2477{
2478 ev_idle_stop (EV_A_ idle);
2479}
2480#endif
2187 2481
2188void 2482void
2189ev_embed_start (EV_P_ ev_embed *w) 2483ev_embed_start (EV_P_ ev_embed *w)
2190{ 2484{
2191 if (expect_false (ev_is_active (w))) 2485 if (expect_false (ev_is_active (w)))
2192 return; 2486 return;
2193 2487
2194 { 2488 {
2195 struct ev_loop *loop = w->loop; 2489 struct ev_loop *loop = w->other;
2196 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2490 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2197 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2491 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2198 } 2492 }
2199 2493
2200 ev_set_priority (&w->io, ev_priority (w)); 2494 ev_set_priority (&w->io, ev_priority (w));
2201 ev_io_start (EV_A_ &w->io); 2495 ev_io_start (EV_A_ &w->io);
2202 2496
2497 ev_prepare_init (&w->prepare, embed_prepare_cb);
2498 ev_set_priority (&w->prepare, EV_MINPRI);
2499 ev_prepare_start (EV_A_ &w->prepare);
2500
2501 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2502
2203 ev_start (EV_A_ (W)w, 1); 2503 ev_start (EV_A_ (W)w, 1);
2204} 2504}
2205 2505
2206void 2506void
2207ev_embed_stop (EV_P_ ev_embed *w) 2507ev_embed_stop (EV_P_ ev_embed *w)
2209 clear_pending (EV_A_ (W)w); 2509 clear_pending (EV_A_ (W)w);
2210 if (expect_false (!ev_is_active (w))) 2510 if (expect_false (!ev_is_active (w)))
2211 return; 2511 return;
2212 2512
2213 ev_io_stop (EV_A_ &w->io); 2513 ev_io_stop (EV_A_ &w->io);
2514 ev_prepare_stop (EV_A_ &w->prepare);
2214 2515
2215 ev_stop (EV_A_ (W)w); 2516 ev_stop (EV_A_ (W)w);
2216} 2517}
2217#endif 2518#endif
2218 2519
2234 clear_pending (EV_A_ (W)w); 2535 clear_pending (EV_A_ (W)w);
2235 if (expect_false (!ev_is_active (w))) 2536 if (expect_false (!ev_is_active (w)))
2236 return; 2537 return;
2237 2538
2238 { 2539 {
2239 int active = ((W)w)->active; 2540 int active = ev_active (w);
2541
2240 forks [active - 1] = forks [--forkcnt]; 2542 forks [active - 1] = forks [--forkcnt];
2241 ((W)forks [active - 1])->active = active; 2543 ev_active (forks [active - 1]) = active;
2242 } 2544 }
2243 2545
2244 ev_stop (EV_A_ (W)w); 2546 ev_stop (EV_A_ (W)w);
2547}
2548#endif
2549
2550#if EV_ASYNC_ENABLE
2551void
2552ev_async_start (EV_P_ ev_async *w)
2553{
2554 if (expect_false (ev_is_active (w)))
2555 return;
2556
2557 evpipe_init (EV_A);
2558
2559 ev_start (EV_A_ (W)w, ++asynccnt);
2560 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2561 asyncs [asynccnt - 1] = w;
2562}
2563
2564void
2565ev_async_stop (EV_P_ ev_async *w)
2566{
2567 clear_pending (EV_A_ (W)w);
2568 if (expect_false (!ev_is_active (w)))
2569 return;
2570
2571 {
2572 int active = ev_active (w);
2573
2574 asyncs [active - 1] = asyncs [--asynccnt];
2575 ev_active (asyncs [active - 1]) = active;
2576 }
2577
2578 ev_stop (EV_A_ (W)w);
2579}
2580
2581void
2582ev_async_send (EV_P_ ev_async *w)
2583{
2584 w->sent = 1;
2585 evpipe_write (EV_A_ &gotasync);
2245} 2586}
2246#endif 2587#endif
2247 2588
2248/*****************************************************************************/ 2589/*****************************************************************************/
2249 2590
2307 ev_timer_set (&once->to, timeout, 0.); 2648 ev_timer_set (&once->to, timeout, 0.);
2308 ev_timer_start (EV_A_ &once->to); 2649 ev_timer_start (EV_A_ &once->to);
2309 } 2650 }
2310} 2651}
2311 2652
2653#if EV_MULTIPLICITY
2654 #include "ev_wrap.h"
2655#endif
2656
2312#ifdef __cplusplus 2657#ifdef __cplusplus
2313} 2658}
2314#endif 2659#endif
2315 2660

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines