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.227 by root, Fri May 2 07:20:01 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 {
… …
641 } 754 }
642} 755}
643 756
644/*****************************************************************************/ 757/*****************************************************************************/
645 758
759/* towards the root */
646void inline_speed 760void inline_speed
647upheap (WT *heap, int k) 761upheap (WT *heap, int k)
648{ 762{
649 WT w = heap [k]; 763 WT w = heap [k];
650 764
… …
662 776
663 heap [k] = w; 777 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 778 ((W)heap [k])->active = k + 1;
665} 779}
666 780
781/* away from the root */
667void inline_speed 782void inline_speed
668downheap (WT *heap, int N, int k) 783downheap (WT *heap, int N, int k)
669{ 784{
670 WT w = heap [k]; 785 WT w = heap [k];
671 786
… …
702/*****************************************************************************/ 817/*****************************************************************************/
703 818
704typedef struct 819typedef struct
705{ 820{
706 WL head; 821 WL head;
707 sig_atomic_t volatile gotsig; 822 EV_ATOMIC_T gotsig;
708} ANSIG; 823} ANSIG;
709 824
710static ANSIG *signals; 825static ANSIG *signals;
711static int signalmax; 826static int signalmax;
712 827
713static int sigpipe [2]; 828static EV_ATOMIC_T gotsig;
714static sig_atomic_t volatile gotsig;
715static ev_io sigev;
716 829
717void inline_size 830void inline_size
718signals_init (ANSIG *base, int count) 831signals_init (ANSIG *base, int count)
719{ 832{
720 while (count--) 833 while (count--)
… …
724 837
725 ++base; 838 ++base;
726 } 839 }
727} 840}
728 841
729static void 842/*****************************************************************************/
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 843
780void inline_speed 844void inline_speed
781fd_intern (int fd) 845fd_intern (int fd)
782{ 846{
783#ifdef _WIN32 847#ifdef _WIN32
… …
788 fcntl (fd, F_SETFL, O_NONBLOCK); 852 fcntl (fd, F_SETFL, O_NONBLOCK);
789#endif 853#endif
790} 854}
791 855
792static void noinline 856static void noinline
793siginit (EV_P) 857evpipe_init (EV_P)
794{ 858{
859 if (!ev_is_active (&pipeev))
860 {
861#if EV_USE_EVENTFD
862 if ((evfd = eventfd (0, 0)) >= 0)
863 {
864 evpipe [0] = -1;
865 fd_intern (evfd);
866 ev_io_set (&pipeev, evfd, EV_READ);
867 }
868 else
869#endif
870 {
871 while (pipe (evpipe))
872 syserr ("(libev) error creating signal/async pipe");
873
795 fd_intern (sigpipe [0]); 874 fd_intern (evpipe [0]);
796 fd_intern (sigpipe [1]); 875 fd_intern (evpipe [1]);
876 ev_io_set (&pipeev, evpipe [0], EV_READ);
877 }
797 878
798 ev_io_set (&sigev, sigpipe [0], EV_READ);
799 ev_io_start (EV_A_ &sigev); 879 ev_io_start (EV_A_ &pipeev);
800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 880 ev_unref (EV_A); /* watcher should not keep loop alive */
881 }
882}
883
884void inline_size
885evpipe_write (EV_P_ EV_ATOMIC_T *flag)
886{
887 if (!*flag)
888 {
889 int old_errno = errno; /* save errno because write might clobber it */
890
891 *flag = 1;
892
893#if EV_USE_EVENTFD
894 if (evfd >= 0)
895 {
896 uint64_t counter = 1;
897 write (evfd, &counter, sizeof (uint64_t));
898 }
899 else
900#endif
901 write (evpipe [1], &old_errno, 1);
902
903 errno = old_errno;
904 }
905}
906
907static void
908pipecb (EV_P_ ev_io *iow, int revents)
909{
910#if EV_USE_EVENTFD
911 if (evfd >= 0)
912 {
913 uint64_t counter = 1;
914 read (evfd, &counter, sizeof (uint64_t));
915 }
916 else
917#endif
918 {
919 char dummy;
920 read (evpipe [0], &dummy, 1);
921 }
922
923 if (gotsig && ev_is_default_loop (EV_A))
924 {
925 int signum;
926 gotsig = 0;
927
928 for (signum = signalmax; signum--; )
929 if (signals [signum].gotsig)
930 ev_feed_signal_event (EV_A_ signum + 1);
931 }
932
933#if EV_ASYNC_ENABLE
934 if (gotasync)
935 {
936 int i;
937 gotasync = 0;
938
939 for (i = asynccnt; i--; )
940 if (asyncs [i]->sent)
941 {
942 asyncs [i]->sent = 0;
943 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
944 }
945 }
946#endif
801} 947}
802 948
803/*****************************************************************************/ 949/*****************************************************************************/
804 950
951static void
952ev_sighandler (int signum)
953{
954#if EV_MULTIPLICITY
955 struct ev_loop *loop = &default_loop_struct;
956#endif
957
958#if _WIN32
959 signal (signum, ev_sighandler);
960#endif
961
962 signals [signum - 1].gotsig = 1;
963 evpipe_write (EV_A_ &gotsig);
964}
965
966void noinline
967ev_feed_signal_event (EV_P_ int signum)
968{
969 WL w;
970
971#if EV_MULTIPLICITY
972 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
973#endif
974
975 --signum;
976
977 if (signum < 0 || signum >= signalmax)
978 return;
979
980 signals [signum].gotsig = 0;
981
982 for (w = signals [signum].head; w; w = w->next)
983 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
984}
985
986/*****************************************************************************/
987
805static WL childs [EV_PID_HASHSIZE]; 988static WL childs [EV_PID_HASHSIZE];
806 989
807#ifndef _WIN32 990#ifndef _WIN32
808 991
809static ev_signal childev; 992static ev_signal childev;
810 993
994#ifndef WIFCONTINUED
995# define WIFCONTINUED(status) 0
996#endif
997
811void inline_speed 998void inline_speed
812child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 999child_reap (EV_P_ int chain, int pid, int status)
813{ 1000{
814 ev_child *w; 1001 ev_child *w;
1002 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
815 1003
816 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1004 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1005 {
817 if (w->pid == pid || !w->pid) 1006 if ((w->pid == pid || !w->pid)
1007 && (!traced || (w->flags & 1)))
818 { 1008 {
819 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1009 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; 1010 w->rpid = pid;
821 w->rstatus = status; 1011 w->rstatus = status;
822 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1012 ev_feed_event (EV_A_ (W)w, EV_CHILD);
823 } 1013 }
1014 }
824} 1015}
825 1016
826#ifndef WCONTINUED 1017#ifndef WCONTINUED
827# define WCONTINUED 0 1018# define WCONTINUED 0
828#endif 1019#endif
… …
837 if (!WCONTINUED 1028 if (!WCONTINUED
838 || errno != EINVAL 1029 || errno != EINVAL
839 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1030 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
840 return; 1031 return;
841 1032
842 /* make sure we are called again until all childs have been reaped */ 1033 /* 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 */ 1034 /* 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); 1035 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
845 1036
846 child_reap (EV_A_ sw, pid, pid, status); 1037 child_reap (EV_A_ pid, pid, status);
847 if (EV_PID_HASHSIZE > 1) 1038 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 */ 1039 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
849} 1040}
850 1041
851#endif 1042#endif
852 1043
853/*****************************************************************************/ 1044/*****************************************************************************/
… …
925} 1116}
926 1117
927unsigned int 1118unsigned int
928ev_embeddable_backends (void) 1119ev_embeddable_backends (void)
929{ 1120{
930 return EVBACKEND_EPOLL 1121 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
931 | EVBACKEND_KQUEUE 1122
932 | EVBACKEND_PORT; 1123 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1124 /* please fix it and tell me how to detect the fix */
1125 flags &= ~EVBACKEND_EPOLL;
1126
1127 return flags;
933} 1128}
934 1129
935unsigned int 1130unsigned int
936ev_backend (EV_P) 1131ev_backend (EV_P)
937{ 1132{
… …
940 1135
941unsigned int 1136unsigned int
942ev_loop_count (EV_P) 1137ev_loop_count (EV_P)
943{ 1138{
944 return loop_count; 1139 return loop_count;
1140}
1141
1142void
1143ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1144{
1145 io_blocktime = interval;
1146}
1147
1148void
1149ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1150{
1151 timeout_blocktime = interval;
945} 1152}
946 1153
947static void noinline 1154static void noinline
948loop_init (EV_P_ unsigned int flags) 1155loop_init (EV_P_ unsigned int flags)
949{ 1156{
… …
955 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1162 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
956 have_monotonic = 1; 1163 have_monotonic = 1;
957 } 1164 }
958#endif 1165#endif
959 1166
960 ev_rt_now = ev_time (); 1167 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1168 mn_now = get_clock ();
962 now_floor = mn_now; 1169 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1170 rtmn_diff = ev_rt_now - mn_now;
1171
1172 io_blocktime = 0.;
1173 timeout_blocktime = 0.;
1174 backend = 0;
1175 backend_fd = -1;
1176 gotasync = 0;
1177#if EV_USE_INOTIFY
1178 fs_fd = -2;
1179#endif
964 1180
965 /* pid check not overridable via env */ 1181 /* pid check not overridable via env */
966#ifndef _WIN32 1182#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1183 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1184 curpid = getpid ();
… …
971 if (!(flags & EVFLAG_NOENV) 1187 if (!(flags & EVFLAG_NOENV)
972 && !enable_secure () 1188 && !enable_secure ()
973 && getenv ("LIBEV_FLAGS")) 1189 && getenv ("LIBEV_FLAGS"))
974 flags = atoi (getenv ("LIBEV_FLAGS")); 1190 flags = atoi (getenv ("LIBEV_FLAGS"));
975 1191
976 if (!(flags & 0x0000ffffUL)) 1192 if (!(flags & 0x0000ffffU))
977 flags |= ev_recommended_backends (); 1193 flags |= ev_recommended_backends ();
978
979 backend = 0;
980 backend_fd = -1;
981#if EV_USE_INOTIFY
982 fs_fd = -2;
983#endif
984 1194
985#if EV_USE_PORT 1195#if EV_USE_PORT
986 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1196 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
987#endif 1197#endif
988#if EV_USE_KQUEUE 1198#if EV_USE_KQUEUE
… …
996#endif 1206#endif
997#if EV_USE_SELECT 1207#if EV_USE_SELECT
998 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1208 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
999#endif 1209#endif
1000 1210
1001 ev_init (&sigev, sigcb); 1211 ev_init (&pipeev, pipecb);
1002 ev_set_priority (&sigev, EV_MAXPRI); 1212 ev_set_priority (&pipeev, EV_MAXPRI);
1003 } 1213 }
1004} 1214}
1005 1215
1006static void noinline 1216static void noinline
1007loop_destroy (EV_P) 1217loop_destroy (EV_P)
1008{ 1218{
1009 int i; 1219 int i;
1220
1221 if (ev_is_active (&pipeev))
1222 {
1223 ev_ref (EV_A); /* signal watcher */
1224 ev_io_stop (EV_A_ &pipeev);
1225
1226#if EV_USE_EVENTFD
1227 if (evfd >= 0)
1228 close (evfd);
1229#endif
1230
1231 if (evpipe [0] >= 0)
1232 {
1233 close (evpipe [0]);
1234 close (evpipe [1]);
1235 }
1236 }
1010 1237
1011#if EV_USE_INOTIFY 1238#if EV_USE_INOTIFY
1012 if (fs_fd >= 0) 1239 if (fs_fd >= 0)
1013 close (fs_fd); 1240 close (fs_fd);
1014#endif 1241#endif
… …
1051#if EV_FORK_ENABLE 1278#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY); 1279 array_free (fork, EMPTY);
1053#endif 1280#endif
1054 array_free (prepare, EMPTY); 1281 array_free (prepare, EMPTY);
1055 array_free (check, EMPTY); 1282 array_free (check, EMPTY);
1283#if EV_ASYNC_ENABLE
1284 array_free (async, EMPTY);
1285#endif
1056 1286
1057 backend = 0; 1287 backend = 0;
1058} 1288}
1059 1289
1290#if EV_USE_INOTIFY
1060void inline_size infy_fork (EV_P); 1291void inline_size infy_fork (EV_P);
1292#endif
1061 1293
1062void inline_size 1294void inline_size
1063loop_fork (EV_P) 1295loop_fork (EV_P)
1064{ 1296{
1065#if EV_USE_PORT 1297#if EV_USE_PORT
… …
1073#endif 1305#endif
1074#if EV_USE_INOTIFY 1306#if EV_USE_INOTIFY
1075 infy_fork (EV_A); 1307 infy_fork (EV_A);
1076#endif 1308#endif
1077 1309
1078 if (ev_is_active (&sigev)) 1310 if (ev_is_active (&pipeev))
1079 { 1311 {
1080 /* default loop */ 1312 /* this "locks" the handlers against writing to the pipe */
1313 /* while we modify the fd vars */
1314 gotsig = 1;
1315#if EV_ASYNC_ENABLE
1316 gotasync = 1;
1317#endif
1081 1318
1082 ev_ref (EV_A); 1319 ev_ref (EV_A);
1083 ev_io_stop (EV_A_ &sigev); 1320 ev_io_stop (EV_A_ &pipeev);
1321
1322#if EV_USE_EVENTFD
1323 if (evfd >= 0)
1324 close (evfd);
1325#endif
1326
1327 if (evpipe [0] >= 0)
1328 {
1084 close (sigpipe [0]); 1329 close (evpipe [0]);
1085 close (sigpipe [1]); 1330 close (evpipe [1]);
1331 }
1086 1332
1087 while (pipe (sigpipe))
1088 syserr ("(libev) error creating pipe");
1089
1090 siginit (EV_A); 1333 evpipe_init (EV_A);
1334 /* now iterate over everything, in case we missed something */
1335 pipecb (EV_A_ &pipeev, EV_READ);
1091 } 1336 }
1092 1337
1093 postfork = 0; 1338 postfork = 0;
1094} 1339}
1095 1340
… …
1117} 1362}
1118 1363
1119void 1364void
1120ev_loop_fork (EV_P) 1365ev_loop_fork (EV_P)
1121{ 1366{
1122 postfork = 1; 1367 postfork = 1; /* must be in line with ev_default_fork */
1123} 1368}
1124 1369
1125#endif 1370#endif
1126 1371
1127#if EV_MULTIPLICITY 1372#if EV_MULTIPLICITY
… …
1130#else 1375#else
1131int 1376int
1132ev_default_loop (unsigned int flags) 1377ev_default_loop (unsigned int flags)
1133#endif 1378#endif
1134{ 1379{
1135 if (sigpipe [0] == sigpipe [1])
1136 if (pipe (sigpipe))
1137 return 0;
1138
1139 if (!ev_default_loop_ptr) 1380 if (!ev_default_loop_ptr)
1140 { 1381 {
1141#if EV_MULTIPLICITY 1382#if EV_MULTIPLICITY
1142 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1383 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1143#else 1384#else
… …
1146 1387
1147 loop_init (EV_A_ flags); 1388 loop_init (EV_A_ flags);
1148 1389
1149 if (ev_backend (EV_A)) 1390 if (ev_backend (EV_A))
1150 { 1391 {
1151 siginit (EV_A);
1152
1153#ifndef _WIN32 1392#ifndef _WIN32
1154 ev_signal_init (&childev, childcb, SIGCHLD); 1393 ev_signal_init (&childev, childcb, SIGCHLD);
1155 ev_set_priority (&childev, EV_MAXPRI); 1394 ev_set_priority (&childev, EV_MAXPRI);
1156 ev_signal_start (EV_A_ &childev); 1395 ev_signal_start (EV_A_ &childev);
1157 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1396 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1174#ifndef _WIN32 1413#ifndef _WIN32
1175 ev_ref (EV_A); /* child watcher */ 1414 ev_ref (EV_A); /* child watcher */
1176 ev_signal_stop (EV_A_ &childev); 1415 ev_signal_stop (EV_A_ &childev);
1177#endif 1416#endif
1178 1417
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); 1418 loop_destroy (EV_A);
1186} 1419}
1187 1420
1188void 1421void
1189ev_default_fork (void) 1422ev_default_fork (void)
… …
1191#if EV_MULTIPLICITY 1424#if EV_MULTIPLICITY
1192 struct ev_loop *loop = ev_default_loop_ptr; 1425 struct ev_loop *loop = ev_default_loop_ptr;
1193#endif 1426#endif
1194 1427
1195 if (backend) 1428 if (backend)
1196 postfork = 1; 1429 postfork = 1; /* must be in line with ev_loop_fork */
1197} 1430}
1198 1431
1199/*****************************************************************************/ 1432/*****************************************************************************/
1200 1433
1201void 1434void
… …
1410static int loop_done; 1643static int loop_done;
1411 1644
1412void 1645void
1413ev_loop (EV_P_ int flags) 1646ev_loop (EV_P_ int flags)
1414{ 1647{
1415 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1648 loop_done = EVUNLOOP_CANCEL;
1416 ? EVUNLOOP_ONE
1417 : EVUNLOOP_CANCEL;
1418 1649
1419 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1650 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1420 1651
1421 do 1652 do
1422 { 1653 {
… …
1456 /* update fd-related kernel structures */ 1687 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1688 fd_reify (EV_A);
1458 1689
1459 /* calculate blocking time */ 1690 /* calculate blocking time */
1460 { 1691 {
1461 ev_tstamp block; 1692 ev_tstamp waittime = 0.;
1693 ev_tstamp sleeptime = 0.;
1462 1694
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1695 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1696 {
1467 /* update time to cancel out callback processing overhead */ 1697 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1698 time_update (EV_A_ 1e100);
1469 1699
1470 block = MAX_BLOCKTIME; 1700 waittime = MAX_BLOCKTIME;
1471 1701
1472 if (timercnt) 1702 if (timercnt)
1473 { 1703 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1704 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1475 if (block > to) block = to; 1705 if (waittime > to) waittime = to;
1476 } 1706 }
1477 1707
1478#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1709 if (periodiccnt)
1480 { 1710 {
1481 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1711 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1482 if (block > to) block = to; 1712 if (waittime > to) waittime = to;
1483 } 1713 }
1484#endif 1714#endif
1485 1715
1486 if (expect_false (block < 0.)) block = 0.; 1716 if (expect_false (waittime < timeout_blocktime))
1717 waittime = timeout_blocktime;
1718
1719 sleeptime = waittime - backend_fudge;
1720
1721 if (expect_true (sleeptime > io_blocktime))
1722 sleeptime = io_blocktime;
1723
1724 if (sleeptime)
1725 {
1726 ev_sleep (sleeptime);
1727 waittime -= sleeptime;
1728 }
1487 } 1729 }
1488 1730
1489 ++loop_count; 1731 ++loop_count;
1490 backend_poll (EV_A_ block); 1732 backend_poll (EV_A_ waittime);
1491 1733
1492 /* update ev_rt_now, do magic */ 1734 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1735 time_update (EV_A_ waittime + sleeptime);
1494 } 1736 }
1495 1737
1496 /* queue pending timers and reschedule them */ 1738 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1739 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1740#if EV_PERIODIC_ENABLE
… …
1507 /* queue check watchers, to be executed first */ 1749 /* queue check watchers, to be executed first */
1508 if (expect_false (checkcnt)) 1750 if (expect_false (checkcnt))
1509 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1751 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1510 1752
1511 call_pending (EV_A); 1753 call_pending (EV_A);
1512
1513 } 1754 }
1514 while (expect_true (activecnt && !loop_done)); 1755 while (expect_true (
1756 activecnt
1757 && !loop_done
1758 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1759 ));
1515 1760
1516 if (loop_done == EVUNLOOP_ONE) 1761 if (loop_done == EVUNLOOP_ONE)
1517 loop_done = EVUNLOOP_CANCEL; 1762 loop_done = EVUNLOOP_CANCEL;
1518} 1763}
1519 1764
… …
1765 if (expect_false (ev_is_active (w))) 2010 if (expect_false (ev_is_active (w)))
1766 return; 2011 return;
1767 2012
1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2013 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1769 2014
2015 evpipe_init (EV_A);
2016
1770 { 2017 {
1771#ifndef _WIN32 2018#ifndef _WIN32
1772 sigset_t full, prev; 2019 sigset_t full, prev;
1773 sigfillset (&full); 2020 sigfillset (&full);
1774 sigprocmask (SIG_SETMASK, &full, &prev); 2021 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1785 wlist_add (&signals [w->signum - 1].head, (WL)w); 2032 wlist_add (&signals [w->signum - 1].head, (WL)w);
1786 2033
1787 if (!((WL)w)->next) 2034 if (!((WL)w)->next)
1788 { 2035 {
1789#if _WIN32 2036#if _WIN32
1790 signal (w->signum, sighandler); 2037 signal (w->signum, ev_sighandler);
1791#else 2038#else
1792 struct sigaction sa; 2039 struct sigaction sa;
1793 sa.sa_handler = sighandler; 2040 sa.sa_handler = ev_sighandler;
1794 sigfillset (&sa.sa_mask); 2041 sigfillset (&sa.sa_mask);
1795 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2042 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1796 sigaction (w->signum, &sa, 0); 2043 sigaction (w->signum, &sa, 0);
1797#endif 2044#endif
1798 } 2045 }
… …
2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2440 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2194 2441
2195 if (ev_cb (w)) 2442 if (ev_cb (w))
2196 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2443 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2197 else 2444 else
2198 ev_embed_sweep (loop, w); 2445 ev_loop (w->other, EVLOOP_NONBLOCK);
2199} 2446}
2200 2447
2201static void 2448static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2449embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{ 2450{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2451 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205 2452
2206 fd_reify (w->other); 2453 {
2454 struct ev_loop *loop = w->other;
2455
2456 while (fdchangecnt)
2457 {
2458 fd_reify (EV_A);
2459 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2460 }
2461 }
2207} 2462}
2463
2464#if 0
2465static void
2466embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2467{
2468 ev_idle_stop (EV_A_ idle);
2469}
2470#endif
2208 2471
2209void 2472void
2210ev_embed_start (EV_P_ ev_embed *w) 2473ev_embed_start (EV_P_ ev_embed *w)
2211{ 2474{
2212 if (expect_false (ev_is_active (w))) 2475 if (expect_false (ev_is_active (w)))
2213 return; 2476 return;
2214 2477
2215 { 2478 {
2216 struct ev_loop *loop = w->other; 2479 struct ev_loop *loop = w->other;
2217 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2480 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); 2481 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2219 } 2482 }
2220 2483
2221 ev_set_priority (&w->io, ev_priority (w)); 2484 ev_set_priority (&w->io, ev_priority (w));
2222 ev_io_start (EV_A_ &w->io); 2485 ev_io_start (EV_A_ &w->io);
2223 2486
2224 ev_prepare_init (&w->prepare, embed_prepare_cb); 2487 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI); 2488 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare); 2489 ev_prepare_start (EV_A_ &w->prepare);
2490
2491 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2227 2492
2228 ev_start (EV_A_ (W)w, 1); 2493 ev_start (EV_A_ (W)w, 1);
2229} 2494}
2230 2495
2231void 2496void
… …
2269 2534
2270 ev_stop (EV_A_ (W)w); 2535 ev_stop (EV_A_ (W)w);
2271} 2536}
2272#endif 2537#endif
2273 2538
2539#if EV_ASYNC_ENABLE
2540void
2541ev_async_start (EV_P_ ev_async *w)
2542{
2543 if (expect_false (ev_is_active (w)))
2544 return;
2545
2546 evpipe_init (EV_A);
2547
2548 ev_start (EV_A_ (W)w, ++asynccnt);
2549 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2550 asyncs [asynccnt - 1] = w;
2551}
2552
2553void
2554ev_async_stop (EV_P_ ev_async *w)
2555{
2556 clear_pending (EV_A_ (W)w);
2557 if (expect_false (!ev_is_active (w)))
2558 return;
2559
2560 {
2561 int active = ((W)w)->active;
2562 asyncs [active - 1] = asyncs [--asynccnt];
2563 ((W)asyncs [active - 1])->active = active;
2564 }
2565
2566 ev_stop (EV_A_ (W)w);
2567}
2568
2569void
2570ev_async_send (EV_P_ ev_async *w)
2571{
2572 w->sent = 1;
2573 evpipe_write (EV_A_ &gotasync);
2574}
2575#endif
2576
2274/*****************************************************************************/ 2577/*****************************************************************************/
2275 2578
2276struct ev_once 2579struct ev_once
2277{ 2580{
2278 ev_io io; 2581 ev_io io;

Diff Legend

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