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

Comparing libev/ev.c (file contents):
Revision 1.189 by root, Thu Dec 20 10:12:22 2007 UTC vs.
Revision 1.233 by root, Tue May 6 23:34:16 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
51# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 61# define EV_USE_MONOTONIC 0
53# endif 62# endif
54# ifndef EV_USE_REALTIME 63# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 64# define EV_USE_REALTIME 0
65# endif
66# endif
67
68# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1
71# else
72# define EV_USE_NANOSLEEP 0
56# endif 73# endif
57# endif 74# endif
58 75
59# ifndef EV_USE_SELECT 76# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 77# if HAVE_SELECT && HAVE_SYS_SELECT_H
102# else 119# else
103# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
104# endif 121# endif
105# endif 122# endif
106 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
107#endif 132#endif
108 133
109#include <math.h> 134#include <math.h>
110#include <stdlib.h> 135#include <stdlib.h>
111#include <fcntl.h> 136#include <fcntl.h>
136# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
138# endif 163# endif
139#endif 164#endif
140 165
141/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
142 167
143#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
144# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
145#endif 170#endif
146 171
147#ifndef EV_USE_REALTIME 172#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 173# define EV_USE_REALTIME 0
174#endif
175
176#ifndef EV_USE_NANOSLEEP
177# define EV_USE_NANOSLEEP 0
149#endif 178#endif
150 179
151#ifndef EV_USE_SELECT 180#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 181# define EV_USE_SELECT 1
153#endif 182#endif
159# define EV_USE_POLL 1 188# define EV_USE_POLL 1
160# endif 189# endif
161#endif 190#endif
162 191
163#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
164# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
165#endif 198#endif
166 199
167#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
169#endif 202#endif
171#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
172# define EV_USE_PORT 0 205# define EV_USE_PORT 0
173#endif 206#endif
174 207
175#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
176# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
177#endif 214#endif
178 215
179#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL 217# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
190# else 227# else
191# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
192# endif 229# endif
193#endif 230#endif
194 231
195/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 241
197#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
200#endif 245#endif
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
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
413int inline_size 527int inline_size
414array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
415{ 529{
416 int ncur = cur + 1; 530 int ncur = cur + 1;
417 531
418 do 532 do
419 ncur <<= 1; 533 ncur <<= 1;
420 while (cnt > ncur); 534 while (cnt > ncur);
421 535
422 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
423 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
424 { 538 {
425 ncur *= elem; 539 ncur *= elem;
426 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
427 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
428 ncur /= elem; 542 ncur /= elem;
429 } 543 }
430 544
431 return ncur; 545 return ncur;
543 657
544#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
545 if (events) 659 if (events)
546 { 660 {
547 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
548 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
550 } 668 }
551#endif 669#endif
552 670
553 { 671 {
641 } 759 }
642} 760}
643 761
644/*****************************************************************************/ 762/*****************************************************************************/
645 763
764/* towards the root */
646void inline_speed 765void inline_speed
647upheap (WT *heap, int k) 766upheap (WT *heap, int k)
648{ 767{
649 WT w = heap [k]; 768 WT w = heap [k];
650 769
651 while (k) 770 for (;;)
652 { 771 {
653 int p = (k - 1) >> 1; 772 int p = k >> 1;
654 773
774 /* maybe we could use a dummy element at heap [0]? */
655 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
656 break; 776 break;
657 777
658 heap [k] = heap [p]; 778 heap [k] = heap [p];
659 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
660 k = p; 780 k = p;
661 } 781 }
662 782
663 heap [k] = w; 783 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
665} 785}
666 786
787/* away from the root */
667void inline_speed 788void inline_speed
668downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
669{ 790{
670 WT w = heap [k]; 791 WT w = heap [k];
671 792
672 for (;;) 793 for (;;)
673 { 794 {
674 int c = (k << 1) + 1; 795 int c = k << 1;
675 796
676 if (c >= N) 797 if (c > N)
677 break; 798 break;
678 799
679 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
680 ? 1 : 0; 801 ? 1 : 0;
681 802
682 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
683 break; 804 break;
684 805
685 heap [k] = heap [c]; 806 heap [k] = heap [c];
686 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
687 808
688 k = c; 809 k = c;
689 } 810 }
690 811
691 heap [k] = w; 812 heap [k] = w;
692 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
693} 814}
694 815
695void inline_size 816void inline_size
696adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
697{ 818{
702/*****************************************************************************/ 823/*****************************************************************************/
703 824
704typedef struct 825typedef struct
705{ 826{
706 WL head; 827 WL head;
707 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
708} ANSIG; 829} ANSIG;
709 830
710static ANSIG *signals; 831static ANSIG *signals;
711static int signalmax; 832static int signalmax;
712 833
713static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
714static sig_atomic_t volatile gotsig;
715static ev_io sigev;
716 835
717void inline_size 836void inline_size
718signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
719{ 838{
720 while (count--) 839 while (count--)
724 843
725 ++base; 844 ++base;
726 } 845 }
727} 846}
728 847
729static void 848/*****************************************************************************/
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 849
780void inline_speed 850void inline_speed
781fd_intern (int fd) 851fd_intern (int fd)
782{ 852{
783#ifdef _WIN32 853#ifdef _WIN32
788 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
789#endif 859#endif
790} 860}
791 861
792static void noinline 862static void noinline
793siginit (EV_P) 863evpipe_init (EV_P)
794{ 864{
865 if (!ev_is_active (&pipeev))
866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
877 while (pipe (evpipe))
878 syserr ("(libev) error creating signal/async pipe");
879
795 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
796 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
797 884
798 ev_io_set (&sigev, sigpipe [0], EV_READ);
799 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
887 }
888}
889
890void inline_size
891evpipe_write (EV_P_ EV_ATOMIC_T *flag)
892{
893 if (!*flag)
894 {
895 int old_errno = errno; /* save errno because write might clobber it */
896
897 *flag = 1;
898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
907 write (evpipe [1], &old_errno, 1);
908
909 errno = old_errno;
910 }
911}
912
913static void
914pipecb (EV_P_ ev_io *iow, int revents)
915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
918 {
919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
926 read (evpipe [0], &dummy, 1);
927 }
928
929 if (gotsig && ev_is_default_loop (EV_A))
930 {
931 int signum;
932 gotsig = 0;
933
934 for (signum = signalmax; signum--; )
935 if (signals [signum].gotsig)
936 ev_feed_signal_event (EV_A_ signum + 1);
937 }
938
939#if EV_ASYNC_ENABLE
940 if (gotasync)
941 {
942 int i;
943 gotasync = 0;
944
945 for (i = asynccnt; i--; )
946 if (asyncs [i]->sent)
947 {
948 asyncs [i]->sent = 0;
949 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
950 }
951 }
952#endif
801} 953}
802 954
803/*****************************************************************************/ 955/*****************************************************************************/
804 956
957static void
958ev_sighandler (int signum)
959{
960#if EV_MULTIPLICITY
961 struct ev_loop *loop = &default_loop_struct;
962#endif
963
964#if _WIN32
965 signal (signum, ev_sighandler);
966#endif
967
968 signals [signum - 1].gotsig = 1;
969 evpipe_write (EV_A_ &gotsig);
970}
971
972void noinline
973ev_feed_signal_event (EV_P_ int signum)
974{
975 WL w;
976
977#if EV_MULTIPLICITY
978 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
979#endif
980
981 --signum;
982
983 if (signum < 0 || signum >= signalmax)
984 return;
985
986 signals [signum].gotsig = 0;
987
988 for (w = signals [signum].head; w; w = w->next)
989 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
990}
991
992/*****************************************************************************/
993
805static WL childs [EV_PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
806 995
807#ifndef _WIN32 996#ifndef _WIN32
808 997
809static ev_signal childev; 998static ev_signal childev;
810 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
811void inline_speed 1004void inline_speed
812child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
813{ 1006{
814 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
815 1009
816 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1010 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1011 {
817 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
818 { 1014 {
819 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1015 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
820 w->rpid = pid; 1016 w->rpid = pid;
821 w->rstatus = status; 1017 w->rstatus = status;
822 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
823 } 1019 }
1020 }
824} 1021}
825 1022
826#ifndef WCONTINUED 1023#ifndef WCONTINUED
827# define WCONTINUED 0 1024# define WCONTINUED 0
828#endif 1025#endif
837 if (!WCONTINUED 1034 if (!WCONTINUED
838 || errno != EINVAL 1035 || errno != EINVAL
839 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
840 return; 1037 return;
841 1038
842 /* make sure we are called again until all childs have been reaped */ 1039 /* make sure we are called again until all children have been reaped */
843 /* we need to do it this way so that the callback gets called before we continue */ 1040 /* we need to do it this way so that the callback gets called before we continue */
844 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
845 1042
846 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
847 if (EV_PID_HASHSIZE > 1) 1044 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 */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
849} 1046}
850 1047
851#endif 1048#endif
852 1049
853/*****************************************************************************/ 1050/*****************************************************************************/
925} 1122}
926 1123
927unsigned int 1124unsigned int
928ev_embeddable_backends (void) 1125ev_embeddable_backends (void)
929{ 1126{
930 return EVBACKEND_EPOLL 1127 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
931 | EVBACKEND_KQUEUE 1128
932 | EVBACKEND_PORT; 1129 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1130 /* please fix it and tell me how to detect the fix */
1131 flags &= ~EVBACKEND_EPOLL;
1132
1133 return flags;
933} 1134}
934 1135
935unsigned int 1136unsigned int
936ev_backend (EV_P) 1137ev_backend (EV_P)
937{ 1138{
940 1141
941unsigned int 1142unsigned int
942ev_loop_count (EV_P) 1143ev_loop_count (EV_P)
943{ 1144{
944 return loop_count; 1145 return loop_count;
1146}
1147
1148void
1149ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1150{
1151 io_blocktime = interval;
1152}
1153
1154void
1155ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1156{
1157 timeout_blocktime = interval;
945} 1158}
946 1159
947static void noinline 1160static void noinline
948loop_init (EV_P_ unsigned int flags) 1161loop_init (EV_P_ unsigned int flags)
949{ 1162{
955 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
956 have_monotonic = 1; 1169 have_monotonic = 1;
957 } 1170 }
958#endif 1171#endif
959 1172
960 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1174 mn_now = get_clock ();
962 now_floor = mn_now; 1175 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1176 rtmn_diff = ev_rt_now - mn_now;
1177
1178 io_blocktime = 0.;
1179 timeout_blocktime = 0.;
1180 backend = 0;
1181 backend_fd = -1;
1182 gotasync = 0;
1183#if EV_USE_INOTIFY
1184 fs_fd = -2;
1185#endif
964 1186
965 /* pid check not overridable via env */ 1187 /* pid check not overridable via env */
966#ifndef _WIN32 1188#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1189 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1190 curpid = getpid ();
971 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
972 && !enable_secure () 1194 && !enable_secure ()
973 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
974 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
975 1197
976 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
977 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
978
979 backend = 0;
980 backend_fd = -1;
981#if EV_USE_INOTIFY
982 fs_fd = -2;
983#endif
984 1200
985#if EV_USE_PORT 1201#if EV_USE_PORT
986 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
987#endif 1203#endif
988#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
996#endif 1212#endif
997#if EV_USE_SELECT 1213#if EV_USE_SELECT
998 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
999#endif 1215#endif
1000 1216
1001 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
1002 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
1003 } 1219 }
1004} 1220}
1005 1221
1006static void noinline 1222static void noinline
1007loop_destroy (EV_P) 1223loop_destroy (EV_P)
1008{ 1224{
1009 int i; 1225 int i;
1226
1227 if (ev_is_active (&pipeev))
1228 {
1229 ev_ref (EV_A); /* signal watcher */
1230 ev_io_stop (EV_A_ &pipeev);
1231
1232#if EV_USE_EVENTFD
1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1242 }
1010 1243
1011#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
1012 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
1013 close (fs_fd); 1246 close (fs_fd);
1014#endif 1247#endif
1051#if EV_FORK_ENABLE 1284#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY); 1285 array_free (fork, EMPTY);
1053#endif 1286#endif
1054 array_free (prepare, EMPTY); 1287 array_free (prepare, EMPTY);
1055 array_free (check, EMPTY); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
1056 1292
1057 backend = 0; 1293 backend = 0;
1058} 1294}
1059 1295
1296#if EV_USE_INOTIFY
1060void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1061 1299
1062void inline_size 1300void inline_size
1063loop_fork (EV_P) 1301loop_fork (EV_P)
1064{ 1302{
1065#if EV_USE_PORT 1303#if EV_USE_PORT
1073#endif 1311#endif
1074#if EV_USE_INOTIFY 1312#if EV_USE_INOTIFY
1075 infy_fork (EV_A); 1313 infy_fork (EV_A);
1076#endif 1314#endif
1077 1315
1078 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
1079 { 1317 {
1080 /* default loop */ 1318 /* this "locks" the handlers against writing to the pipe */
1319 /* while we modify the fd vars */
1320 gotsig = 1;
1321#if EV_ASYNC_ENABLE
1322 gotasync = 1;
1323#endif
1081 1324
1082 ev_ref (EV_A); 1325 ev_ref (EV_A);
1083 ev_io_stop (EV_A_ &sigev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
1084 close (sigpipe [0]); 1335 close (evpipe [0]);
1085 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
1086 1338
1087 while (pipe (sigpipe))
1088 syserr ("(libev) error creating pipe");
1089
1090 siginit (EV_A); 1339 evpipe_init (EV_A);
1340 /* now iterate over everything, in case we missed something */
1341 pipecb (EV_A_ &pipeev, EV_READ);
1091 } 1342 }
1092 1343
1093 postfork = 0; 1344 postfork = 0;
1094} 1345}
1095 1346
1117} 1368}
1118 1369
1119void 1370void
1120ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1121{ 1372{
1122 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
1123} 1374}
1124 1375
1125#endif 1376#endif
1126 1377
1127#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
1130#else 1381#else
1131int 1382int
1132ev_default_loop (unsigned int flags) 1383ev_default_loop (unsigned int flags)
1133#endif 1384#endif
1134{ 1385{
1135 if (sigpipe [0] == sigpipe [1])
1136 if (pipe (sigpipe))
1137 return 0;
1138
1139 if (!ev_default_loop_ptr) 1386 if (!ev_default_loop_ptr)
1140 { 1387 {
1141#if EV_MULTIPLICITY 1388#if EV_MULTIPLICITY
1142 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1389 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1143#else 1390#else
1146 1393
1147 loop_init (EV_A_ flags); 1394 loop_init (EV_A_ flags);
1148 1395
1149 if (ev_backend (EV_A)) 1396 if (ev_backend (EV_A))
1150 { 1397 {
1151 siginit (EV_A);
1152
1153#ifndef _WIN32 1398#ifndef _WIN32
1154 ev_signal_init (&childev, childcb, SIGCHLD); 1399 ev_signal_init (&childev, childcb, SIGCHLD);
1155 ev_set_priority (&childev, EV_MAXPRI); 1400 ev_set_priority (&childev, EV_MAXPRI);
1156 ev_signal_start (EV_A_ &childev); 1401 ev_signal_start (EV_A_ &childev);
1157 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1402 ev_unref (EV_A); /* child watcher should not keep loop alive */
1174#ifndef _WIN32 1419#ifndef _WIN32
1175 ev_ref (EV_A); /* child watcher */ 1420 ev_ref (EV_A); /* child watcher */
1176 ev_signal_stop (EV_A_ &childev); 1421 ev_signal_stop (EV_A_ &childev);
1177#endif 1422#endif
1178 1423
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); 1424 loop_destroy (EV_A);
1186} 1425}
1187 1426
1188void 1427void
1189ev_default_fork (void) 1428ev_default_fork (void)
1191#if EV_MULTIPLICITY 1430#if EV_MULTIPLICITY
1192 struct ev_loop *loop = ev_default_loop_ptr; 1431 struct ev_loop *loop = ev_default_loop_ptr;
1193#endif 1432#endif
1194 1433
1195 if (backend) 1434 if (backend)
1196 postfork = 1; 1435 postfork = 1; /* must be in line with ev_loop_fork */
1197} 1436}
1198 1437
1199/*****************************************************************************/ 1438/*****************************************************************************/
1200 1439
1201void 1440void
1225} 1464}
1226 1465
1227void inline_size 1466void inline_size
1228timers_reify (EV_P) 1467timers_reify (EV_P)
1229{ 1468{
1230 while (timercnt && ((WT)timers [0])->at <= mn_now) 1469 while (timercnt && ev_at (timers [1]) <= mn_now)
1231 { 1470 {
1232 ev_timer *w = (ev_timer *)timers [0]; 1471 ev_timer *w = (ev_timer *)timers [1];
1233 1472
1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1473 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1235 1474
1236 /* first reschedule or stop timer */ 1475 /* first reschedule or stop timer */
1237 if (w->repeat) 1476 if (w->repeat)
1238 { 1477 {
1239 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1478 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1240 1479
1241 ((WT)w)->at += w->repeat; 1480 ev_at (w) += w->repeat;
1242 if (((WT)w)->at < mn_now) 1481 if (ev_at (w) < mn_now)
1243 ((WT)w)->at = mn_now; 1482 ev_at (w) = mn_now;
1244 1483
1245 downheap (timers, timercnt, 0); 1484 downheap (timers, timercnt, 1);
1246 } 1485 }
1247 else 1486 else
1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1487 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1249 1488
1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1489 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1253 1492
1254#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1255void inline_size 1494void inline_size
1256periodics_reify (EV_P) 1495periodics_reify (EV_P)
1257{ 1496{
1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1497 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1259 { 1498 {
1260 ev_periodic *w = (ev_periodic *)periodics [0]; 1499 ev_periodic *w = (ev_periodic *)periodics [1];
1261 1500
1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1501 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1263 1502
1264 /* first reschedule or stop timer */ 1503 /* first reschedule or stop timer */
1265 if (w->reschedule_cb) 1504 if (w->reschedule_cb)
1266 { 1505 {
1267 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1506 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1268 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1507 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1269 downheap (periodics, periodiccnt, 0); 1508 downheap (periodics, periodiccnt, 1);
1270 } 1509 }
1271 else if (w->interval) 1510 else if (w->interval)
1272 { 1511 {
1273 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1512 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1274 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1513 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1275 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1514 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1276 downheap (periodics, periodiccnt, 0); 1515 downheap (periodics, periodiccnt, 1);
1277 } 1516 }
1278 else 1517 else
1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1518 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1280 1519
1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1520 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1286periodics_reschedule (EV_P) 1525periodics_reschedule (EV_P)
1287{ 1526{
1288 int i; 1527 int i;
1289 1528
1290 /* adjust periodics after time jump */ 1529 /* adjust periodics after time jump */
1291 for (i = 0; i < periodiccnt; ++i) 1530 for (i = 1; i <= periodiccnt; ++i)
1292 { 1531 {
1293 ev_periodic *w = (ev_periodic *)periodics [i]; 1532 ev_periodic *w = (ev_periodic *)periodics [i];
1294 1533
1295 if (w->reschedule_cb) 1534 if (w->reschedule_cb)
1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1535 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1297 else if (w->interval) 1536 else if (w->interval)
1298 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1537 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1299 } 1538 }
1300 1539
1301 /* now rebuild the heap */ 1540 /* now rebuild the heap */
1302 for (i = periodiccnt >> 1; i--; ) 1541 for (i = periodiccnt >> 1; i--; )
1303 downheap (periodics, periodiccnt, i); 1542 downheap (periodics, periodiccnt, i);
1385 { 1624 {
1386#if EV_PERIODIC_ENABLE 1625#if EV_PERIODIC_ENABLE
1387 periodics_reschedule (EV_A); 1626 periodics_reschedule (EV_A);
1388#endif 1627#endif
1389 /* adjust timers. this is easy, as the offset is the same for all of them */ 1628 /* adjust timers. this is easy, as the offset is the same for all of them */
1390 for (i = 0; i < timercnt; ++i) 1629 for (i = 1; i <= timercnt; ++i)
1391 ((WT)timers [i])->at += ev_rt_now - mn_now; 1630 ev_at (timers [i]) += ev_rt_now - mn_now;
1392 } 1631 }
1393 1632
1394 mn_now = ev_rt_now; 1633 mn_now = ev_rt_now;
1395 } 1634 }
1396} 1635}
1410static int loop_done; 1649static int loop_done;
1411 1650
1412void 1651void
1413ev_loop (EV_P_ int flags) 1652ev_loop (EV_P_ int flags)
1414{ 1653{
1415 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1654 loop_done = EVUNLOOP_CANCEL;
1416 ? EVUNLOOP_ONE
1417 : EVUNLOOP_CANCEL;
1418 1655
1419 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1656 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1420 1657
1421 do 1658 do
1422 { 1659 {
1456 /* update fd-related kernel structures */ 1693 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1694 fd_reify (EV_A);
1458 1695
1459 /* calculate blocking time */ 1696 /* calculate blocking time */
1460 { 1697 {
1461 ev_tstamp block; 1698 ev_tstamp waittime = 0.;
1699 ev_tstamp sleeptime = 0.;
1462 1700
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1701 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1702 {
1467 /* update time to cancel out callback processing overhead */ 1703 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1704 time_update (EV_A_ 1e100);
1469 1705
1470 block = MAX_BLOCKTIME; 1706 waittime = MAX_BLOCKTIME;
1471 1707
1472 if (timercnt) 1708 if (timercnt)
1473 { 1709 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1710 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1475 if (block > to) block = to; 1711 if (waittime > to) waittime = to;
1476 } 1712 }
1477 1713
1478#if EV_PERIODIC_ENABLE 1714#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1715 if (periodiccnt)
1480 { 1716 {
1481 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1717 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1482 if (block > to) block = to; 1718 if (waittime > to) waittime = to;
1483 } 1719 }
1484#endif 1720#endif
1485 1721
1486 if (expect_false (block < 0.)) block = 0.; 1722 if (expect_false (waittime < timeout_blocktime))
1723 waittime = timeout_blocktime;
1724
1725 sleeptime = waittime - backend_fudge;
1726
1727 if (expect_true (sleeptime > io_blocktime))
1728 sleeptime = io_blocktime;
1729
1730 if (sleeptime)
1731 {
1732 ev_sleep (sleeptime);
1733 waittime -= sleeptime;
1734 }
1487 } 1735 }
1488 1736
1489 ++loop_count; 1737 ++loop_count;
1490 backend_poll (EV_A_ block); 1738 backend_poll (EV_A_ waittime);
1491 1739
1492 /* update ev_rt_now, do magic */ 1740 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1741 time_update (EV_A_ waittime + sleeptime);
1494 } 1742 }
1495 1743
1496 /* queue pending timers and reschedule them */ 1744 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1745 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1746#if EV_PERIODIC_ENABLE
1507 /* queue check watchers, to be executed first */ 1755 /* queue check watchers, to be executed first */
1508 if (expect_false (checkcnt)) 1756 if (expect_false (checkcnt))
1509 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1757 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1510 1758
1511 call_pending (EV_A); 1759 call_pending (EV_A);
1512
1513 } 1760 }
1514 while (expect_true (activecnt && !loop_done)); 1761 while (expect_true (
1762 activecnt
1763 && !loop_done
1764 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1765 ));
1515 1766
1516 if (loop_done == EVUNLOOP_ONE) 1767 if (loop_done == EVUNLOOP_ONE)
1517 loop_done = EVUNLOOP_CANCEL; 1768 loop_done = EVUNLOOP_CANCEL;
1518} 1769}
1519 1770
1637ev_timer_start (EV_P_ ev_timer *w) 1888ev_timer_start (EV_P_ ev_timer *w)
1638{ 1889{
1639 if (expect_false (ev_is_active (w))) 1890 if (expect_false (ev_is_active (w)))
1640 return; 1891 return;
1641 1892
1642 ((WT)w)->at += mn_now; 1893 ev_at (w) += mn_now;
1643 1894
1644 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1895 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1645 1896
1646 ev_start (EV_A_ (W)w, ++timercnt); 1897 ev_start (EV_A_ (W)w, ++timercnt);
1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1898 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1648 timers [timercnt - 1] = (WT)w; 1899 timers [timercnt] = (WT)w;
1649 upheap (timers, timercnt - 1); 1900 upheap (timers, timercnt);
1650 1901
1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1902 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1652} 1903}
1653 1904
1654void noinline 1905void noinline
1655ev_timer_stop (EV_P_ ev_timer *w) 1906ev_timer_stop (EV_P_ ev_timer *w)
1656{ 1907{
1657 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1658 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1659 return; 1910 return;
1660 1911
1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1662
1663 { 1912 {
1664 int active = ((W)w)->active; 1913 int active = ev_active (w);
1665 1914
1915 assert (("internal timer heap corruption", timers [active] == (WT)w));
1916
1666 if (expect_true (--active < --timercnt)) 1917 if (expect_true (active < timercnt))
1667 { 1918 {
1668 timers [active] = timers [timercnt]; 1919 timers [active] = timers [timercnt];
1669 adjustheap (timers, timercnt, active); 1920 adjustheap (timers, timercnt, active);
1670 } 1921 }
1922
1923 --timercnt;
1671 } 1924 }
1672 1925
1673 ((WT)w)->at -= mn_now; 1926 ev_at (w) -= mn_now;
1674 1927
1675 ev_stop (EV_A_ (W)w); 1928 ev_stop (EV_A_ (W)w);
1676} 1929}
1677 1930
1678void noinline 1931void noinline
1680{ 1933{
1681 if (ev_is_active (w)) 1934 if (ev_is_active (w))
1682 { 1935 {
1683 if (w->repeat) 1936 if (w->repeat)
1684 { 1937 {
1685 ((WT)w)->at = mn_now + w->repeat; 1938 ev_at (w) = mn_now + w->repeat;
1686 adjustheap (timers, timercnt, ((W)w)->active - 1); 1939 adjustheap (timers, timercnt, ev_active (w));
1687 } 1940 }
1688 else 1941 else
1689 ev_timer_stop (EV_A_ w); 1942 ev_timer_stop (EV_A_ w);
1690 } 1943 }
1691 else if (w->repeat) 1944 else if (w->repeat)
1692 { 1945 {
1693 w->at = w->repeat; 1946 ev_at (w) = w->repeat;
1694 ev_timer_start (EV_A_ w); 1947 ev_timer_start (EV_A_ w);
1695 } 1948 }
1696} 1949}
1697 1950
1698#if EV_PERIODIC_ENABLE 1951#if EV_PERIODIC_ENABLE
1701{ 1954{
1702 if (expect_false (ev_is_active (w))) 1955 if (expect_false (ev_is_active (w)))
1703 return; 1956 return;
1704 1957
1705 if (w->reschedule_cb) 1958 if (w->reschedule_cb)
1706 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1959 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1707 else if (w->interval) 1960 else if (w->interval)
1708 { 1961 {
1709 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1962 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1710 /* this formula differs from the one in periodic_reify because we do not always round up */ 1963 /* this formula differs from the one in periodic_reify because we do not always round up */
1711 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1964 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1712 } 1965 }
1713 else 1966 else
1714 ((WT)w)->at = w->offset; 1967 ev_at (w) = w->offset;
1715 1968
1716 ev_start (EV_A_ (W)w, ++periodiccnt); 1969 ev_start (EV_A_ (W)w, ++periodiccnt);
1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1970 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1718 periodics [periodiccnt - 1] = (WT)w; 1971 periodics [periodiccnt] = (WT)w;
1719 upheap (periodics, periodiccnt - 1); 1972 upheap (periodics, periodiccnt);
1720 1973
1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1974 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1722} 1975}
1723 1976
1724void noinline 1977void noinline
1725ev_periodic_stop (EV_P_ ev_periodic *w) 1978ev_periodic_stop (EV_P_ ev_periodic *w)
1726{ 1979{
1727 clear_pending (EV_A_ (W)w); 1980 clear_pending (EV_A_ (W)w);
1728 if (expect_false (!ev_is_active (w))) 1981 if (expect_false (!ev_is_active (w)))
1729 return; 1982 return;
1730 1983
1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1732
1733 { 1984 {
1734 int active = ((W)w)->active; 1985 int active = ev_active (w);
1735 1986
1987 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1988
1736 if (expect_true (--active < --periodiccnt)) 1989 if (expect_true (active < periodiccnt))
1737 { 1990 {
1738 periodics [active] = periodics [periodiccnt]; 1991 periodics [active] = periodics [periodiccnt];
1739 adjustheap (periodics, periodiccnt, active); 1992 adjustheap (periodics, periodiccnt, active);
1740 } 1993 }
1994
1995 --periodiccnt;
1741 } 1996 }
1742 1997
1743 ev_stop (EV_A_ (W)w); 1998 ev_stop (EV_A_ (W)w);
1744} 1999}
1745 2000
1764#endif 2019#endif
1765 if (expect_false (ev_is_active (w))) 2020 if (expect_false (ev_is_active (w)))
1766 return; 2021 return;
1767 2022
1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2023 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2024
2025 evpipe_init (EV_A);
1769 2026
1770 { 2027 {
1771#ifndef _WIN32 2028#ifndef _WIN32
1772 sigset_t full, prev; 2029 sigset_t full, prev;
1773 sigfillset (&full); 2030 sigfillset (&full);
1785 wlist_add (&signals [w->signum - 1].head, (WL)w); 2042 wlist_add (&signals [w->signum - 1].head, (WL)w);
1786 2043
1787 if (!((WL)w)->next) 2044 if (!((WL)w)->next)
1788 { 2045 {
1789#if _WIN32 2046#if _WIN32
1790 signal (w->signum, sighandler); 2047 signal (w->signum, ev_sighandler);
1791#else 2048#else
1792 struct sigaction sa; 2049 struct sigaction sa;
1793 sa.sa_handler = sighandler; 2050 sa.sa_handler = ev_sighandler;
1794 sigfillset (&sa.sa_mask); 2051 sigfillset (&sa.sa_mask);
1795 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2052 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1796 sigaction (w->signum, &sa, 0); 2053 sigaction (w->signum, &sa, 0);
1797#endif 2054#endif
1798 } 2055 }
1859 if (w->wd < 0) 2116 if (w->wd < 0)
1860 { 2117 {
1861 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2118 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1862 2119
1863 /* monitor some parent directory for speedup hints */ 2120 /* monitor some parent directory for speedup hints */
2121 /* note that exceeding the hardcoded limit is not a correctness issue, */
2122 /* but an efficiency issue only */
1864 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2123 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1865 { 2124 {
1866 char path [4096]; 2125 char path [4096];
1867 strcpy (path, w->path); 2126 strcpy (path, w->path);
1868 2127
2113 clear_pending (EV_A_ (W)w); 2372 clear_pending (EV_A_ (W)w);
2114 if (expect_false (!ev_is_active (w))) 2373 if (expect_false (!ev_is_active (w)))
2115 return; 2374 return;
2116 2375
2117 { 2376 {
2118 int active = ((W)w)->active; 2377 int active = ev_active (w);
2119 2378
2120 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2379 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2121 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2380 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2122 2381
2123 ev_stop (EV_A_ (W)w); 2382 ev_stop (EV_A_ (W)w);
2124 --idleall; 2383 --idleall;
2125 } 2384 }
2126} 2385}
2143 clear_pending (EV_A_ (W)w); 2402 clear_pending (EV_A_ (W)w);
2144 if (expect_false (!ev_is_active (w))) 2403 if (expect_false (!ev_is_active (w)))
2145 return; 2404 return;
2146 2405
2147 { 2406 {
2148 int active = ((W)w)->active; 2407 int active = ev_active (w);
2408
2149 prepares [active - 1] = prepares [--preparecnt]; 2409 prepares [active - 1] = prepares [--preparecnt];
2150 ((W)prepares [active - 1])->active = active; 2410 ev_active (prepares [active - 1]) = active;
2151 } 2411 }
2152 2412
2153 ev_stop (EV_A_ (W)w); 2413 ev_stop (EV_A_ (W)w);
2154} 2414}
2155 2415
2170 clear_pending (EV_A_ (W)w); 2430 clear_pending (EV_A_ (W)w);
2171 if (expect_false (!ev_is_active (w))) 2431 if (expect_false (!ev_is_active (w)))
2172 return; 2432 return;
2173 2433
2174 { 2434 {
2175 int active = ((W)w)->active; 2435 int active = ev_active (w);
2436
2176 checks [active - 1] = checks [--checkcnt]; 2437 checks [active - 1] = checks [--checkcnt];
2177 ((W)checks [active - 1])->active = active; 2438 ev_active (checks [active - 1]) = active;
2178 } 2439 }
2179 2440
2180 ev_stop (EV_A_ (W)w); 2441 ev_stop (EV_A_ (W)w);
2181} 2442}
2182 2443
2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2454 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2194 2455
2195 if (ev_cb (w)) 2456 if (ev_cb (w))
2196 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2457 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2197 else 2458 else
2198 ev_embed_sweep (loop, w); 2459 ev_loop (w->other, EVLOOP_NONBLOCK);
2199} 2460}
2200 2461
2201static void 2462static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2463embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{ 2464{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2465 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205 2466
2206 fd_reify (w->other); 2467 {
2468 struct ev_loop *loop = w->other;
2469
2470 while (fdchangecnt)
2471 {
2472 fd_reify (EV_A);
2473 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2474 }
2475 }
2207} 2476}
2477
2478#if 0
2479static void
2480embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2481{
2482 ev_idle_stop (EV_A_ idle);
2483}
2484#endif
2208 2485
2209void 2486void
2210ev_embed_start (EV_P_ ev_embed *w) 2487ev_embed_start (EV_P_ ev_embed *w)
2211{ 2488{
2212 if (expect_false (ev_is_active (w))) 2489 if (expect_false (ev_is_active (w)))
2223 2500
2224 ev_prepare_init (&w->prepare, embed_prepare_cb); 2501 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI); 2502 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare); 2503 ev_prepare_start (EV_A_ &w->prepare);
2227 2504
2505 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2506
2228 ev_start (EV_A_ (W)w, 1); 2507 ev_start (EV_A_ (W)w, 1);
2229} 2508}
2230 2509
2231void 2510void
2232ev_embed_stop (EV_P_ ev_embed *w) 2511ev_embed_stop (EV_P_ ev_embed *w)
2260 clear_pending (EV_A_ (W)w); 2539 clear_pending (EV_A_ (W)w);
2261 if (expect_false (!ev_is_active (w))) 2540 if (expect_false (!ev_is_active (w)))
2262 return; 2541 return;
2263 2542
2264 { 2543 {
2265 int active = ((W)w)->active; 2544 int active = ev_active (w);
2545
2266 forks [active - 1] = forks [--forkcnt]; 2546 forks [active - 1] = forks [--forkcnt];
2267 ((W)forks [active - 1])->active = active; 2547 ev_active (forks [active - 1]) = active;
2268 } 2548 }
2269 2549
2270 ev_stop (EV_A_ (W)w); 2550 ev_stop (EV_A_ (W)w);
2551}
2552#endif
2553
2554#if EV_ASYNC_ENABLE
2555void
2556ev_async_start (EV_P_ ev_async *w)
2557{
2558 if (expect_false (ev_is_active (w)))
2559 return;
2560
2561 evpipe_init (EV_A);
2562
2563 ev_start (EV_A_ (W)w, ++asynccnt);
2564 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2565 asyncs [asynccnt - 1] = w;
2566}
2567
2568void
2569ev_async_stop (EV_P_ ev_async *w)
2570{
2571 clear_pending (EV_A_ (W)w);
2572 if (expect_false (!ev_is_active (w)))
2573 return;
2574
2575 {
2576 int active = ev_active (w);
2577
2578 asyncs [active - 1] = asyncs [--asynccnt];
2579 ev_active (asyncs [active - 1]) = active;
2580 }
2581
2582 ev_stop (EV_A_ (W)w);
2583}
2584
2585void
2586ev_async_send (EV_P_ ev_async *w)
2587{
2588 w->sent = 1;
2589 evpipe_write (EV_A_ &gotasync);
2271} 2590}
2272#endif 2591#endif
2273 2592
2274/*****************************************************************************/ 2593/*****************************************************************************/
2275 2594

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines