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

Diff Legend

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