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

Comparing libev/ev.c (file contents):
Revision 1.190 by root, Fri Dec 21 01:26:04 2007 UTC vs.
Revision 1.229 by root, Fri May 2 08:08:45 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
207#if !EV_STAT_ENABLE 252#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY 253# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0 254# define EV_USE_INOTIFY 0
210#endif 255#endif
211 256
257#if !EV_USE_NANOSLEEP
258# ifndef _WIN32
259# include <sys/select.h>
260# endif
261#endif
262
212#if EV_USE_INOTIFY 263#if EV_USE_INOTIFY
213# include <sys/inotify.h> 264# include <sys/inotify.h>
214#endif 265#endif
215 266
216#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
217# include <winsock.h> 268# include <winsock.h>
269#endif
270
271#if EV_USE_EVENTFD
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" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
218#endif 281#endif
219 282
220/**/ 283/**/
221 284
222/* 285/*
237# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
238# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
239#else 302#else
240# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
241# define noinline 304# define noinline
242# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
243# define inline 306# define inline
244# endif 307# endif
245#endif 308#endif
246 309
247#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
262 325
263typedef ev_watcher *W; 326typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
266 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
333#if EV_USE_MONOTONIC
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
335/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
268 338
269#ifdef _WIN32 339#ifdef _WIN32
270# include "ev_win32.c" 340# include "ev_win32.c"
271#endif 341#endif
272 342
293 perror (msg); 363 perror (msg);
294 abort (); 364 abort ();
295 } 365 }
296} 366}
297 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
298static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
299 384
300void 385void
301ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
302{ 387{
303 alloc = cb; 388 alloc = cb;
304} 389}
305 390
306inline_speed void * 391inline_speed void *
307ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
308{ 393{
309 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
310 395
311 if (!ptr && size) 396 if (!ptr && size)
312 { 397 {
313 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
314 abort (); 399 abort ();
408{ 493{
409 return ev_rt_now; 494 return ev_rt_now;
410} 495}
411#endif 496#endif
412 497
498void
499ev_sleep (ev_tstamp delay)
500{
501 if (delay > 0.)
502 {
503#if EV_USE_NANOSLEEP
504 struct timespec ts;
505
506 ts.tv_sec = (time_t)delay;
507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
508
509 nanosleep (&ts, 0);
510#elif defined(_WIN32)
511 Sleep ((unsigned long)(delay * 1e3));
512#else
513 struct timeval tv;
514
515 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517
518 select (0, 0, 0, 0, &tv);
519#endif
520 }
521}
522
523/*****************************************************************************/
524
413int inline_size 525int inline_size
414array_nextsize (int elem, int cur, int cnt) 526array_nextsize (int elem, int cur, int cnt)
415{ 527{
416 int ncur = cur + 1; 528 int ncur = cur + 1;
417 529
543 655
544#if EV_SELECT_IS_WINSOCKET 656#if EV_SELECT_IS_WINSOCKET
545 if (events) 657 if (events)
546 { 658 {
547 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
548 anfd->handle = _get_osfhandle (fd); 663 anfd->handle = _get_osfhandle (fd);
664 #endif
549 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));
550 } 666 }
551#endif 667#endif
552 668
553 { 669 {
641 } 757 }
642} 758}
643 759
644/*****************************************************************************/ 760/*****************************************************************************/
645 761
762/* towards the root */
646void inline_speed 763void inline_speed
647upheap (WT *heap, int k) 764upheap (WT *heap, int k)
648{ 765{
649 WT w = heap [k]; 766 WT w = heap [k];
650 767
651 while (k) 768 for (;;)
652 { 769 {
653 int p = (k - 1) >> 1; 770 int p = k >> 1;
654 771
772 /* maybe we could use a dummy element at heap [0]? */
655 if (heap [p]->at <= w->at) 773 if (!p || heap [p]->at <= w->at)
656 break; 774 break;
657 775
658 heap [k] = heap [p]; 776 heap [k] = heap [p];
659 ((W)heap [k])->active = k + 1; 777 ((W)heap [k])->active = k;
660 k = p; 778 k = p;
661 } 779 }
662 780
663 heap [k] = w; 781 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 782 ((W)heap [k])->active = k;
665} 783}
666 784
785/* away from the root */
667void inline_speed 786void inline_speed
668downheap (WT *heap, int N, int k) 787downheap (WT *heap, int N, int k)
669{ 788{
670 WT w = heap [k]; 789 WT w = heap [k];
671 790
672 for (;;) 791 for (;;)
673 { 792 {
674 int c = (k << 1) + 1; 793 int c = k << 1;
675 794
676 if (c >= N) 795 if (c > N)
677 break; 796 break;
678 797
679 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 798 c += c < N && heap [c]->at > heap [c + 1]->at
680 ? 1 : 0; 799 ? 1 : 0;
681 800
682 if (w->at <= heap [c]->at) 801 if (w->at <= heap [c]->at)
683 break; 802 break;
684 803
685 heap [k] = heap [c]; 804 heap [k] = heap [c];
686 ((W)heap [k])->active = k + 1; 805 ((W)heap [k])->active = k;
687 806
688 k = c; 807 k = c;
689 } 808 }
690 809
691 heap [k] = w; 810 heap [k] = w;
692 ((W)heap [k])->active = k + 1; 811 ((W)heap [k])->active = k;
693} 812}
694 813
695void inline_size 814void inline_size
696adjustheap (WT *heap, int N, int k) 815adjustheap (WT *heap, int N, int k)
697{ 816{
702/*****************************************************************************/ 821/*****************************************************************************/
703 822
704typedef struct 823typedef struct
705{ 824{
706 WL head; 825 WL head;
707 sig_atomic_t volatile gotsig; 826 EV_ATOMIC_T gotsig;
708} ANSIG; 827} ANSIG;
709 828
710static ANSIG *signals; 829static ANSIG *signals;
711static int signalmax; 830static int signalmax;
712 831
713static int sigpipe [2]; 832static EV_ATOMIC_T gotsig;
714static sig_atomic_t volatile gotsig;
715static ev_io sigev;
716 833
717void inline_size 834void inline_size
718signals_init (ANSIG *base, int count) 835signals_init (ANSIG *base, int count)
719{ 836{
720 while (count--) 837 while (count--)
724 841
725 ++base; 842 ++base;
726 } 843 }
727} 844}
728 845
729static void 846/*****************************************************************************/
730sighandler (int signum)
731{
732#if _WIN32
733 signal (signum, sighandler);
734#endif
735
736 signals [signum - 1].gotsig = 1;
737
738 if (!gotsig)
739 {
740 int old_errno = errno;
741 gotsig = 1;
742 write (sigpipe [1], &signum, 1);
743 errno = old_errno;
744 }
745}
746
747void noinline
748ev_feed_signal_event (EV_P_ int signum)
749{
750 WL w;
751
752#if EV_MULTIPLICITY
753 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
754#endif
755
756 --signum;
757
758 if (signum < 0 || signum >= signalmax)
759 return;
760
761 signals [signum].gotsig = 0;
762
763 for (w = signals [signum].head; w; w = w->next)
764 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
765}
766
767static void
768sigcb (EV_P_ ev_io *iow, int revents)
769{
770 int signum;
771
772 read (sigpipe [0], &revents, 1);
773 gotsig = 0;
774
775 for (signum = signalmax; signum--; )
776 if (signals [signum].gotsig)
777 ev_feed_signal_event (EV_A_ signum + 1);
778}
779 847
780void inline_speed 848void inline_speed
781fd_intern (int fd) 849fd_intern (int fd)
782{ 850{
783#ifdef _WIN32 851#ifdef _WIN32
788 fcntl (fd, F_SETFL, O_NONBLOCK); 856 fcntl (fd, F_SETFL, O_NONBLOCK);
789#endif 857#endif
790} 858}
791 859
792static void noinline 860static void noinline
793siginit (EV_P) 861evpipe_init (EV_P)
794{ 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
795 fd_intern (sigpipe [0]); 878 fd_intern (evpipe [0]);
796 fd_intern (sigpipe [1]); 879 fd_intern (evpipe [1]);
880 ev_io_set (&pipeev, evpipe [0], EV_READ);
881 }
797 882
798 ev_io_set (&sigev, sigpipe [0], EV_READ);
799 ev_io_start (EV_A_ &sigev); 883 ev_io_start (EV_A_ &pipeev);
800 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
801} 951}
802 952
803/*****************************************************************************/ 953/*****************************************************************************/
804 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
805static WL childs [EV_PID_HASHSIZE]; 992static WL childs [EV_PID_HASHSIZE];
806 993
807#ifndef _WIN32 994#ifndef _WIN32
808 995
809static ev_signal childev; 996static ev_signal childev;
810 997
998#ifndef WIFCONTINUED
999# define WIFCONTINUED(status) 0
1000#endif
1001
811void inline_speed 1002void inline_speed
812child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1003child_reap (EV_P_ int chain, int pid, int status)
813{ 1004{
814 ev_child *w; 1005 ev_child *w;
1006 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
815 1007
816 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 {
817 if (w->pid == pid || !w->pid) 1010 if ((w->pid == pid || !w->pid)
1011 && (!traced || (w->flags & 1)))
818 { 1012 {
819 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 */
820 w->rpid = pid; 1014 w->rpid = pid;
821 w->rstatus = status; 1015 w->rstatus = status;
822 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1016 ev_feed_event (EV_A_ (W)w, EV_CHILD);
823 } 1017 }
1018 }
824} 1019}
825 1020
826#ifndef WCONTINUED 1021#ifndef WCONTINUED
827# define WCONTINUED 0 1022# define WCONTINUED 0
828#endif 1023#endif
837 if (!WCONTINUED 1032 if (!WCONTINUED
838 || errno != EINVAL 1033 || errno != EINVAL
839 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1034 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
840 return; 1035 return;
841 1036
842 /* 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 */
843 /* 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 */
844 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1039 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
845 1040
846 child_reap (EV_A_ sw, pid, pid, status); 1041 child_reap (EV_A_ pid, pid, status);
847 if (EV_PID_HASHSIZE > 1) 1042 if (EV_PID_HASHSIZE > 1)
848 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 */
849} 1044}
850 1045
851#endif 1046#endif
852 1047
853/*****************************************************************************/ 1048/*****************************************************************************/
925} 1120}
926 1121
927unsigned int 1122unsigned int
928ev_embeddable_backends (void) 1123ev_embeddable_backends (void)
929{ 1124{
930 return EVBACKEND_EPOLL 1125 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
931 | EVBACKEND_KQUEUE 1126
932 | 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;
933} 1132}
934 1133
935unsigned int 1134unsigned int
936ev_backend (EV_P) 1135ev_backend (EV_P)
937{ 1136{
940 1139
941unsigned int 1140unsigned int
942ev_loop_count (EV_P) 1141ev_loop_count (EV_P)
943{ 1142{
944 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;
945} 1156}
946 1157
947static void noinline 1158static void noinline
948loop_init (EV_P_ unsigned int flags) 1159loop_init (EV_P_ unsigned int flags)
949{ 1160{
955 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1166 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
956 have_monotonic = 1; 1167 have_monotonic = 1;
957 } 1168 }
958#endif 1169#endif
959 1170
960 ev_rt_now = ev_time (); 1171 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1172 mn_now = get_clock ();
962 now_floor = mn_now; 1173 now_floor = mn_now;
963 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
964 1184
965 /* pid check not overridable via env */ 1185 /* pid check not overridable via env */
966#ifndef _WIN32 1186#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1187 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1188 curpid = getpid ();
971 if (!(flags & EVFLAG_NOENV) 1191 if (!(flags & EVFLAG_NOENV)
972 && !enable_secure () 1192 && !enable_secure ()
973 && getenv ("LIBEV_FLAGS")) 1193 && getenv ("LIBEV_FLAGS"))
974 flags = atoi (getenv ("LIBEV_FLAGS")); 1194 flags = atoi (getenv ("LIBEV_FLAGS"));
975 1195
976 if (!(flags & 0x0000ffffUL)) 1196 if (!(flags & 0x0000ffffU))
977 flags |= ev_recommended_backends (); 1197 flags |= ev_recommended_backends ();
978
979 backend = 0;
980 backend_fd = -1;
981#if EV_USE_INOTIFY
982 fs_fd = -2;
983#endif
984 1198
985#if EV_USE_PORT 1199#if EV_USE_PORT
986 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1200 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
987#endif 1201#endif
988#if EV_USE_KQUEUE 1202#if EV_USE_KQUEUE
996#endif 1210#endif
997#if EV_USE_SELECT 1211#if EV_USE_SELECT
998 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1212 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
999#endif 1213#endif
1000 1214
1001 ev_init (&sigev, sigcb); 1215 ev_init (&pipeev, pipecb);
1002 ev_set_priority (&sigev, EV_MAXPRI); 1216 ev_set_priority (&pipeev, EV_MAXPRI);
1003 } 1217 }
1004} 1218}
1005 1219
1006static void noinline 1220static void noinline
1007loop_destroy (EV_P) 1221loop_destroy (EV_P)
1008{ 1222{
1009 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 }
1010 1241
1011#if EV_USE_INOTIFY 1242#if EV_USE_INOTIFY
1012 if (fs_fd >= 0) 1243 if (fs_fd >= 0)
1013 close (fs_fd); 1244 close (fs_fd);
1014#endif 1245#endif
1051#if EV_FORK_ENABLE 1282#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY); 1283 array_free (fork, EMPTY);
1053#endif 1284#endif
1054 array_free (prepare, EMPTY); 1285 array_free (prepare, EMPTY);
1055 array_free (check, EMPTY); 1286 array_free (check, EMPTY);
1287#if EV_ASYNC_ENABLE
1288 array_free (async, EMPTY);
1289#endif
1056 1290
1057 backend = 0; 1291 backend = 0;
1058} 1292}
1059 1293
1294#if EV_USE_INOTIFY
1060void inline_size infy_fork (EV_P); 1295void inline_size infy_fork (EV_P);
1296#endif
1061 1297
1062void inline_size 1298void inline_size
1063loop_fork (EV_P) 1299loop_fork (EV_P)
1064{ 1300{
1065#if EV_USE_PORT 1301#if EV_USE_PORT
1073#endif 1309#endif
1074#if EV_USE_INOTIFY 1310#if EV_USE_INOTIFY
1075 infy_fork (EV_A); 1311 infy_fork (EV_A);
1076#endif 1312#endif
1077 1313
1078 if (ev_is_active (&sigev)) 1314 if (ev_is_active (&pipeev))
1079 { 1315 {
1080 /* 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
1081 1322
1082 ev_ref (EV_A); 1323 ev_ref (EV_A);
1083 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 {
1084 close (sigpipe [0]); 1333 close (evpipe [0]);
1085 close (sigpipe [1]); 1334 close (evpipe [1]);
1335 }
1086 1336
1087 while (pipe (sigpipe))
1088 syserr ("(libev) error creating pipe");
1089
1090 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);
1091 } 1340 }
1092 1341
1093 postfork = 0; 1342 postfork = 0;
1094} 1343}
1095 1344
1117} 1366}
1118 1367
1119void 1368void
1120ev_loop_fork (EV_P) 1369ev_loop_fork (EV_P)
1121{ 1370{
1122 postfork = 1; 1371 postfork = 1; /* must be in line with ev_default_fork */
1123} 1372}
1124 1373
1125#endif 1374#endif
1126 1375
1127#if EV_MULTIPLICITY 1376#if EV_MULTIPLICITY
1130#else 1379#else
1131int 1380int
1132ev_default_loop (unsigned int flags) 1381ev_default_loop (unsigned int flags)
1133#endif 1382#endif
1134{ 1383{
1135 if (sigpipe [0] == sigpipe [1])
1136 if (pipe (sigpipe))
1137 return 0;
1138
1139 if (!ev_default_loop_ptr) 1384 if (!ev_default_loop_ptr)
1140 { 1385 {
1141#if EV_MULTIPLICITY 1386#if EV_MULTIPLICITY
1142 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1387 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1143#else 1388#else
1146 1391
1147 loop_init (EV_A_ flags); 1392 loop_init (EV_A_ flags);
1148 1393
1149 if (ev_backend (EV_A)) 1394 if (ev_backend (EV_A))
1150 { 1395 {
1151 siginit (EV_A);
1152
1153#ifndef _WIN32 1396#ifndef _WIN32
1154 ev_signal_init (&childev, childcb, SIGCHLD); 1397 ev_signal_init (&childev, childcb, SIGCHLD);
1155 ev_set_priority (&childev, EV_MAXPRI); 1398 ev_set_priority (&childev, EV_MAXPRI);
1156 ev_signal_start (EV_A_ &childev); 1399 ev_signal_start (EV_A_ &childev);
1157 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1400 ev_unref (EV_A); /* child watcher should not keep loop alive */
1174#ifndef _WIN32 1417#ifndef _WIN32
1175 ev_ref (EV_A); /* child watcher */ 1418 ev_ref (EV_A); /* child watcher */
1176 ev_signal_stop (EV_A_ &childev); 1419 ev_signal_stop (EV_A_ &childev);
1177#endif 1420#endif
1178 1421
1179 ev_ref (EV_A); /* signal watcher */
1180 ev_io_stop (EV_A_ &sigev);
1181
1182 close (sigpipe [0]); sigpipe [0] = 0;
1183 close (sigpipe [1]); sigpipe [1] = 0;
1184
1185 loop_destroy (EV_A); 1422 loop_destroy (EV_A);
1186} 1423}
1187 1424
1188void 1425void
1189ev_default_fork (void) 1426ev_default_fork (void)
1191#if EV_MULTIPLICITY 1428#if EV_MULTIPLICITY
1192 struct ev_loop *loop = ev_default_loop_ptr; 1429 struct ev_loop *loop = ev_default_loop_ptr;
1193#endif 1430#endif
1194 1431
1195 if (backend) 1432 if (backend)
1196 postfork = 1; 1433 postfork = 1; /* must be in line with ev_loop_fork */
1197} 1434}
1198 1435
1199/*****************************************************************************/ 1436/*****************************************************************************/
1200 1437
1201void 1438void
1225} 1462}
1226 1463
1227void inline_size 1464void inline_size
1228timers_reify (EV_P) 1465timers_reify (EV_P)
1229{ 1466{
1230 while (timercnt && ((WT)timers [0])->at <= mn_now) 1467 while (timercnt && ev_at (timers [1]) <= mn_now)
1231 { 1468 {
1232 ev_timer *w = (ev_timer *)timers [0]; 1469 ev_timer *w = (ev_timer *)timers [1];
1233 1470
1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1471 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1235 1472
1236 /* first reschedule or stop timer */ 1473 /* first reschedule or stop timer */
1237 if (w->repeat) 1474 if (w->repeat)
1238 { 1475 {
1239 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.));
1240 1477
1241 ((WT)w)->at += w->repeat; 1478 ev_at (w) += w->repeat;
1242 if (((WT)w)->at < mn_now) 1479 if (ev_at (w) < mn_now)
1243 ((WT)w)->at = mn_now; 1480 ev_at (w) = mn_now;
1244 1481
1245 downheap (timers, timercnt, 0); 1482 downheap (timers, timercnt, 1);
1246 } 1483 }
1247 else 1484 else
1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1485 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1249 1486
1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1487 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1253 1490
1254#if EV_PERIODIC_ENABLE 1491#if EV_PERIODIC_ENABLE
1255void inline_size 1492void inline_size
1256periodics_reify (EV_P) 1493periodics_reify (EV_P)
1257{ 1494{
1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1495 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1259 { 1496 {
1260 ev_periodic *w = (ev_periodic *)periodics [0]; 1497 ev_periodic *w = (ev_periodic *)periodics [1];
1261 1498
1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1499 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1263 1500
1264 /* first reschedule or stop timer */ 1501 /* first reschedule or stop timer */
1265 if (w->reschedule_cb) 1502 if (w->reschedule_cb)
1266 { 1503 {
1267 ((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);
1268 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));
1269 downheap (periodics, periodiccnt, 0); 1506 downheap (periodics, periodiccnt, 1);
1270 } 1507 }
1271 else if (w->interval) 1508 else if (w->interval)
1272 { 1509 {
1273 ((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;
1274 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;
1275 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));
1276 downheap (periodics, periodiccnt, 0); 1513 downheap (periodics, periodiccnt, 1);
1277 } 1514 }
1278 else 1515 else
1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1516 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1280 1517
1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1518 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1291 for (i = 0; i < periodiccnt; ++i) 1528 for (i = 0; i < periodiccnt; ++i)
1292 { 1529 {
1293 ev_periodic *w = (ev_periodic *)periodics [i]; 1530 ev_periodic *w = (ev_periodic *)periodics [i];
1294 1531
1295 if (w->reschedule_cb) 1532 if (w->reschedule_cb)
1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1533 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1297 else if (w->interval) 1534 else if (w->interval)
1298 ((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;
1299 } 1536 }
1300 1537
1301 /* now rebuild the heap */ 1538 /* now rebuild the heap */
1302 for (i = periodiccnt >> 1; i--; ) 1539 for (i = periodiccnt >> 1; i--; )
1303 downheap (periodics, periodiccnt, i); 1540 downheap (periodics, periodiccnt, i);
1385 { 1622 {
1386#if EV_PERIODIC_ENABLE 1623#if EV_PERIODIC_ENABLE
1387 periodics_reschedule (EV_A); 1624 periodics_reschedule (EV_A);
1388#endif 1625#endif
1389 /* 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 */
1390 for (i = 0; i < timercnt; ++i) 1627 for (i = 1; i <= timercnt; ++i)
1391 ((WT)timers [i])->at += ev_rt_now - mn_now; 1628 ev_at (timers [i]) += ev_rt_now - mn_now;
1392 } 1629 }
1393 1630
1394 mn_now = ev_rt_now; 1631 mn_now = ev_rt_now;
1395 } 1632 }
1396} 1633}
1410static int loop_done; 1647static int loop_done;
1411 1648
1412void 1649void
1413ev_loop (EV_P_ int flags) 1650ev_loop (EV_P_ int flags)
1414{ 1651{
1415 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1652 loop_done = EVUNLOOP_CANCEL;
1416 ? EVUNLOOP_ONE
1417 : EVUNLOOP_CANCEL;
1418 1653
1419 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 */
1420 1655
1421 do 1656 do
1422 { 1657 {
1456 /* update fd-related kernel structures */ 1691 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1692 fd_reify (EV_A);
1458 1693
1459 /* calculate blocking time */ 1694 /* calculate blocking time */
1460 { 1695 {
1461 ev_tstamp block; 1696 ev_tstamp waittime = 0.;
1697 ev_tstamp sleeptime = 0.;
1462 1698
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1699 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1700 {
1467 /* update time to cancel out callback processing overhead */ 1701 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1702 time_update (EV_A_ 1e100);
1469 1703
1470 block = MAX_BLOCKTIME; 1704 waittime = MAX_BLOCKTIME;
1471 1705
1472 if (timercnt) 1706 if (timercnt)
1473 { 1707 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1708 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1475 if (block > to) block = to; 1709 if (waittime > to) waittime = to;
1476 } 1710 }
1477 1711
1478#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1713 if (periodiccnt)
1480 { 1714 {
1481 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;
1482 if (block > to) block = to; 1716 if (waittime > to) waittime = to;
1483 } 1717 }
1484#endif 1718#endif
1485 1719
1486 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 }
1487 } 1733 }
1488 1734
1489 ++loop_count; 1735 ++loop_count;
1490 backend_poll (EV_A_ block); 1736 backend_poll (EV_A_ waittime);
1491 1737
1492 /* update ev_rt_now, do magic */ 1738 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1739 time_update (EV_A_ waittime + sleeptime);
1494 } 1740 }
1495 1741
1496 /* queue pending timers and reschedule them */ 1742 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1743 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1744#if EV_PERIODIC_ENABLE
1507 /* queue check watchers, to be executed first */ 1753 /* queue check watchers, to be executed first */
1508 if (expect_false (checkcnt)) 1754 if (expect_false (checkcnt))
1509 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1755 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1510 1756
1511 call_pending (EV_A); 1757 call_pending (EV_A);
1512
1513 } 1758 }
1514 while (expect_true (activecnt && !loop_done)); 1759 while (expect_true (
1760 activecnt
1761 && !loop_done
1762 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1763 ));
1515 1764
1516 if (loop_done == EVUNLOOP_ONE) 1765 if (loop_done == EVUNLOOP_ONE)
1517 loop_done = EVUNLOOP_CANCEL; 1766 loop_done = EVUNLOOP_CANCEL;
1518} 1767}
1519 1768
1637ev_timer_start (EV_P_ ev_timer *w) 1886ev_timer_start (EV_P_ ev_timer *w)
1638{ 1887{
1639 if (expect_false (ev_is_active (w))) 1888 if (expect_false (ev_is_active (w)))
1640 return; 1889 return;
1641 1890
1642 ((WT)w)->at += mn_now; 1891 ev_at (w) += mn_now;
1643 1892
1644 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.));
1645 1894
1646 ev_start (EV_A_ (W)w, ++timercnt); 1895 ev_start (EV_A_ (W)w, ++timercnt);
1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1896 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1648 timers [timercnt - 1] = (WT)w; 1897 timers [timercnt] = (WT)w;
1649 upheap (timers, timercnt - 1); 1898 upheap (timers, timercnt);
1650 1899
1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1900 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
1652} 1901}
1653 1902
1654void noinline 1903void noinline
1655ev_timer_stop (EV_P_ ev_timer *w) 1904ev_timer_stop (EV_P_ ev_timer *w)
1656{ 1905{
1657 clear_pending (EV_A_ (W)w); 1906 clear_pending (EV_A_ (W)w);
1658 if (expect_false (!ev_is_active (w))) 1907 if (expect_false (!ev_is_active (w)))
1659 return; 1908 return;
1660 1909
1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w)); 1910 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
1662 1911
1663 { 1912 {
1664 int active = ((W)w)->active; 1913 int active = ((W)w)->active;
1665 1914
1666 if (expect_true (--active < --timercnt)) 1915 if (expect_true (active < timercnt))
1667 { 1916 {
1668 timers [active] = timers [timercnt]; 1917 timers [active] = timers [timercnt];
1669 adjustheap (timers, timercnt, active); 1918 adjustheap (timers, timercnt, active);
1670 } 1919 }
1920
1921 --timercnt;
1671 } 1922 }
1672 1923
1673 ((WT)w)->at -= mn_now; 1924 ev_at (w) -= mn_now;
1674 1925
1675 ev_stop (EV_A_ (W)w); 1926 ev_stop (EV_A_ (W)w);
1676} 1927}
1677 1928
1678void noinline 1929void noinline
1680{ 1931{
1681 if (ev_is_active (w)) 1932 if (ev_is_active (w))
1682 { 1933 {
1683 if (w->repeat) 1934 if (w->repeat)
1684 { 1935 {
1685 ((WT)w)->at = mn_now + w->repeat; 1936 ev_at (w) = mn_now + w->repeat;
1686 adjustheap (timers, timercnt, ((W)w)->active - 1); 1937 adjustheap (timers, timercnt, ((W)w)->active);
1687 } 1938 }
1688 else 1939 else
1689 ev_timer_stop (EV_A_ w); 1940 ev_timer_stop (EV_A_ w);
1690 } 1941 }
1691 else if (w->repeat) 1942 else if (w->repeat)
1692 { 1943 {
1693 w->at = w->repeat; 1944 ev_at (w) = w->repeat;
1694 ev_timer_start (EV_A_ w); 1945 ev_timer_start (EV_A_ w);
1695 } 1946 }
1696} 1947}
1697 1948
1698#if EV_PERIODIC_ENABLE 1949#if EV_PERIODIC_ENABLE
1701{ 1952{
1702 if (expect_false (ev_is_active (w))) 1953 if (expect_false (ev_is_active (w)))
1703 return; 1954 return;
1704 1955
1705 if (w->reschedule_cb) 1956 if (w->reschedule_cb)
1706 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1957 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1707 else if (w->interval) 1958 else if (w->interval)
1708 { 1959 {
1709 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.));
1710 /* 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 */
1711 ((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;
1712 } 1963 }
1713 else 1964 else
1714 ((WT)w)->at = w->offset; 1965 ev_at (w) = w->offset;
1715 1966
1716 ev_start (EV_A_ (W)w, ++periodiccnt); 1967 ev_start (EV_A_ (W)w, ++periodiccnt);
1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1968 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1718 periodics [periodiccnt - 1] = (WT)w; 1969 periodics [periodiccnt] = (WT)w;
1719 upheap (periodics, periodiccnt - 1); 1970 upheap (periodics, periodiccnt);
1720 1971
1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1972 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1722} 1973}
1723 1974
1724void noinline 1975void noinline
1726{ 1977{
1727 clear_pending (EV_A_ (W)w); 1978 clear_pending (EV_A_ (W)w);
1728 if (expect_false (!ev_is_active (w))) 1979 if (expect_false (!ev_is_active (w)))
1729 return; 1980 return;
1730 1981
1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w)); 1982 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
1732 1983
1733 { 1984 {
1734 int active = ((W)w)->active; 1985 int active = ((W)w)->active;
1735 1986
1736 if (expect_true (--active < --periodiccnt)) 1987 if (expect_true (active < periodiccnt))
1737 { 1988 {
1738 periodics [active] = periodics [periodiccnt]; 1989 periodics [active] = periodics [periodiccnt];
1739 adjustheap (periodics, periodiccnt, active); 1990 adjustheap (periodics, periodiccnt, active);
1740 } 1991 }
1992
1993 --periodiccnt;
1741 } 1994 }
1742 1995
1743 ev_stop (EV_A_ (W)w); 1996 ev_stop (EV_A_ (W)w);
1744} 1997}
1745 1998
1764#endif 2017#endif
1765 if (expect_false (ev_is_active (w))) 2018 if (expect_false (ev_is_active (w)))
1766 return; 2019 return;
1767 2020
1768 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);
1769 2024
1770 { 2025 {
1771#ifndef _WIN32 2026#ifndef _WIN32
1772 sigset_t full, prev; 2027 sigset_t full, prev;
1773 sigfillset (&full); 2028 sigfillset (&full);
1785 wlist_add (&signals [w->signum - 1].head, (WL)w); 2040 wlist_add (&signals [w->signum - 1].head, (WL)w);
1786 2041
1787 if (!((WL)w)->next) 2042 if (!((WL)w)->next)
1788 { 2043 {
1789#if _WIN32 2044#if _WIN32
1790 signal (w->signum, sighandler); 2045 signal (w->signum, ev_sighandler);
1791#else 2046#else
1792 struct sigaction sa; 2047 struct sigaction sa;
1793 sa.sa_handler = sighandler; 2048 sa.sa_handler = ev_sighandler;
1794 sigfillset (&sa.sa_mask); 2049 sigfillset (&sa.sa_mask);
1795 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 */
1796 sigaction (w->signum, &sa, 0); 2051 sigaction (w->signum, &sa, 0);
1797#endif 2052#endif
1798 } 2053 }
2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2448 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2194 2449
2195 if (ev_cb (w)) 2450 if (ev_cb (w))
2196 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2451 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2197 else 2452 else
2198 ev_embed_sweep (loop, w); 2453 ev_loop (w->other, EVLOOP_NONBLOCK);
2199} 2454}
2200 2455
2201static void 2456static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2457embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{ 2458{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2459 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205 2460
2206 fd_reify (w->other); 2461 {
2462 struct ev_loop *loop = w->other;
2463
2464 while (fdchangecnt)
2465 {
2466 fd_reify (EV_A);
2467 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2468 }
2469 }
2207} 2470}
2471
2472#if 0
2473static void
2474embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2475{
2476 ev_idle_stop (EV_A_ idle);
2477}
2478#endif
2208 2479
2209void 2480void
2210ev_embed_start (EV_P_ ev_embed *w) 2481ev_embed_start (EV_P_ ev_embed *w)
2211{ 2482{
2212 if (expect_false (ev_is_active (w))) 2483 if (expect_false (ev_is_active (w)))
2213 return; 2484 return;
2214 2485
2215 { 2486 {
2216 struct ev_loop *loop = w->other; 2487 struct ev_loop *loop = w->other;
2217 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2488 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2218 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_WRITE); 2489 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2219 } 2490 }
2220 2491
2221 ev_set_priority (&w->io, ev_priority (w)); 2492 ev_set_priority (&w->io, ev_priority (w));
2222 ev_io_start (EV_A_ &w->io); 2493 ev_io_start (EV_A_ &w->io);
2223 2494
2224 ev_prepare_init (&w->prepare, embed_prepare_cb); 2495 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI); 2496 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare); 2497 ev_prepare_start (EV_A_ &w->prepare);
2498
2499 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2227 2500
2228 ev_start (EV_A_ (W)w, 1); 2501 ev_start (EV_A_ (W)w, 1);
2229} 2502}
2230 2503
2231void 2504void
2269 2542
2270 ev_stop (EV_A_ (W)w); 2543 ev_stop (EV_A_ (W)w);
2271} 2544}
2272#endif 2545#endif
2273 2546
2547#if EV_ASYNC_ENABLE
2548void
2549ev_async_start (EV_P_ ev_async *w)
2550{
2551 if (expect_false (ev_is_active (w)))
2552 return;
2553
2554 evpipe_init (EV_A);
2555
2556 ev_start (EV_A_ (W)w, ++asynccnt);
2557 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2558 asyncs [asynccnt - 1] = w;
2559}
2560
2561void
2562ev_async_stop (EV_P_ ev_async *w)
2563{
2564 clear_pending (EV_A_ (W)w);
2565 if (expect_false (!ev_is_active (w)))
2566 return;
2567
2568 {
2569 int active = ((W)w)->active;
2570 asyncs [active - 1] = asyncs [--asynccnt];
2571 ((W)asyncs [active - 1])->active = active;
2572 }
2573
2574 ev_stop (EV_A_ (W)w);
2575}
2576
2577void
2578ev_async_send (EV_P_ ev_async *w)
2579{
2580 w->sent = 1;
2581 evpipe_write (EV_A_ &gotasync);
2582}
2583#endif
2584
2274/*****************************************************************************/ 2585/*****************************************************************************/
2275 2586
2276struct ev_once 2587struct ev_once
2277{ 2588{
2278 ev_io io; 2589 ev_io io;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines