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

Comparing libev/ev.c (file contents):
Revision 1.193 by root, Sat Dec 22 05:47:58 2007 UTC vs.
Revision 1.222 by root, Sun Apr 6 12:45:58 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"
… …
110# else 119# else
111# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
112# endif 121# endif
113# endif 122# endif
114 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
115#endif 132#endif
116 133
117#include <math.h> 134#include <math.h>
118#include <stdlib.h> 135#include <stdlib.h>
119#include <fcntl.h> 136#include <fcntl.h>
… …
144# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
145# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
146# endif 163# endif
147#endif 164#endif
148 165
149/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
150 167
151#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
152# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
153#endif 170#endif
154 171
… …
171# define EV_USE_POLL 1 188# define EV_USE_POLL 1
172# endif 189# endif
173#endif 190#endif
174 191
175#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
176# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
177#endif 198#endif
178 199
179#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
180# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
181#endif 202#endif
… …
183#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
184# define EV_USE_PORT 0 205# define EV_USE_PORT 0
185#endif 206#endif
186 207
187#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
188# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
189#endif 214#endif
190 215
191#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
192# if EV_MINIMAL 217# if EV_MINIMAL
193# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
202# else 227# else
203# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
204# endif 229# endif
205#endif 230#endif
206 231
207/**/ 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 */
208 241
209#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
210# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
211# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
212#endif 245#endif
… …
231# include <sys/inotify.h> 264# include <sys/inotify.h>
232#endif 265#endif
233 266
234#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
235# 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
236#endif 281#endif
237 282
238/**/ 283/**/
239 284
240/* 285/*
… …
280 325
281typedef ev_watcher *W; 326typedef ev_watcher *W;
282typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
283typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
284 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 */
285static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif
286 335
287#ifdef _WIN32 336#ifdef _WIN32
288# include "ev_win32.c" 337# include "ev_win32.c"
289#endif 338#endif
290 339
… …
439 ts.tv_sec = (time_t)delay; 488 ts.tv_sec = (time_t)delay;
440 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 489 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
441 490
442 nanosleep (&ts, 0); 491 nanosleep (&ts, 0);
443#elif defined(_WIN32) 492#elif defined(_WIN32)
444 Sleep (delay * 1e3); 493 Sleep ((unsigned long)(delay * 1e3));
445#else 494#else
446 struct timeval tv; 495 struct timeval tv;
447 496
448 tv.tv_sec = (time_t)delay; 497 tv.tv_sec = (time_t)delay;
449 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 498 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
588 637
589#if EV_SELECT_IS_WINSOCKET 638#if EV_SELECT_IS_WINSOCKET
590 if (events) 639 if (events)
591 { 640 {
592 unsigned long argp; 641 unsigned long argp;
642 #ifdef EV_FD_TO_WIN32_HANDLE
643 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
644 #else
593 anfd->handle = _get_osfhandle (fd); 645 anfd->handle = _get_osfhandle (fd);
646 #endif
594 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 647 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
595 } 648 }
596#endif 649#endif
597 650
598 { 651 {
… …
747/*****************************************************************************/ 800/*****************************************************************************/
748 801
749typedef struct 802typedef struct
750{ 803{
751 WL head; 804 WL head;
752 sig_atomic_t volatile gotsig; 805 EV_ATOMIC_T gotsig;
753} ANSIG; 806} ANSIG;
754 807
755static ANSIG *signals; 808static ANSIG *signals;
756static int signalmax; 809static int signalmax;
757 810
758static int sigpipe [2]; 811static EV_ATOMIC_T gotsig;
759static sig_atomic_t volatile gotsig;
760static ev_io sigev;
761 812
762void inline_size 813void inline_size
763signals_init (ANSIG *base, int count) 814signals_init (ANSIG *base, int count)
764{ 815{
765 while (count--) 816 while (count--)
… …
769 820
770 ++base; 821 ++base;
771 } 822 }
772} 823}
773 824
774static void 825/*****************************************************************************/
775sighandler (int signum)
776{
777#if _WIN32
778 signal (signum, sighandler);
779#endif
780
781 signals [signum - 1].gotsig = 1;
782
783 if (!gotsig)
784 {
785 int old_errno = errno;
786 gotsig = 1;
787 write (sigpipe [1], &signum, 1);
788 errno = old_errno;
789 }
790}
791
792void noinline
793ev_feed_signal_event (EV_P_ int signum)
794{
795 WL w;
796
797#if EV_MULTIPLICITY
798 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
799#endif
800
801 --signum;
802
803 if (signum < 0 || signum >= signalmax)
804 return;
805
806 signals [signum].gotsig = 0;
807
808 for (w = signals [signum].head; w; w = w->next)
809 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
810}
811
812static void
813sigcb (EV_P_ ev_io *iow, int revents)
814{
815 int signum;
816
817 read (sigpipe [0], &revents, 1);
818 gotsig = 0;
819
820 for (signum = signalmax; signum--; )
821 if (signals [signum].gotsig)
822 ev_feed_signal_event (EV_A_ signum + 1);
823}
824 826
825void inline_speed 827void inline_speed
826fd_intern (int fd) 828fd_intern (int fd)
827{ 829{
828#ifdef _WIN32 830#ifdef _WIN32
… …
833 fcntl (fd, F_SETFL, O_NONBLOCK); 835 fcntl (fd, F_SETFL, O_NONBLOCK);
834#endif 836#endif
835} 837}
836 838
837static void noinline 839static void noinline
838siginit (EV_P) 840evpipe_init (EV_P)
839{ 841{
842 if (!ev_is_active (&pipeev))
843 {
844#if EV_USE_EVENTFD
845 if ((evfd = eventfd (0, 0)) >= 0)
846 {
847 evpipe [0] = -1;
848 fd_intern (evfd);
849 ev_io_set (&pipeev, evfd, EV_READ);
850 }
851 else
852#endif
853 {
854 while (pipe (evpipe))
855 syserr ("(libev) error creating signal/async pipe");
856
840 fd_intern (sigpipe [0]); 857 fd_intern (evpipe [0]);
841 fd_intern (sigpipe [1]); 858 fd_intern (evpipe [1]);
859 ev_io_set (&pipeev, evpipe [0], EV_READ);
860 }
842 861
843 ev_io_set (&sigev, sigpipe [0], EV_READ);
844 ev_io_start (EV_A_ &sigev); 862 ev_io_start (EV_A_ &pipeev);
845 ev_unref (EV_A); /* child watcher should not keep loop alive */ 863 ev_unref (EV_A); /* watcher should not keep loop alive */
864 }
865}
866
867void inline_size
868evpipe_write (EV_P_ EV_ATOMIC_T *flag)
869{
870 if (!*flag)
871 {
872 int old_errno = errno; /* save errno because write might clobber it */
873
874 *flag = 1;
875
876#if EV_USE_EVENTFD
877 if (evfd >= 0)
878 {
879 uint64_t counter = 1;
880 write (evfd, &counter, sizeof (uint64_t));
881 }
882 else
883#endif
884 write (evpipe [1], &old_errno, 1);
885
886 errno = old_errno;
887 }
888}
889
890static void
891pipecb (EV_P_ ev_io *iow, int revents)
892{
893#if EV_USE_EVENTFD
894 if (evfd >= 0)
895 {
896 uint64_t counter = 1;
897 read (evfd, &counter, sizeof (uint64_t));
898 }
899 else
900#endif
901 {
902 char dummy;
903 read (evpipe [0], &dummy, 1);
904 }
905
906 if (gotsig && ev_is_default_loop (EV_A))
907 {
908 int signum;
909 gotsig = 0;
910
911 for (signum = signalmax; signum--; )
912 if (signals [signum].gotsig)
913 ev_feed_signal_event (EV_A_ signum + 1);
914 }
915
916#if EV_ASYNC_ENABLE
917 if (gotasync)
918 {
919 int i;
920 gotasync = 0;
921
922 for (i = asynccnt; i--; )
923 if (asyncs [i]->sent)
924 {
925 asyncs [i]->sent = 0;
926 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
927 }
928 }
929#endif
846} 930}
847 931
848/*****************************************************************************/ 932/*****************************************************************************/
849 933
934static void
935ev_sighandler (int signum)
936{
937#if EV_MULTIPLICITY
938 struct ev_loop *loop = &default_loop_struct;
939#endif
940
941#if _WIN32
942 signal (signum, ev_sighandler);
943#endif
944
945 signals [signum - 1].gotsig = 1;
946 evpipe_write (EV_A_ &gotsig);
947}
948
949void noinline
950ev_feed_signal_event (EV_P_ int signum)
951{
952 WL w;
953
954#if EV_MULTIPLICITY
955 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
956#endif
957
958 --signum;
959
960 if (signum < 0 || signum >= signalmax)
961 return;
962
963 signals [signum].gotsig = 0;
964
965 for (w = signals [signum].head; w; w = w->next)
966 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
967}
968
969/*****************************************************************************/
970
850static WL childs [EV_PID_HASHSIZE]; 971static WL childs [EV_PID_HASHSIZE];
851 972
852#ifndef _WIN32 973#ifndef _WIN32
853 974
854static ev_signal childev; 975static ev_signal childev;
855 976
977#ifndef WIFCONTINUED
978# define WIFCONTINUED(status) 0
979#endif
980
856void inline_speed 981void inline_speed
857child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 982child_reap (EV_P_ int chain, int pid, int status)
858{ 983{
859 ev_child *w; 984 ev_child *w;
985 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
860 986
861 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 987 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
988 {
862 if (w->pid == pid || !w->pid) 989 if ((w->pid == pid || !w->pid)
990 && (!traced || (w->flags & 1)))
863 { 991 {
864 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 992 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
865 w->rpid = pid; 993 w->rpid = pid;
866 w->rstatus = status; 994 w->rstatus = status;
867 ev_feed_event (EV_A_ (W)w, EV_CHILD); 995 ev_feed_event (EV_A_ (W)w, EV_CHILD);
868 } 996 }
997 }
869} 998}
870 999
871#ifndef WCONTINUED 1000#ifndef WCONTINUED
872# define WCONTINUED 0 1001# define WCONTINUED 0
873#endif 1002#endif
… …
882 if (!WCONTINUED 1011 if (!WCONTINUED
883 || errno != EINVAL 1012 || errno != EINVAL
884 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1013 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
885 return; 1014 return;
886 1015
887 /* make sure we are called again until all childs have been reaped */ 1016 /* make sure we are called again until all children have been reaped */
888 /* we need to do it this way so that the callback gets called before we continue */ 1017 /* we need to do it this way so that the callback gets called before we continue */
889 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1018 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
890 1019
891 child_reap (EV_A_ sw, pid, pid, status); 1020 child_reap (EV_A_ pid, pid, status);
892 if (EV_PID_HASHSIZE > 1) 1021 if (EV_PID_HASHSIZE > 1)
893 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1022 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
894} 1023}
895 1024
896#endif 1025#endif
897 1026
898/*****************************************************************************/ 1027/*****************************************************************************/
… …
970} 1099}
971 1100
972unsigned int 1101unsigned int
973ev_embeddable_backends (void) 1102ev_embeddable_backends (void)
974{ 1103{
1104 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1105
975 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1106 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
976 return EVBACKEND_KQUEUE 1107 /* please fix it and tell me how to detect the fix */
977 | EVBACKEND_PORT; 1108 flags &= ~EVBACKEND_EPOLL;
1109
1110 return flags;
978} 1111}
979 1112
980unsigned int 1113unsigned int
981ev_backend (EV_P) 1114ev_backend (EV_P)
982{ 1115{
… …
1012 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1145 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1013 have_monotonic = 1; 1146 have_monotonic = 1;
1014 } 1147 }
1015#endif 1148#endif
1016 1149
1017 ev_rt_now = ev_time (); 1150 ev_rt_now = ev_time ();
1018 mn_now = get_clock (); 1151 mn_now = get_clock ();
1019 now_floor = mn_now; 1152 now_floor = mn_now;
1020 rtmn_diff = ev_rt_now - mn_now; 1153 rtmn_diff = ev_rt_now - mn_now;
1021 1154
1022 io_blocktime = 0.; 1155 io_blocktime = 0.;
1023 timeout_blocktime = 0.; 1156 timeout_blocktime = 0.;
1157 backend = 0;
1158 backend_fd = -1;
1159 gotasync = 0;
1160#if EV_USE_INOTIFY
1161 fs_fd = -2;
1162#endif
1024 1163
1025 /* pid check not overridable via env */ 1164 /* pid check not overridable via env */
1026#ifndef _WIN32 1165#ifndef _WIN32
1027 if (flags & EVFLAG_FORKCHECK) 1166 if (flags & EVFLAG_FORKCHECK)
1028 curpid = getpid (); 1167 curpid = getpid ();
… …
1034 flags = atoi (getenv ("LIBEV_FLAGS")); 1173 flags = atoi (getenv ("LIBEV_FLAGS"));
1035 1174
1036 if (!(flags & 0x0000ffffUL)) 1175 if (!(flags & 0x0000ffffUL))
1037 flags |= ev_recommended_backends (); 1176 flags |= ev_recommended_backends ();
1038 1177
1039 backend = 0;
1040 backend_fd = -1;
1041#if EV_USE_INOTIFY
1042 fs_fd = -2;
1043#endif
1044
1045#if EV_USE_PORT 1178#if EV_USE_PORT
1046 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1179 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1047#endif 1180#endif
1048#if EV_USE_KQUEUE 1181#if EV_USE_KQUEUE
1049 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1182 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1056#endif 1189#endif
1057#if EV_USE_SELECT 1190#if EV_USE_SELECT
1058 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1191 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1059#endif 1192#endif
1060 1193
1061 ev_init (&sigev, sigcb); 1194 ev_init (&pipeev, pipecb);
1062 ev_set_priority (&sigev, EV_MAXPRI); 1195 ev_set_priority (&pipeev, EV_MAXPRI);
1063 } 1196 }
1064} 1197}
1065 1198
1066static void noinline 1199static void noinline
1067loop_destroy (EV_P) 1200loop_destroy (EV_P)
1068{ 1201{
1069 int i; 1202 int i;
1203
1204 if (ev_is_active (&pipeev))
1205 {
1206 ev_ref (EV_A); /* signal watcher */
1207 ev_io_stop (EV_A_ &pipeev);
1208
1209#if EV_USE_EVENTFD
1210 if (evfd >= 0)
1211 close (evfd);
1212#endif
1213
1214 if (evpipe [0] >= 0)
1215 {
1216 close (evpipe [0]);
1217 close (evpipe [1]);
1218 }
1219 }
1070 1220
1071#if EV_USE_INOTIFY 1221#if EV_USE_INOTIFY
1072 if (fs_fd >= 0) 1222 if (fs_fd >= 0)
1073 close (fs_fd); 1223 close (fs_fd);
1074#endif 1224#endif
… …
1111#if EV_FORK_ENABLE 1261#if EV_FORK_ENABLE
1112 array_free (fork, EMPTY); 1262 array_free (fork, EMPTY);
1113#endif 1263#endif
1114 array_free (prepare, EMPTY); 1264 array_free (prepare, EMPTY);
1115 array_free (check, EMPTY); 1265 array_free (check, EMPTY);
1266#if EV_ASYNC_ENABLE
1267 array_free (async, EMPTY);
1268#endif
1116 1269
1117 backend = 0; 1270 backend = 0;
1118} 1271}
1119 1272
1120void inline_size infy_fork (EV_P); 1273void inline_size infy_fork (EV_P);
… …
1133#endif 1286#endif
1134#if EV_USE_INOTIFY 1287#if EV_USE_INOTIFY
1135 infy_fork (EV_A); 1288 infy_fork (EV_A);
1136#endif 1289#endif
1137 1290
1138 if (ev_is_active (&sigev)) 1291 if (ev_is_active (&pipeev))
1139 { 1292 {
1140 /* default loop */ 1293 /* this "locks" the handlers against writing to the pipe */
1294 /* while we modify the fd vars */
1295 gotsig = 1;
1296#if EV_ASYNC_ENABLE
1297 gotasync = 1;
1298#endif
1141 1299
1142 ev_ref (EV_A); 1300 ev_ref (EV_A);
1143 ev_io_stop (EV_A_ &sigev); 1301 ev_io_stop (EV_A_ &pipeev);
1302
1303#if EV_USE_EVENTFD
1304 if (evfd >= 0)
1305 close (evfd);
1306#endif
1307
1308 if (evpipe [0] >= 0)
1309 {
1144 close (sigpipe [0]); 1310 close (evpipe [0]);
1145 close (sigpipe [1]); 1311 close (evpipe [1]);
1312 }
1146 1313
1147 while (pipe (sigpipe))
1148 syserr ("(libev) error creating pipe");
1149
1150 siginit (EV_A); 1314 evpipe_init (EV_A);
1315 /* now iterate over everything, in case we missed something */
1316 pipecb (EV_A_ &pipeev, EV_READ);
1151 } 1317 }
1152 1318
1153 postfork = 0; 1319 postfork = 0;
1154} 1320}
1155 1321
… …
1177} 1343}
1178 1344
1179void 1345void
1180ev_loop_fork (EV_P) 1346ev_loop_fork (EV_P)
1181{ 1347{
1182 postfork = 1; 1348 postfork = 1; /* must be in line with ev_default_fork */
1183} 1349}
1184 1350
1185#endif 1351#endif
1186 1352
1187#if EV_MULTIPLICITY 1353#if EV_MULTIPLICITY
… …
1190#else 1356#else
1191int 1357int
1192ev_default_loop (unsigned int flags) 1358ev_default_loop (unsigned int flags)
1193#endif 1359#endif
1194{ 1360{
1195 if (sigpipe [0] == sigpipe [1])
1196 if (pipe (sigpipe))
1197 return 0;
1198
1199 if (!ev_default_loop_ptr) 1361 if (!ev_default_loop_ptr)
1200 { 1362 {
1201#if EV_MULTIPLICITY 1363#if EV_MULTIPLICITY
1202 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1364 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1203#else 1365#else
… …
1206 1368
1207 loop_init (EV_A_ flags); 1369 loop_init (EV_A_ flags);
1208 1370
1209 if (ev_backend (EV_A)) 1371 if (ev_backend (EV_A))
1210 { 1372 {
1211 siginit (EV_A);
1212
1213#ifndef _WIN32 1373#ifndef _WIN32
1214 ev_signal_init (&childev, childcb, SIGCHLD); 1374 ev_signal_init (&childev, childcb, SIGCHLD);
1215 ev_set_priority (&childev, EV_MAXPRI); 1375 ev_set_priority (&childev, EV_MAXPRI);
1216 ev_signal_start (EV_A_ &childev); 1376 ev_signal_start (EV_A_ &childev);
1217 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1377 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1234#ifndef _WIN32 1394#ifndef _WIN32
1235 ev_ref (EV_A); /* child watcher */ 1395 ev_ref (EV_A); /* child watcher */
1236 ev_signal_stop (EV_A_ &childev); 1396 ev_signal_stop (EV_A_ &childev);
1237#endif 1397#endif
1238 1398
1239 ev_ref (EV_A); /* signal watcher */
1240 ev_io_stop (EV_A_ &sigev);
1241
1242 close (sigpipe [0]); sigpipe [0] = 0;
1243 close (sigpipe [1]); sigpipe [1] = 0;
1244
1245 loop_destroy (EV_A); 1399 loop_destroy (EV_A);
1246} 1400}
1247 1401
1248void 1402void
1249ev_default_fork (void) 1403ev_default_fork (void)
… …
1251#if EV_MULTIPLICITY 1405#if EV_MULTIPLICITY
1252 struct ev_loop *loop = ev_default_loop_ptr; 1406 struct ev_loop *loop = ev_default_loop_ptr;
1253#endif 1407#endif
1254 1408
1255 if (backend) 1409 if (backend)
1256 postfork = 1; 1410 postfork = 1; /* must be in line with ev_loop_fork */
1257} 1411}
1258 1412
1259/*****************************************************************************/ 1413/*****************************************************************************/
1260 1414
1261void 1415void
… …
1470static int loop_done; 1624static int loop_done;
1471 1625
1472void 1626void
1473ev_loop (EV_P_ int flags) 1627ev_loop (EV_P_ int flags)
1474{ 1628{
1475 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1629 loop_done = EVUNLOOP_CANCEL;
1476 ? EVUNLOOP_ONE
1477 : EVUNLOOP_CANCEL;
1478 1630
1479 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1631 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1480 1632
1481 do 1633 do
1482 { 1634 {
… …
1578 /* queue check watchers, to be executed first */ 1730 /* queue check watchers, to be executed first */
1579 if (expect_false (checkcnt)) 1731 if (expect_false (checkcnt))
1580 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1732 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1581 1733
1582 call_pending (EV_A); 1734 call_pending (EV_A);
1583
1584 } 1735 }
1585 while (expect_true (activecnt && !loop_done)); 1736 while (expect_true (
1737 activecnt
1738 && !loop_done
1739 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1740 ));
1586 1741
1587 if (loop_done == EVUNLOOP_ONE) 1742 if (loop_done == EVUNLOOP_ONE)
1588 loop_done = EVUNLOOP_CANCEL; 1743 loop_done = EVUNLOOP_CANCEL;
1589} 1744}
1590 1745
… …
1836 if (expect_false (ev_is_active (w))) 1991 if (expect_false (ev_is_active (w)))
1837 return; 1992 return;
1838 1993
1839 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1994 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1840 1995
1996 evpipe_init (EV_A);
1997
1841 { 1998 {
1842#ifndef _WIN32 1999#ifndef _WIN32
1843 sigset_t full, prev; 2000 sigset_t full, prev;
1844 sigfillset (&full); 2001 sigfillset (&full);
1845 sigprocmask (SIG_SETMASK, &full, &prev); 2002 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1856 wlist_add (&signals [w->signum - 1].head, (WL)w); 2013 wlist_add (&signals [w->signum - 1].head, (WL)w);
1857 2014
1858 if (!((WL)w)->next) 2015 if (!((WL)w)->next)
1859 { 2016 {
1860#if _WIN32 2017#if _WIN32
1861 signal (w->signum, sighandler); 2018 signal (w->signum, ev_sighandler);
1862#else 2019#else
1863 struct sigaction sa; 2020 struct sigaction sa;
1864 sa.sa_handler = sighandler; 2021 sa.sa_handler = ev_sighandler;
1865 sigfillset (&sa.sa_mask); 2022 sigfillset (&sa.sa_mask);
1866 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2023 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1867 sigaction (w->signum, &sa, 0); 2024 sigaction (w->signum, &sa, 0);
1868#endif 2025#endif
1869 } 2026 }
… …
2264 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2421 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2265 2422
2266 if (ev_cb (w)) 2423 if (ev_cb (w))
2267 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2424 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2268 else 2425 else
2269 ev_embed_sweep (loop, w); 2426 ev_loop (w->other, EVLOOP_NONBLOCK);
2270} 2427}
2271 2428
2272static void 2429static void
2273embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2430embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2274{ 2431{
2275 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2432 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2276 2433
2277 fd_reify (w->other); 2434 {
2435 struct ev_loop *loop = w->other;
2436
2437 while (fdchangecnt)
2438 {
2439 fd_reify (EV_A);
2440 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2441 }
2442 }
2278} 2443}
2444
2445#if 0
2446static void
2447embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2448{
2449 ev_idle_stop (EV_A_ idle);
2450}
2451#endif
2279 2452
2280void 2453void
2281ev_embed_start (EV_P_ ev_embed *w) 2454ev_embed_start (EV_P_ ev_embed *w)
2282{ 2455{
2283 if (expect_false (ev_is_active (w))) 2456 if (expect_false (ev_is_active (w)))
… …
2294 2467
2295 ev_prepare_init (&w->prepare, embed_prepare_cb); 2468 ev_prepare_init (&w->prepare, embed_prepare_cb);
2296 ev_set_priority (&w->prepare, EV_MINPRI); 2469 ev_set_priority (&w->prepare, EV_MINPRI);
2297 ev_prepare_start (EV_A_ &w->prepare); 2470 ev_prepare_start (EV_A_ &w->prepare);
2298 2471
2472 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2473
2299 ev_start (EV_A_ (W)w, 1); 2474 ev_start (EV_A_ (W)w, 1);
2300} 2475}
2301 2476
2302void 2477void
2303ev_embed_stop (EV_P_ ev_embed *w) 2478ev_embed_stop (EV_P_ ev_embed *w)
… …
2340 2515
2341 ev_stop (EV_A_ (W)w); 2516 ev_stop (EV_A_ (W)w);
2342} 2517}
2343#endif 2518#endif
2344 2519
2520#if EV_ASYNC_ENABLE
2521void
2522ev_async_start (EV_P_ ev_async *w)
2523{
2524 if (expect_false (ev_is_active (w)))
2525 return;
2526
2527 evpipe_init (EV_A);
2528
2529 ev_start (EV_A_ (W)w, ++asynccnt);
2530 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2531 asyncs [asynccnt - 1] = w;
2532}
2533
2534void
2535ev_async_stop (EV_P_ ev_async *w)
2536{
2537 clear_pending (EV_A_ (W)w);
2538 if (expect_false (!ev_is_active (w)))
2539 return;
2540
2541 {
2542 int active = ((W)w)->active;
2543 asyncs [active - 1] = asyncs [--asynccnt];
2544 ((W)asyncs [active - 1])->active = active;
2545 }
2546
2547 ev_stop (EV_A_ (W)w);
2548}
2549
2550void
2551ev_async_send (EV_P_ ev_async *w)
2552{
2553 w->sent = 1;
2554 evpipe_write (EV_A_ &gotasync);
2555}
2556#endif
2557
2345/*****************************************************************************/ 2558/*****************************************************************************/
2346 2559
2347struct ev_once 2560struct ev_once
2348{ 2561{
2349 ev_io io; 2562 ev_io io;

Diff Legend

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