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.220 by root, Sun Apr 6 09:53:17 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 */
273int eventfd (unsigned int initval, int flags);
236#endif 274#endif
237 275
238/**/ 276/**/
239 277
240/* 278/*
… …
280 318
281typedef ev_watcher *W; 319typedef ev_watcher *W;
282typedef ev_watcher_list *WL; 320typedef ev_watcher_list *WL;
283typedef ev_watcher_time *WT; 321typedef ev_watcher_time *WT;
284 322
323#if EV_USE_MONOTONIC
324/* sig_atomic_t is used to avoid per-thread variables or locking but still */
325/* giving it a reasonably high chance of working on typical architetcures */
285static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 326static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
327#endif
286 328
287#ifdef _WIN32 329#ifdef _WIN32
288# include "ev_win32.c" 330# include "ev_win32.c"
289#endif 331#endif
290 332
… …
439 ts.tv_sec = (time_t)delay; 481 ts.tv_sec = (time_t)delay;
440 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 482 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
441 483
442 nanosleep (&ts, 0); 484 nanosleep (&ts, 0);
443#elif defined(_WIN32) 485#elif defined(_WIN32)
444 Sleep (delay * 1e3); 486 Sleep ((unsigned long)(delay * 1e3));
445#else 487#else
446 struct timeval tv; 488 struct timeval tv;
447 489
448 tv.tv_sec = (time_t)delay; 490 tv.tv_sec = (time_t)delay;
449 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 491 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
588 630
589#if EV_SELECT_IS_WINSOCKET 631#if EV_SELECT_IS_WINSOCKET
590 if (events) 632 if (events)
591 { 633 {
592 unsigned long argp; 634 unsigned long argp;
635 #ifdef EV_FD_TO_WIN32_HANDLE
636 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
637 #else
593 anfd->handle = _get_osfhandle (fd); 638 anfd->handle = _get_osfhandle (fd);
639 #endif
594 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 640 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
595 } 641 }
596#endif 642#endif
597 643
598 { 644 {
… …
747/*****************************************************************************/ 793/*****************************************************************************/
748 794
749typedef struct 795typedef struct
750{ 796{
751 WL head; 797 WL head;
752 sig_atomic_t volatile gotsig; 798 EV_ATOMIC_T gotsig;
753} ANSIG; 799} ANSIG;
754 800
755static ANSIG *signals; 801static ANSIG *signals;
756static int signalmax; 802static int signalmax;
757 803
758static int sigpipe [2]; 804static EV_ATOMIC_T gotsig;
759static sig_atomic_t volatile gotsig;
760static ev_io sigev;
761 805
762void inline_size 806void inline_size
763signals_init (ANSIG *base, int count) 807signals_init (ANSIG *base, int count)
764{ 808{
765 while (count--) 809 while (count--)
… …
769 813
770 ++base; 814 ++base;
771 } 815 }
772} 816}
773 817
774static void 818/*****************************************************************************/
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 819
825void inline_speed 820void inline_speed
826fd_intern (int fd) 821fd_intern (int fd)
827{ 822{
828#ifdef _WIN32 823#ifdef _WIN32
… …
833 fcntl (fd, F_SETFL, O_NONBLOCK); 828 fcntl (fd, F_SETFL, O_NONBLOCK);
834#endif 829#endif
835} 830}
836 831
837static void noinline 832static void noinline
838siginit (EV_P) 833evpipe_init (EV_P)
839{ 834{
835 if (!ev_is_active (&pipeev))
836 {
837#if EV_USE_EVENTFD
838 if ((evfd = eventfd (0, 0)) >= 0)
839 {
840 evpipe [0] = -1;
841 fd_intern (evfd);
842 ev_io_set (&pipeev, evfd, EV_READ);
843 }
844 else
845#endif
846 {
847 while (pipe (evpipe))
848 syserr ("(libev) error creating signal/async pipe");
849
840 fd_intern (sigpipe [0]); 850 fd_intern (evpipe [0]);
841 fd_intern (sigpipe [1]); 851 fd_intern (evpipe [1]);
852 ev_io_set (&pipeev, evpipe [0], EV_READ);
853 }
842 854
843 ev_io_set (&sigev, sigpipe [0], EV_READ);
844 ev_io_start (EV_A_ &sigev); 855 ev_io_start (EV_A_ &pipeev);
845 ev_unref (EV_A); /* child watcher should not keep loop alive */ 856 ev_unref (EV_A); /* watcher should not keep loop alive */
857 }
858}
859
860void inline_size
861evpipe_write (EV_P_ EV_ATOMIC_T *flag)
862{
863 if (!*flag)
864 {
865 int old_errno = errno; /* save errno because write might clobber it */
866
867 *flag = 1;
868
869#if EV_USE_EVENTFD
870 if (evfd >= 0)
871 {
872 uint64_t counter = 1;
873 write (evfd, &counter, sizeof (uint64_t));
874 }
875 else
876#endif
877 write (evpipe [1], &old_errno, 1);
878
879 errno = old_errno;
880 }
881}
882
883static void
884pipecb (EV_P_ ev_io *iow, int revents)
885{
886#if EV_USE_EVENTFD
887 if (evfd >= 0)
888 {
889 uint64_t counter = 1;
890 read (evfd, &counter, sizeof (uint64_t));
891 }
892 else
893#endif
894 {
895 char dummy;
896 read (evpipe [0], &dummy, 1);
897 }
898
899 if (gotsig && ev_is_default_loop (EV_A))
900 {
901 int signum;
902 gotsig = 0;
903
904 for (signum = signalmax; signum--; )
905 if (signals [signum].gotsig)
906 ev_feed_signal_event (EV_A_ signum + 1);
907 }
908
909#if EV_ASYNC_ENABLE
910 if (gotasync)
911 {
912 int i;
913 gotasync = 0;
914
915 for (i = asynccnt; i--; )
916 if (asyncs [i]->sent)
917 {
918 asyncs [i]->sent = 0;
919 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
920 }
921 }
922#endif
846} 923}
847 924
848/*****************************************************************************/ 925/*****************************************************************************/
849 926
927static void
928ev_sighandler (int signum)
929{
930#if EV_MULTIPLICITY
931 struct ev_loop *loop = &default_loop_struct;
932#endif
933
934#if _WIN32
935 signal (signum, ev_sighandler);
936#endif
937
938 signals [signum - 1].gotsig = 1;
939 evpipe_write (EV_A_ &gotsig);
940}
941
942void noinline
943ev_feed_signal_event (EV_P_ int signum)
944{
945 WL w;
946
947#if EV_MULTIPLICITY
948 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
949#endif
950
951 --signum;
952
953 if (signum < 0 || signum >= signalmax)
954 return;
955
956 signals [signum].gotsig = 0;
957
958 for (w = signals [signum].head; w; w = w->next)
959 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
960}
961
962/*****************************************************************************/
963
850static WL childs [EV_PID_HASHSIZE]; 964static WL childs [EV_PID_HASHSIZE];
851 965
852#ifndef _WIN32 966#ifndef _WIN32
853 967
854static ev_signal childev; 968static ev_signal childev;
855 969
970#ifndef WIFCONTINUED
971# define WIFCONTINUED(status) 0
972#endif
973
856void inline_speed 974void inline_speed
857child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 975child_reap (EV_P_ int chain, int pid, int status)
858{ 976{
859 ev_child *w; 977 ev_child *w;
978 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
860 979
861 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 980 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
981 {
862 if (w->pid == pid || !w->pid) 982 if ((w->pid == pid || !w->pid)
983 && (!traced || (w->flags & 1)))
863 { 984 {
864 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 985 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; 986 w->rpid = pid;
866 w->rstatus = status; 987 w->rstatus = status;
867 ev_feed_event (EV_A_ (W)w, EV_CHILD); 988 ev_feed_event (EV_A_ (W)w, EV_CHILD);
868 } 989 }
990 }
869} 991}
870 992
871#ifndef WCONTINUED 993#ifndef WCONTINUED
872# define WCONTINUED 0 994# define WCONTINUED 0
873#endif 995#endif
… …
882 if (!WCONTINUED 1004 if (!WCONTINUED
883 || errno != EINVAL 1005 || errno != EINVAL
884 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1006 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
885 return; 1007 return;
886 1008
887 /* make sure we are called again until all childs have been reaped */ 1009 /* 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 */ 1010 /* 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); 1011 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
890 1012
891 child_reap (EV_A_ sw, pid, pid, status); 1013 child_reap (EV_A_ pid, pid, status);
892 if (EV_PID_HASHSIZE > 1) 1014 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 */ 1015 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
894} 1016}
895 1017
896#endif 1018#endif
897 1019
898/*****************************************************************************/ 1020/*****************************************************************************/
… …
970} 1092}
971 1093
972unsigned int 1094unsigned int
973ev_embeddable_backends (void) 1095ev_embeddable_backends (void)
974{ 1096{
1097 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1098
975 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1099 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
976 return EVBACKEND_KQUEUE 1100 /* please fix it and tell me how to detect the fix */
977 | EVBACKEND_PORT; 1101 flags &= ~EVBACKEND_EPOLL;
1102
1103 return flags;
978} 1104}
979 1105
980unsigned int 1106unsigned int
981ev_backend (EV_P) 1107ev_backend (EV_P)
982{ 1108{
… …
1012 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1138 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1013 have_monotonic = 1; 1139 have_monotonic = 1;
1014 } 1140 }
1015#endif 1141#endif
1016 1142
1017 ev_rt_now = ev_time (); 1143 ev_rt_now = ev_time ();
1018 mn_now = get_clock (); 1144 mn_now = get_clock ();
1019 now_floor = mn_now; 1145 now_floor = mn_now;
1020 rtmn_diff = ev_rt_now - mn_now; 1146 rtmn_diff = ev_rt_now - mn_now;
1021 1147
1022 io_blocktime = 0.; 1148 io_blocktime = 0.;
1023 timeout_blocktime = 0.; 1149 timeout_blocktime = 0.;
1150 backend = 0;
1151 backend_fd = -1;
1152 gotasync = 0;
1153#if EV_USE_INOTIFY
1154 fs_fd = -2;
1155#endif
1024 1156
1025 /* pid check not overridable via env */ 1157 /* pid check not overridable via env */
1026#ifndef _WIN32 1158#ifndef _WIN32
1027 if (flags & EVFLAG_FORKCHECK) 1159 if (flags & EVFLAG_FORKCHECK)
1028 curpid = getpid (); 1160 curpid = getpid ();
… …
1034 flags = atoi (getenv ("LIBEV_FLAGS")); 1166 flags = atoi (getenv ("LIBEV_FLAGS"));
1035 1167
1036 if (!(flags & 0x0000ffffUL)) 1168 if (!(flags & 0x0000ffffUL))
1037 flags |= ev_recommended_backends (); 1169 flags |= ev_recommended_backends ();
1038 1170
1039 backend = 0;
1040 backend_fd = -1;
1041#if EV_USE_INOTIFY
1042 fs_fd = -2;
1043#endif
1044
1045#if EV_USE_PORT 1171#if EV_USE_PORT
1046 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1172 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1047#endif 1173#endif
1048#if EV_USE_KQUEUE 1174#if EV_USE_KQUEUE
1049 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1175 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1056#endif 1182#endif
1057#if EV_USE_SELECT 1183#if EV_USE_SELECT
1058 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1184 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1059#endif 1185#endif
1060 1186
1061 ev_init (&sigev, sigcb); 1187 ev_init (&pipeev, pipecb);
1062 ev_set_priority (&sigev, EV_MAXPRI); 1188 ev_set_priority (&pipeev, EV_MAXPRI);
1063 } 1189 }
1064} 1190}
1065 1191
1066static void noinline 1192static void noinline
1067loop_destroy (EV_P) 1193loop_destroy (EV_P)
1068{ 1194{
1069 int i; 1195 int i;
1196
1197 if (ev_is_active (&pipeev))
1198 {
1199 ev_ref (EV_A); /* signal watcher */
1200 ev_io_stop (EV_A_ &pipeev);
1201
1202#if EV_USE_EVENTFD
1203 if (evfd >= 0)
1204 close (evfd);
1205#endif
1206
1207 if (evpipe [0] >= 0)
1208 {
1209 close (evpipe [0]);
1210 close (evpipe [1]);
1211 }
1212 }
1070 1213
1071#if EV_USE_INOTIFY 1214#if EV_USE_INOTIFY
1072 if (fs_fd >= 0) 1215 if (fs_fd >= 0)
1073 close (fs_fd); 1216 close (fs_fd);
1074#endif 1217#endif
… …
1111#if EV_FORK_ENABLE 1254#if EV_FORK_ENABLE
1112 array_free (fork, EMPTY); 1255 array_free (fork, EMPTY);
1113#endif 1256#endif
1114 array_free (prepare, EMPTY); 1257 array_free (prepare, EMPTY);
1115 array_free (check, EMPTY); 1258 array_free (check, EMPTY);
1259#if EV_ASYNC_ENABLE
1260 array_free (async, EMPTY);
1261#endif
1116 1262
1117 backend = 0; 1263 backend = 0;
1118} 1264}
1119 1265
1120void inline_size infy_fork (EV_P); 1266void inline_size infy_fork (EV_P);
… …
1133#endif 1279#endif
1134#if EV_USE_INOTIFY 1280#if EV_USE_INOTIFY
1135 infy_fork (EV_A); 1281 infy_fork (EV_A);
1136#endif 1282#endif
1137 1283
1138 if (ev_is_active (&sigev)) 1284 if (ev_is_active (&pipeev))
1139 { 1285 {
1140 /* default loop */ 1286 /* this "locks" the handlers against writing to the pipe */
1287 /* while we modify the fd vars */
1288 gotsig = 1;
1289#if EV_ASYNC_ENABLE
1290 gotasync = 1;
1291#endif
1141 1292
1142 ev_ref (EV_A); 1293 ev_ref (EV_A);
1143 ev_io_stop (EV_A_ &sigev); 1294 ev_io_stop (EV_A_ &pipeev);
1295
1296#if EV_USE_EVENTFD
1297 if (evfd >= 0)
1298 close (evfd);
1299#endif
1300
1301 if (evpipe [0] >= 0)
1302 {
1144 close (sigpipe [0]); 1303 close (evpipe [0]);
1145 close (sigpipe [1]); 1304 close (evpipe [1]);
1305 }
1146 1306
1147 while (pipe (sigpipe))
1148 syserr ("(libev) error creating pipe");
1149
1150 siginit (EV_A); 1307 evpipe_init (EV_A);
1308 /* now iterate over everything, in case we missed something */
1309 pipecb (EV_A_ &pipeev, EV_READ);
1151 } 1310 }
1152 1311
1153 postfork = 0; 1312 postfork = 0;
1154} 1313}
1155 1314
… …
1177} 1336}
1178 1337
1179void 1338void
1180ev_loop_fork (EV_P) 1339ev_loop_fork (EV_P)
1181{ 1340{
1182 postfork = 1; 1341 postfork = 1; /* must be in line with ev_default_fork */
1183} 1342}
1184 1343
1185#endif 1344#endif
1186 1345
1187#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
… …
1190#else 1349#else
1191int 1350int
1192ev_default_loop (unsigned int flags) 1351ev_default_loop (unsigned int flags)
1193#endif 1352#endif
1194{ 1353{
1195 if (sigpipe [0] == sigpipe [1])
1196 if (pipe (sigpipe))
1197 return 0;
1198
1199 if (!ev_default_loop_ptr) 1354 if (!ev_default_loop_ptr)
1200 { 1355 {
1201#if EV_MULTIPLICITY 1356#if EV_MULTIPLICITY
1202 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1357 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1203#else 1358#else
… …
1206 1361
1207 loop_init (EV_A_ flags); 1362 loop_init (EV_A_ flags);
1208 1363
1209 if (ev_backend (EV_A)) 1364 if (ev_backend (EV_A))
1210 { 1365 {
1211 siginit (EV_A);
1212
1213#ifndef _WIN32 1366#ifndef _WIN32
1214 ev_signal_init (&childev, childcb, SIGCHLD); 1367 ev_signal_init (&childev, childcb, SIGCHLD);
1215 ev_set_priority (&childev, EV_MAXPRI); 1368 ev_set_priority (&childev, EV_MAXPRI);
1216 ev_signal_start (EV_A_ &childev); 1369 ev_signal_start (EV_A_ &childev);
1217 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1370 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1234#ifndef _WIN32 1387#ifndef _WIN32
1235 ev_ref (EV_A); /* child watcher */ 1388 ev_ref (EV_A); /* child watcher */
1236 ev_signal_stop (EV_A_ &childev); 1389 ev_signal_stop (EV_A_ &childev);
1237#endif 1390#endif
1238 1391
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); 1392 loop_destroy (EV_A);
1246} 1393}
1247 1394
1248void 1395void
1249ev_default_fork (void) 1396ev_default_fork (void)
… …
1251#if EV_MULTIPLICITY 1398#if EV_MULTIPLICITY
1252 struct ev_loop *loop = ev_default_loop_ptr; 1399 struct ev_loop *loop = ev_default_loop_ptr;
1253#endif 1400#endif
1254 1401
1255 if (backend) 1402 if (backend)
1256 postfork = 1; 1403 postfork = 1; /* must be in line with ev_loop_fork */
1257} 1404}
1258 1405
1259/*****************************************************************************/ 1406/*****************************************************************************/
1260 1407
1261void 1408void
… …
1470static int loop_done; 1617static int loop_done;
1471 1618
1472void 1619void
1473ev_loop (EV_P_ int flags) 1620ev_loop (EV_P_ int flags)
1474{ 1621{
1475 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1622 loop_done = EVUNLOOP_CANCEL;
1476 ? EVUNLOOP_ONE
1477 : EVUNLOOP_CANCEL;
1478 1623
1479 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1624 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1480 1625
1481 do 1626 do
1482 { 1627 {
… …
1578 /* queue check watchers, to be executed first */ 1723 /* queue check watchers, to be executed first */
1579 if (expect_false (checkcnt)) 1724 if (expect_false (checkcnt))
1580 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1725 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1581 1726
1582 call_pending (EV_A); 1727 call_pending (EV_A);
1583
1584 } 1728 }
1585 while (expect_true (activecnt && !loop_done)); 1729 while (expect_true (
1730 activecnt
1731 && !loop_done
1732 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1733 ));
1586 1734
1587 if (loop_done == EVUNLOOP_ONE) 1735 if (loop_done == EVUNLOOP_ONE)
1588 loop_done = EVUNLOOP_CANCEL; 1736 loop_done = EVUNLOOP_CANCEL;
1589} 1737}
1590 1738
… …
1836 if (expect_false (ev_is_active (w))) 1984 if (expect_false (ev_is_active (w)))
1837 return; 1985 return;
1838 1986
1839 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1987 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1840 1988
1989 evpipe_init (EV_A);
1990
1841 { 1991 {
1842#ifndef _WIN32 1992#ifndef _WIN32
1843 sigset_t full, prev; 1993 sigset_t full, prev;
1844 sigfillset (&full); 1994 sigfillset (&full);
1845 sigprocmask (SIG_SETMASK, &full, &prev); 1995 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1856 wlist_add (&signals [w->signum - 1].head, (WL)w); 2006 wlist_add (&signals [w->signum - 1].head, (WL)w);
1857 2007
1858 if (!((WL)w)->next) 2008 if (!((WL)w)->next)
1859 { 2009 {
1860#if _WIN32 2010#if _WIN32
1861 signal (w->signum, sighandler); 2011 signal (w->signum, ev_sighandler);
1862#else 2012#else
1863 struct sigaction sa; 2013 struct sigaction sa;
1864 sa.sa_handler = sighandler; 2014 sa.sa_handler = ev_sighandler;
1865 sigfillset (&sa.sa_mask); 2015 sigfillset (&sa.sa_mask);
1866 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2016 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1867 sigaction (w->signum, &sa, 0); 2017 sigaction (w->signum, &sa, 0);
1868#endif 2018#endif
1869 } 2019 }
… …
2264 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2414 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2265 2415
2266 if (ev_cb (w)) 2416 if (ev_cb (w))
2267 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2417 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2268 else 2418 else
2269 ev_embed_sweep (loop, w); 2419 ev_loop (w->other, EVLOOP_NONBLOCK);
2270} 2420}
2271 2421
2272static void 2422static void
2273embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2423embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2274{ 2424{
2275 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2425 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2276 2426
2277 fd_reify (w->other); 2427 {
2428 struct ev_loop *loop = w->other;
2429
2430 while (fdchangecnt)
2431 {
2432 fd_reify (EV_A);
2433 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2434 }
2435 }
2278} 2436}
2437
2438#if 0
2439static void
2440embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2441{
2442 ev_idle_stop (EV_A_ idle);
2443}
2444#endif
2279 2445
2280void 2446void
2281ev_embed_start (EV_P_ ev_embed *w) 2447ev_embed_start (EV_P_ ev_embed *w)
2282{ 2448{
2283 if (expect_false (ev_is_active (w))) 2449 if (expect_false (ev_is_active (w)))
… …
2294 2460
2295 ev_prepare_init (&w->prepare, embed_prepare_cb); 2461 ev_prepare_init (&w->prepare, embed_prepare_cb);
2296 ev_set_priority (&w->prepare, EV_MINPRI); 2462 ev_set_priority (&w->prepare, EV_MINPRI);
2297 ev_prepare_start (EV_A_ &w->prepare); 2463 ev_prepare_start (EV_A_ &w->prepare);
2298 2464
2465 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2466
2299 ev_start (EV_A_ (W)w, 1); 2467 ev_start (EV_A_ (W)w, 1);
2300} 2468}
2301 2469
2302void 2470void
2303ev_embed_stop (EV_P_ ev_embed *w) 2471ev_embed_stop (EV_P_ ev_embed *w)
… …
2340 2508
2341 ev_stop (EV_A_ (W)w); 2509 ev_stop (EV_A_ (W)w);
2342} 2510}
2343#endif 2511#endif
2344 2512
2513#if EV_ASYNC_ENABLE
2514void
2515ev_async_start (EV_P_ ev_async *w)
2516{
2517 if (expect_false (ev_is_active (w)))
2518 return;
2519
2520 evpipe_init (EV_A);
2521
2522 ev_start (EV_A_ (W)w, ++asynccnt);
2523 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2524 asyncs [asynccnt - 1] = w;
2525}
2526
2527void
2528ev_async_stop (EV_P_ ev_async *w)
2529{
2530 clear_pending (EV_A_ (W)w);
2531 if (expect_false (!ev_is_active (w)))
2532 return;
2533
2534 {
2535 int active = ((W)w)->active;
2536 asyncs [active - 1] = asyncs [--asynccnt];
2537 ((W)asyncs [active - 1])->active = active;
2538 }
2539
2540 ev_stop (EV_A_ (W)w);
2541}
2542
2543void
2544ev_async_send (EV_P_ ev_async *w)
2545{
2546 w->sent = 1;
2547 evpipe_write (EV_A_ &gotasync);
2548}
2549#endif
2550
2345/*****************************************************************************/ 2551/*****************************************************************************/
2346 2552
2347struct ev_once 2553struct ev_once
2348{ 2554{
2349 ev_io io; 2555 ev_io io;

Diff Legend

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