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

Comparing libev/ev.c (file contents):
Revision 1.192 by root, Fri Dec 21 07:55:29 2007 UTC vs.
Revision 1.224 by root, Wed Apr 9 22:07:50 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#if EV_USE_MONOTONIC
331/* sig_atomic_t is used to avoid per-thread variables or locking but still */
332/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif
268 335
269#ifdef _WIN32 336#ifdef _WIN32
270# include "ev_win32.c" 337# include "ev_win32.c"
271#endif 338#endif
272 339
… …
293 perror (msg); 360 perror (msg);
294 abort (); 361 abort ();
295 } 362 }
296} 363}
297 364
365static void *
366ev_realloc_emul (void *ptr, long size)
367{
368 /* some systems, notably openbsd and darwin, fail to properly
369 * implement realloc (x, 0) (as required by both ansi c-98 and
370 * the single unix specification, so work around them here.
371 */
372
373 if (size)
374 return realloc (ptr, size);
375
376 free (ptr);
377 return 0;
378}
379
298static void *(*alloc)(void *ptr, long size); 380static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
299 381
300void 382void
301ev_set_allocator (void *(*cb)(void *ptr, long size)) 383ev_set_allocator (void *(*cb)(void *ptr, long size))
302{ 384{
303 alloc = cb; 385 alloc = cb;
304} 386}
305 387
306inline_speed void * 388inline_speed void *
307ev_realloc (void *ptr, long size) 389ev_realloc (void *ptr, long size)
308{ 390{
309 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 391 ptr = alloc (ptr, size);
310 392
311 if (!ptr && size) 393 if (!ptr && size)
312 { 394 {
313 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 395 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
314 abort (); 396 abort ();
… …
408{ 490{
409 return ev_rt_now; 491 return ev_rt_now;
410} 492}
411#endif 493#endif
412 494
495void
496ev_sleep (ev_tstamp delay)
497{
498 if (delay > 0.)
499 {
500#if EV_USE_NANOSLEEP
501 struct timespec ts;
502
503 ts.tv_sec = (time_t)delay;
504 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
505
506 nanosleep (&ts, 0);
507#elif defined(_WIN32)
508 Sleep ((unsigned long)(delay * 1e3));
509#else
510 struct timeval tv;
511
512 tv.tv_sec = (time_t)delay;
513 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
514
515 select (0, 0, 0, 0, &tv);
516#endif
517 }
518}
519
520/*****************************************************************************/
521
413int inline_size 522int inline_size
414array_nextsize (int elem, int cur, int cnt) 523array_nextsize (int elem, int cur, int cnt)
415{ 524{
416 int ncur = cur + 1; 525 int ncur = cur + 1;
417 526
… …
543 652
544#if EV_SELECT_IS_WINSOCKET 653#if EV_SELECT_IS_WINSOCKET
545 if (events) 654 if (events)
546 { 655 {
547 unsigned long argp; 656 unsigned long argp;
657 #ifdef EV_FD_TO_WIN32_HANDLE
658 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
659 #else
548 anfd->handle = _get_osfhandle (fd); 660 anfd->handle = _get_osfhandle (fd);
661 #endif
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 662 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
550 } 663 }
551#endif 664#endif
552 665
553 { 666 {
… …
702/*****************************************************************************/ 815/*****************************************************************************/
703 816
704typedef struct 817typedef struct
705{ 818{
706 WL head; 819 WL head;
707 sig_atomic_t volatile gotsig; 820 EV_ATOMIC_T gotsig;
708} ANSIG; 821} ANSIG;
709 822
710static ANSIG *signals; 823static ANSIG *signals;
711static int signalmax; 824static int signalmax;
712 825
713static int sigpipe [2]; 826static EV_ATOMIC_T gotsig;
714static sig_atomic_t volatile gotsig;
715static ev_io sigev;
716 827
717void inline_size 828void inline_size
718signals_init (ANSIG *base, int count) 829signals_init (ANSIG *base, int count)
719{ 830{
720 while (count--) 831 while (count--)
… …
724 835
725 ++base; 836 ++base;
726 } 837 }
727} 838}
728 839
729static void 840/*****************************************************************************/
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 841
780void inline_speed 842void inline_speed
781fd_intern (int fd) 843fd_intern (int fd)
782{ 844{
783#ifdef _WIN32 845#ifdef _WIN32
… …
788 fcntl (fd, F_SETFL, O_NONBLOCK); 850 fcntl (fd, F_SETFL, O_NONBLOCK);
789#endif 851#endif
790} 852}
791 853
792static void noinline 854static void noinline
793siginit (EV_P) 855evpipe_init (EV_P)
794{ 856{
857 if (!ev_is_active (&pipeev))
858 {
859#if EV_USE_EVENTFD
860 if ((evfd = eventfd (0, 0)) >= 0)
861 {
862 evpipe [0] = -1;
863 fd_intern (evfd);
864 ev_io_set (&pipeev, evfd, EV_READ);
865 }
866 else
867#endif
868 {
869 while (pipe (evpipe))
870 syserr ("(libev) error creating signal/async pipe");
871
795 fd_intern (sigpipe [0]); 872 fd_intern (evpipe [0]);
796 fd_intern (sigpipe [1]); 873 fd_intern (evpipe [1]);
874 ev_io_set (&pipeev, evpipe [0], EV_READ);
875 }
797 876
798 ev_io_set (&sigev, sigpipe [0], EV_READ);
799 ev_io_start (EV_A_ &sigev); 877 ev_io_start (EV_A_ &pipeev);
800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 878 ev_unref (EV_A); /* watcher should not keep loop alive */
879 }
880}
881
882void inline_size
883evpipe_write (EV_P_ EV_ATOMIC_T *flag)
884{
885 if (!*flag)
886 {
887 int old_errno = errno; /* save errno because write might clobber it */
888
889 *flag = 1;
890
891#if EV_USE_EVENTFD
892 if (evfd >= 0)
893 {
894 uint64_t counter = 1;
895 write (evfd, &counter, sizeof (uint64_t));
896 }
897 else
898#endif
899 write (evpipe [1], &old_errno, 1);
900
901 errno = old_errno;
902 }
903}
904
905static void
906pipecb (EV_P_ ev_io *iow, int revents)
907{
908#if EV_USE_EVENTFD
909 if (evfd >= 0)
910 {
911 uint64_t counter = 1;
912 read (evfd, &counter, sizeof (uint64_t));
913 }
914 else
915#endif
916 {
917 char dummy;
918 read (evpipe [0], &dummy, 1);
919 }
920
921 if (gotsig && ev_is_default_loop (EV_A))
922 {
923 int signum;
924 gotsig = 0;
925
926 for (signum = signalmax; signum--; )
927 if (signals [signum].gotsig)
928 ev_feed_signal_event (EV_A_ signum + 1);
929 }
930
931#if EV_ASYNC_ENABLE
932 if (gotasync)
933 {
934 int i;
935 gotasync = 0;
936
937 for (i = asynccnt; i--; )
938 if (asyncs [i]->sent)
939 {
940 asyncs [i]->sent = 0;
941 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
942 }
943 }
944#endif
801} 945}
802 946
803/*****************************************************************************/ 947/*****************************************************************************/
804 948
949static void
950ev_sighandler (int signum)
951{
952#if EV_MULTIPLICITY
953 struct ev_loop *loop = &default_loop_struct;
954#endif
955
956#if _WIN32
957 signal (signum, ev_sighandler);
958#endif
959
960 signals [signum - 1].gotsig = 1;
961 evpipe_write (EV_A_ &gotsig);
962}
963
964void noinline
965ev_feed_signal_event (EV_P_ int signum)
966{
967 WL w;
968
969#if EV_MULTIPLICITY
970 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
971#endif
972
973 --signum;
974
975 if (signum < 0 || signum >= signalmax)
976 return;
977
978 signals [signum].gotsig = 0;
979
980 for (w = signals [signum].head; w; w = w->next)
981 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
982}
983
984/*****************************************************************************/
985
805static WL childs [EV_PID_HASHSIZE]; 986static WL childs [EV_PID_HASHSIZE];
806 987
807#ifndef _WIN32 988#ifndef _WIN32
808 989
809static ev_signal childev; 990static ev_signal childev;
810 991
992#ifndef WIFCONTINUED
993# define WIFCONTINUED(status) 0
994#endif
995
811void inline_speed 996void inline_speed
812child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 997child_reap (EV_P_ int chain, int pid, int status)
813{ 998{
814 ev_child *w; 999 ev_child *w;
1000 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
815 1001
816 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1002 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1003 {
817 if (w->pid == pid || !w->pid) 1004 if ((w->pid == pid || !w->pid)
1005 && (!traced || (w->flags & 1)))
818 { 1006 {
819 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1007 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; 1008 w->rpid = pid;
821 w->rstatus = status; 1009 w->rstatus = status;
822 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1010 ev_feed_event (EV_A_ (W)w, EV_CHILD);
823 } 1011 }
1012 }
824} 1013}
825 1014
826#ifndef WCONTINUED 1015#ifndef WCONTINUED
827# define WCONTINUED 0 1016# define WCONTINUED 0
828#endif 1017#endif
… …
837 if (!WCONTINUED 1026 if (!WCONTINUED
838 || errno != EINVAL 1027 || errno != EINVAL
839 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1028 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
840 return; 1029 return;
841 1030
842 /* make sure we are called again until all childs have been reaped */ 1031 /* 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 */ 1032 /* 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); 1033 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
845 1034
846 child_reap (EV_A_ sw, pid, pid, status); 1035 child_reap (EV_A_ pid, pid, status);
847 if (EV_PID_HASHSIZE > 1) 1036 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 */ 1037 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
849} 1038}
850 1039
851#endif 1040#endif
852 1041
853/*****************************************************************************/ 1042/*****************************************************************************/
… …
925} 1114}
926 1115
927unsigned int 1116unsigned int
928ev_embeddable_backends (void) 1117ev_embeddable_backends (void)
929{ 1118{
1119 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1120
930 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1121 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
931 return EVBACKEND_KQUEUE 1122 /* please fix it and tell me how to detect the fix */
932 | EVBACKEND_PORT; 1123 flags &= ~EVBACKEND_EPOLL;
1124
1125 return flags;
933} 1126}
934 1127
935unsigned int 1128unsigned int
936ev_backend (EV_P) 1129ev_backend (EV_P)
937{ 1130{
… …
940 1133
941unsigned int 1134unsigned int
942ev_loop_count (EV_P) 1135ev_loop_count (EV_P)
943{ 1136{
944 return loop_count; 1137 return loop_count;
1138}
1139
1140void
1141ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1142{
1143 io_blocktime = interval;
1144}
1145
1146void
1147ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1148{
1149 timeout_blocktime = interval;
945} 1150}
946 1151
947static void noinline 1152static void noinline
948loop_init (EV_P_ unsigned int flags) 1153loop_init (EV_P_ unsigned int flags)
949{ 1154{
… …
955 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1160 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
956 have_monotonic = 1; 1161 have_monotonic = 1;
957 } 1162 }
958#endif 1163#endif
959 1164
960 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1166 mn_now = get_clock ();
962 now_floor = mn_now; 1167 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1168 rtmn_diff = ev_rt_now - mn_now;
1169
1170 io_blocktime = 0.;
1171 timeout_blocktime = 0.;
1172 backend = 0;
1173 backend_fd = -1;
1174 gotasync = 0;
1175#if EV_USE_INOTIFY
1176 fs_fd = -2;
1177#endif
964 1178
965 /* pid check not overridable via env */ 1179 /* pid check not overridable via env */
966#ifndef _WIN32 1180#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1181 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1182 curpid = getpid ();
… …
974 flags = atoi (getenv ("LIBEV_FLAGS")); 1188 flags = atoi (getenv ("LIBEV_FLAGS"));
975 1189
976 if (!(flags & 0x0000ffffUL)) 1190 if (!(flags & 0x0000ffffUL))
977 flags |= ev_recommended_backends (); 1191 flags |= ev_recommended_backends ();
978 1192
979 backend = 0;
980 backend_fd = -1;
981#if EV_USE_INOTIFY
982 fs_fd = -2;
983#endif
984
985#if EV_USE_PORT 1193#if EV_USE_PORT
986 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1194 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
987#endif 1195#endif
988#if EV_USE_KQUEUE 1196#if EV_USE_KQUEUE
989 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1197 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
996#endif 1204#endif
997#if EV_USE_SELECT 1205#if EV_USE_SELECT
998 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1206 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
999#endif 1207#endif
1000 1208
1001 ev_init (&sigev, sigcb); 1209 ev_init (&pipeev, pipecb);
1002 ev_set_priority (&sigev, EV_MAXPRI); 1210 ev_set_priority (&pipeev, EV_MAXPRI);
1003 } 1211 }
1004} 1212}
1005 1213
1006static void noinline 1214static void noinline
1007loop_destroy (EV_P) 1215loop_destroy (EV_P)
1008{ 1216{
1009 int i; 1217 int i;
1218
1219 if (ev_is_active (&pipeev))
1220 {
1221 ev_ref (EV_A); /* signal watcher */
1222 ev_io_stop (EV_A_ &pipeev);
1223
1224#if EV_USE_EVENTFD
1225 if (evfd >= 0)
1226 close (evfd);
1227#endif
1228
1229 if (evpipe [0] >= 0)
1230 {
1231 close (evpipe [0]);
1232 close (evpipe [1]);
1233 }
1234 }
1010 1235
1011#if EV_USE_INOTIFY 1236#if EV_USE_INOTIFY
1012 if (fs_fd >= 0) 1237 if (fs_fd >= 0)
1013 close (fs_fd); 1238 close (fs_fd);
1014#endif 1239#endif
… …
1051#if EV_FORK_ENABLE 1276#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY); 1277 array_free (fork, EMPTY);
1053#endif 1278#endif
1054 array_free (prepare, EMPTY); 1279 array_free (prepare, EMPTY);
1055 array_free (check, EMPTY); 1280 array_free (check, EMPTY);
1281#if EV_ASYNC_ENABLE
1282 array_free (async, EMPTY);
1283#endif
1056 1284
1057 backend = 0; 1285 backend = 0;
1058} 1286}
1059 1287
1060void inline_size infy_fork (EV_P); 1288void inline_size infy_fork (EV_P);
… …
1073#endif 1301#endif
1074#if EV_USE_INOTIFY 1302#if EV_USE_INOTIFY
1075 infy_fork (EV_A); 1303 infy_fork (EV_A);
1076#endif 1304#endif
1077 1305
1078 if (ev_is_active (&sigev)) 1306 if (ev_is_active (&pipeev))
1079 { 1307 {
1080 /* default loop */ 1308 /* this "locks" the handlers against writing to the pipe */
1309 /* while we modify the fd vars */
1310 gotsig = 1;
1311#if EV_ASYNC_ENABLE
1312 gotasync = 1;
1313#endif
1081 1314
1082 ev_ref (EV_A); 1315 ev_ref (EV_A);
1083 ev_io_stop (EV_A_ &sigev); 1316 ev_io_stop (EV_A_ &pipeev);
1317
1318#if EV_USE_EVENTFD
1319 if (evfd >= 0)
1320 close (evfd);
1321#endif
1322
1323 if (evpipe [0] >= 0)
1324 {
1084 close (sigpipe [0]); 1325 close (evpipe [0]);
1085 close (sigpipe [1]); 1326 close (evpipe [1]);
1327 }
1086 1328
1087 while (pipe (sigpipe))
1088 syserr ("(libev) error creating pipe");
1089
1090 siginit (EV_A); 1329 evpipe_init (EV_A);
1330 /* now iterate over everything, in case we missed something */
1331 pipecb (EV_A_ &pipeev, EV_READ);
1091 } 1332 }
1092 1333
1093 postfork = 0; 1334 postfork = 0;
1094} 1335}
1095 1336
… …
1117} 1358}
1118 1359
1119void 1360void
1120ev_loop_fork (EV_P) 1361ev_loop_fork (EV_P)
1121{ 1362{
1122 postfork = 1; 1363 postfork = 1; /* must be in line with ev_default_fork */
1123} 1364}
1124 1365
1125#endif 1366#endif
1126 1367
1127#if EV_MULTIPLICITY 1368#if EV_MULTIPLICITY
… …
1130#else 1371#else
1131int 1372int
1132ev_default_loop (unsigned int flags) 1373ev_default_loop (unsigned int flags)
1133#endif 1374#endif
1134{ 1375{
1135 if (sigpipe [0] == sigpipe [1])
1136 if (pipe (sigpipe))
1137 return 0;
1138
1139 if (!ev_default_loop_ptr) 1376 if (!ev_default_loop_ptr)
1140 { 1377 {
1141#if EV_MULTIPLICITY 1378#if EV_MULTIPLICITY
1142 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1379 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1143#else 1380#else
… …
1146 1383
1147 loop_init (EV_A_ flags); 1384 loop_init (EV_A_ flags);
1148 1385
1149 if (ev_backend (EV_A)) 1386 if (ev_backend (EV_A))
1150 { 1387 {
1151 siginit (EV_A);
1152
1153#ifndef _WIN32 1388#ifndef _WIN32
1154 ev_signal_init (&childev, childcb, SIGCHLD); 1389 ev_signal_init (&childev, childcb, SIGCHLD);
1155 ev_set_priority (&childev, EV_MAXPRI); 1390 ev_set_priority (&childev, EV_MAXPRI);
1156 ev_signal_start (EV_A_ &childev); 1391 ev_signal_start (EV_A_ &childev);
1157 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1392 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1174#ifndef _WIN32 1409#ifndef _WIN32
1175 ev_ref (EV_A); /* child watcher */ 1410 ev_ref (EV_A); /* child watcher */
1176 ev_signal_stop (EV_A_ &childev); 1411 ev_signal_stop (EV_A_ &childev);
1177#endif 1412#endif
1178 1413
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); 1414 loop_destroy (EV_A);
1186} 1415}
1187 1416
1188void 1417void
1189ev_default_fork (void) 1418ev_default_fork (void)
… …
1191#if EV_MULTIPLICITY 1420#if EV_MULTIPLICITY
1192 struct ev_loop *loop = ev_default_loop_ptr; 1421 struct ev_loop *loop = ev_default_loop_ptr;
1193#endif 1422#endif
1194 1423
1195 if (backend) 1424 if (backend)
1196 postfork = 1; 1425 postfork = 1; /* must be in line with ev_loop_fork */
1197} 1426}
1198 1427
1199/*****************************************************************************/ 1428/*****************************************************************************/
1200 1429
1201void 1430void
… …
1410static int loop_done; 1639static int loop_done;
1411 1640
1412void 1641void
1413ev_loop (EV_P_ int flags) 1642ev_loop (EV_P_ int flags)
1414{ 1643{
1415 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1644 loop_done = EVUNLOOP_CANCEL;
1416 ? EVUNLOOP_ONE
1417 : EVUNLOOP_CANCEL;
1418 1645
1419 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1646 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1420 1647
1421 do 1648 do
1422 { 1649 {
… …
1456 /* update fd-related kernel structures */ 1683 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1684 fd_reify (EV_A);
1458 1685
1459 /* calculate blocking time */ 1686 /* calculate blocking time */
1460 { 1687 {
1461 ev_tstamp block; 1688 ev_tstamp waittime = 0.;
1689 ev_tstamp sleeptime = 0.;
1462 1690
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1691 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1692 {
1467 /* update time to cancel out callback processing overhead */ 1693 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1694 time_update (EV_A_ 1e100);
1469 1695
1470 block = MAX_BLOCKTIME; 1696 waittime = MAX_BLOCKTIME;
1471 1697
1472 if (timercnt) 1698 if (timercnt)
1473 { 1699 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1700 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1475 if (block > to) block = to; 1701 if (waittime > to) waittime = to;
1476 } 1702 }
1477 1703
1478#if EV_PERIODIC_ENABLE 1704#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1705 if (periodiccnt)
1480 { 1706 {
1481 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1707 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1482 if (block > to) block = to; 1708 if (waittime > to) waittime = to;
1483 } 1709 }
1484#endif 1710#endif
1485 1711
1486 if (expect_false (block < 0.)) block = 0.; 1712 if (expect_false (waittime < timeout_blocktime))
1713 waittime = timeout_blocktime;
1714
1715 sleeptime = waittime - backend_fudge;
1716
1717 if (expect_true (sleeptime > io_blocktime))
1718 sleeptime = io_blocktime;
1719
1720 if (sleeptime)
1721 {
1722 ev_sleep (sleeptime);
1723 waittime -= sleeptime;
1724 }
1487 } 1725 }
1488 1726
1489 ++loop_count; 1727 ++loop_count;
1490 backend_poll (EV_A_ block); 1728 backend_poll (EV_A_ waittime);
1491 1729
1492 /* update ev_rt_now, do magic */ 1730 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1731 time_update (EV_A_ waittime + sleeptime);
1494 } 1732 }
1495 1733
1496 /* queue pending timers and reschedule them */ 1734 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1735 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1736#if EV_PERIODIC_ENABLE
… …
1507 /* queue check watchers, to be executed first */ 1745 /* queue check watchers, to be executed first */
1508 if (expect_false (checkcnt)) 1746 if (expect_false (checkcnt))
1509 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1747 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1510 1748
1511 call_pending (EV_A); 1749 call_pending (EV_A);
1512
1513 } 1750 }
1514 while (expect_true (activecnt && !loop_done)); 1751 while (expect_true (
1752 activecnt
1753 && !loop_done
1754 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1755 ));
1515 1756
1516 if (loop_done == EVUNLOOP_ONE) 1757 if (loop_done == EVUNLOOP_ONE)
1517 loop_done = EVUNLOOP_CANCEL; 1758 loop_done = EVUNLOOP_CANCEL;
1518} 1759}
1519 1760
… …
1765 if (expect_false (ev_is_active (w))) 2006 if (expect_false (ev_is_active (w)))
1766 return; 2007 return;
1767 2008
1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2009 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1769 2010
2011 evpipe_init (EV_A);
2012
1770 { 2013 {
1771#ifndef _WIN32 2014#ifndef _WIN32
1772 sigset_t full, prev; 2015 sigset_t full, prev;
1773 sigfillset (&full); 2016 sigfillset (&full);
1774 sigprocmask (SIG_SETMASK, &full, &prev); 2017 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1785 wlist_add (&signals [w->signum - 1].head, (WL)w); 2028 wlist_add (&signals [w->signum - 1].head, (WL)w);
1786 2029
1787 if (!((WL)w)->next) 2030 if (!((WL)w)->next)
1788 { 2031 {
1789#if _WIN32 2032#if _WIN32
1790 signal (w->signum, sighandler); 2033 signal (w->signum, ev_sighandler);
1791#else 2034#else
1792 struct sigaction sa; 2035 struct sigaction sa;
1793 sa.sa_handler = sighandler; 2036 sa.sa_handler = ev_sighandler;
1794 sigfillset (&sa.sa_mask); 2037 sigfillset (&sa.sa_mask);
1795 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2038 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1796 sigaction (w->signum, &sa, 0); 2039 sigaction (w->signum, &sa, 0);
1797#endif 2040#endif
1798 } 2041 }
… …
2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2436 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2194 2437
2195 if (ev_cb (w)) 2438 if (ev_cb (w))
2196 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2439 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2197 else 2440 else
2198 ev_embed_sweep (loop, w); 2441 ev_loop (w->other, EVLOOP_NONBLOCK);
2199} 2442}
2200 2443
2201static void 2444static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2445embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{ 2446{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2447 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205 2448
2206 fd_reify (w->other); 2449 {
2450 struct ev_loop *loop = w->other;
2451
2452 while (fdchangecnt)
2453 {
2454 fd_reify (EV_A);
2455 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2456 }
2457 }
2207} 2458}
2459
2460#if 0
2461static void
2462embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2463{
2464 ev_idle_stop (EV_A_ idle);
2465}
2466#endif
2208 2467
2209void 2468void
2210ev_embed_start (EV_P_ ev_embed *w) 2469ev_embed_start (EV_P_ ev_embed *w)
2211{ 2470{
2212 if (expect_false (ev_is_active (w))) 2471 if (expect_false (ev_is_active (w)))
… …
2223 2482
2224 ev_prepare_init (&w->prepare, embed_prepare_cb); 2483 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI); 2484 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare); 2485 ev_prepare_start (EV_A_ &w->prepare);
2227 2486
2487 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2488
2228 ev_start (EV_A_ (W)w, 1); 2489 ev_start (EV_A_ (W)w, 1);
2229} 2490}
2230 2491
2231void 2492void
2232ev_embed_stop (EV_P_ ev_embed *w) 2493ev_embed_stop (EV_P_ ev_embed *w)
… …
2269 2530
2270 ev_stop (EV_A_ (W)w); 2531 ev_stop (EV_A_ (W)w);
2271} 2532}
2272#endif 2533#endif
2273 2534
2535#if EV_ASYNC_ENABLE
2536void
2537ev_async_start (EV_P_ ev_async *w)
2538{
2539 if (expect_false (ev_is_active (w)))
2540 return;
2541
2542 evpipe_init (EV_A);
2543
2544 ev_start (EV_A_ (W)w, ++asynccnt);
2545 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2546 asyncs [asynccnt - 1] = w;
2547}
2548
2549void
2550ev_async_stop (EV_P_ ev_async *w)
2551{
2552 clear_pending (EV_A_ (W)w);
2553 if (expect_false (!ev_is_active (w)))
2554 return;
2555
2556 {
2557 int active = ((W)w)->active;
2558 asyncs [active - 1] = asyncs [--asynccnt];
2559 ((W)asyncs [active - 1])->active = active;
2560 }
2561
2562 ev_stop (EV_A_ (W)w);
2563}
2564
2565void
2566ev_async_send (EV_P_ ev_async *w)
2567{
2568 w->sent = 1;
2569 evpipe_write (EV_A_ &gotasync);
2570}
2571#endif
2572
2274/*****************************************************************************/ 2573/*****************************************************************************/
2275 2574
2276struct ev_once 2575struct ev_once
2277{ 2576{
2278 ev_io io; 2577 ev_io io;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines