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

Comparing libev/ev.c (file contents):
Revision 1.198 by root, Sun Dec 23 04:45:51 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/*
… …
283typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
284 329
285#if EV_USE_MONOTONIC 330#if EV_USE_MONOTONIC
286/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 331/* sig_atomic_t is used to avoid per-thread variables or locking but still */
287/* giving it a reasonably high chance of working on typical architetcures */ 332/* giving it a reasonably high chance of working on typical architetcures */
288static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
289#endif 334#endif
290 335
291#ifdef _WIN32 336#ifdef _WIN32
292# include "ev_win32.c" 337# include "ev_win32.c"
293#endif 338#endif
… …
443 ts.tv_sec = (time_t)delay; 488 ts.tv_sec = (time_t)delay;
444 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 489 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
445 490
446 nanosleep (&ts, 0); 491 nanosleep (&ts, 0);
447#elif defined(_WIN32) 492#elif defined(_WIN32)
448 Sleep (delay * 1e3); 493 Sleep ((unsigned long)(delay * 1e3));
449#else 494#else
450 struct timeval tv; 495 struct timeval tv;
451 496
452 tv.tv_sec = (time_t)delay; 497 tv.tv_sec = (time_t)delay;
453 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 498 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
592 637
593#if EV_SELECT_IS_WINSOCKET 638#if EV_SELECT_IS_WINSOCKET
594 if (events) 639 if (events)
595 { 640 {
596 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
597 anfd->handle = _get_osfhandle (fd); 645 anfd->handle = _get_osfhandle (fd);
646 #endif
598 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));
599 } 648 }
600#endif 649#endif
601 650
602 { 651 {
… …
751/*****************************************************************************/ 800/*****************************************************************************/
752 801
753typedef struct 802typedef struct
754{ 803{
755 WL head; 804 WL head;
756 sig_atomic_t volatile gotsig; 805 EV_ATOMIC_T gotsig;
757} ANSIG; 806} ANSIG;
758 807
759static ANSIG *signals; 808static ANSIG *signals;
760static int signalmax; 809static int signalmax;
761 810
762static int sigpipe [2]; 811static EV_ATOMIC_T gotsig;
763static sig_atomic_t volatile gotsig;
764static ev_io sigev;
765 812
766void inline_size 813void inline_size
767signals_init (ANSIG *base, int count) 814signals_init (ANSIG *base, int count)
768{ 815{
769 while (count--) 816 while (count--)
… …
773 820
774 ++base; 821 ++base;
775 } 822 }
776} 823}
777 824
778static void 825/*****************************************************************************/
779sighandler (int signum)
780{
781#if _WIN32
782 signal (signum, sighandler);
783#endif
784
785 signals [signum - 1].gotsig = 1;
786
787 if (!gotsig)
788 {
789 int old_errno = errno;
790 gotsig = 1;
791 write (sigpipe [1], &signum, 1);
792 errno = old_errno;
793 }
794}
795
796void noinline
797ev_feed_signal_event (EV_P_ int signum)
798{
799 WL w;
800
801#if EV_MULTIPLICITY
802 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
803#endif
804
805 --signum;
806
807 if (signum < 0 || signum >= signalmax)
808 return;
809
810 signals [signum].gotsig = 0;
811
812 for (w = signals [signum].head; w; w = w->next)
813 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
814}
815
816static void
817sigcb (EV_P_ ev_io *iow, int revents)
818{
819 int signum;
820
821 read (sigpipe [0], &revents, 1);
822 gotsig = 0;
823
824 for (signum = signalmax; signum--; )
825 if (signals [signum].gotsig)
826 ev_feed_signal_event (EV_A_ signum + 1);
827}
828 826
829void inline_speed 827void inline_speed
830fd_intern (int fd) 828fd_intern (int fd)
831{ 829{
832#ifdef _WIN32 830#ifdef _WIN32
… …
837 fcntl (fd, F_SETFL, O_NONBLOCK); 835 fcntl (fd, F_SETFL, O_NONBLOCK);
838#endif 836#endif
839} 837}
840 838
841static void noinline 839static void noinline
842siginit (EV_P) 840evpipe_init (EV_P)
843{ 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
844 fd_intern (sigpipe [0]); 857 fd_intern (evpipe [0]);
845 fd_intern (sigpipe [1]); 858 fd_intern (evpipe [1]);
859 ev_io_set (&pipeev, evpipe [0], EV_READ);
860 }
846 861
847 ev_io_set (&sigev, sigpipe [0], EV_READ);
848 ev_io_start (EV_A_ &sigev); 862 ev_io_start (EV_A_ &pipeev);
849 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
850} 930}
851 931
852/*****************************************************************************/ 932/*****************************************************************************/
853 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
854static WL childs [EV_PID_HASHSIZE]; 971static WL childs [EV_PID_HASHSIZE];
855 972
856#ifndef _WIN32 973#ifndef _WIN32
857 974
858static ev_signal childev; 975static ev_signal childev;
859 976
977#ifndef WIFCONTINUED
978# define WIFCONTINUED(status) 0
979#endif
980
860void inline_speed 981void inline_speed
861child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 982child_reap (EV_P_ int chain, int pid, int status)
862{ 983{
863 ev_child *w; 984 ev_child *w;
985 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
864 986
865 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 {
866 if (w->pid == pid || !w->pid) 989 if ((w->pid == pid || !w->pid)
990 && (!traced || (w->flags & 1)))
867 { 991 {
868 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 */
869 w->rpid = pid; 993 w->rpid = pid;
870 w->rstatus = status; 994 w->rstatus = status;
871 ev_feed_event (EV_A_ (W)w, EV_CHILD); 995 ev_feed_event (EV_A_ (W)w, EV_CHILD);
872 } 996 }
997 }
873} 998}
874 999
875#ifndef WCONTINUED 1000#ifndef WCONTINUED
876# define WCONTINUED 0 1001# define WCONTINUED 0
877#endif 1002#endif
… …
886 if (!WCONTINUED 1011 if (!WCONTINUED
887 || errno != EINVAL 1012 || errno != EINVAL
888 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1013 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
889 return; 1014 return;
890 1015
891 /* 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 */
892 /* 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 */
893 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1018 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
894 1019
895 child_reap (EV_A_ sw, pid, pid, status); 1020 child_reap (EV_A_ pid, pid, status);
896 if (EV_PID_HASHSIZE > 1) 1021 if (EV_PID_HASHSIZE > 1)
897 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 */
898} 1023}
899 1024
900#endif 1025#endif
901 1026
902/*****************************************************************************/ 1027/*****************************************************************************/
… …
1020 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1145 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1021 have_monotonic = 1; 1146 have_monotonic = 1;
1022 } 1147 }
1023#endif 1148#endif
1024 1149
1025 ev_rt_now = ev_time (); 1150 ev_rt_now = ev_time ();
1026 mn_now = get_clock (); 1151 mn_now = get_clock ();
1027 now_floor = mn_now; 1152 now_floor = mn_now;
1028 rtmn_diff = ev_rt_now - mn_now; 1153 rtmn_diff = ev_rt_now - mn_now;
1029 1154
1030 io_blocktime = 0.; 1155 io_blocktime = 0.;
1031 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
1032 1163
1033 /* pid check not overridable via env */ 1164 /* pid check not overridable via env */
1034#ifndef _WIN32 1165#ifndef _WIN32
1035 if (flags & EVFLAG_FORKCHECK) 1166 if (flags & EVFLAG_FORKCHECK)
1036 curpid = getpid (); 1167 curpid = getpid ();
… …
1042 flags = atoi (getenv ("LIBEV_FLAGS")); 1173 flags = atoi (getenv ("LIBEV_FLAGS"));
1043 1174
1044 if (!(flags & 0x0000ffffUL)) 1175 if (!(flags & 0x0000ffffUL))
1045 flags |= ev_recommended_backends (); 1176 flags |= ev_recommended_backends ();
1046 1177
1047 backend = 0;
1048 backend_fd = -1;
1049#if EV_USE_INOTIFY
1050 fs_fd = -2;
1051#endif
1052
1053#if EV_USE_PORT 1178#if EV_USE_PORT
1054 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1179 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1055#endif 1180#endif
1056#if EV_USE_KQUEUE 1181#if EV_USE_KQUEUE
1057 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1182 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1064#endif 1189#endif
1065#if EV_USE_SELECT 1190#if EV_USE_SELECT
1066 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1191 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1067#endif 1192#endif
1068 1193
1069 ev_init (&sigev, sigcb); 1194 ev_init (&pipeev, pipecb);
1070 ev_set_priority (&sigev, EV_MAXPRI); 1195 ev_set_priority (&pipeev, EV_MAXPRI);
1071 } 1196 }
1072} 1197}
1073 1198
1074static void noinline 1199static void noinline
1075loop_destroy (EV_P) 1200loop_destroy (EV_P)
1076{ 1201{
1077 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 }
1078 1220
1079#if EV_USE_INOTIFY 1221#if EV_USE_INOTIFY
1080 if (fs_fd >= 0) 1222 if (fs_fd >= 0)
1081 close (fs_fd); 1223 close (fs_fd);
1082#endif 1224#endif
… …
1119#if EV_FORK_ENABLE 1261#if EV_FORK_ENABLE
1120 array_free (fork, EMPTY); 1262 array_free (fork, EMPTY);
1121#endif 1263#endif
1122 array_free (prepare, EMPTY); 1264 array_free (prepare, EMPTY);
1123 array_free (check, EMPTY); 1265 array_free (check, EMPTY);
1266#if EV_ASYNC_ENABLE
1267 array_free (async, EMPTY);
1268#endif
1124 1269
1125 backend = 0; 1270 backend = 0;
1126} 1271}
1127 1272
1128void inline_size infy_fork (EV_P); 1273void inline_size infy_fork (EV_P);
… …
1141#endif 1286#endif
1142#if EV_USE_INOTIFY 1287#if EV_USE_INOTIFY
1143 infy_fork (EV_A); 1288 infy_fork (EV_A);
1144#endif 1289#endif
1145 1290
1146 if (ev_is_active (&sigev)) 1291 if (ev_is_active (&pipeev))
1147 { 1292 {
1148 /* 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
1149 1299
1150 ev_ref (EV_A); 1300 ev_ref (EV_A);
1151 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 {
1152 close (sigpipe [0]); 1310 close (evpipe [0]);
1153 close (sigpipe [1]); 1311 close (evpipe [1]);
1312 }
1154 1313
1155 while (pipe (sigpipe))
1156 syserr ("(libev) error creating pipe");
1157
1158 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);
1159 } 1317 }
1160 1318
1161 postfork = 0; 1319 postfork = 0;
1162} 1320}
1163 1321
… …
1185} 1343}
1186 1344
1187void 1345void
1188ev_loop_fork (EV_P) 1346ev_loop_fork (EV_P)
1189{ 1347{
1190 postfork = 1; 1348 postfork = 1; /* must be in line with ev_default_fork */
1191} 1349}
1192 1350
1193#endif 1351#endif
1194 1352
1195#if EV_MULTIPLICITY 1353#if EV_MULTIPLICITY
… …
1198#else 1356#else
1199int 1357int
1200ev_default_loop (unsigned int flags) 1358ev_default_loop (unsigned int flags)
1201#endif 1359#endif
1202{ 1360{
1203 if (sigpipe [0] == sigpipe [1])
1204 if (pipe (sigpipe))
1205 return 0;
1206
1207 if (!ev_default_loop_ptr) 1361 if (!ev_default_loop_ptr)
1208 { 1362 {
1209#if EV_MULTIPLICITY 1363#if EV_MULTIPLICITY
1210 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1364 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1211#else 1365#else
… …
1214 1368
1215 loop_init (EV_A_ flags); 1369 loop_init (EV_A_ flags);
1216 1370
1217 if (ev_backend (EV_A)) 1371 if (ev_backend (EV_A))
1218 { 1372 {
1219 siginit (EV_A);
1220
1221#ifndef _WIN32 1373#ifndef _WIN32
1222 ev_signal_init (&childev, childcb, SIGCHLD); 1374 ev_signal_init (&childev, childcb, SIGCHLD);
1223 ev_set_priority (&childev, EV_MAXPRI); 1375 ev_set_priority (&childev, EV_MAXPRI);
1224 ev_signal_start (EV_A_ &childev); 1376 ev_signal_start (EV_A_ &childev);
1225 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1377 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1242#ifndef _WIN32 1394#ifndef _WIN32
1243 ev_ref (EV_A); /* child watcher */ 1395 ev_ref (EV_A); /* child watcher */
1244 ev_signal_stop (EV_A_ &childev); 1396 ev_signal_stop (EV_A_ &childev);
1245#endif 1397#endif
1246 1398
1247 ev_ref (EV_A); /* signal watcher */
1248 ev_io_stop (EV_A_ &sigev);
1249
1250 close (sigpipe [0]); sigpipe [0] = 0;
1251 close (sigpipe [1]); sigpipe [1] = 0;
1252
1253 loop_destroy (EV_A); 1399 loop_destroy (EV_A);
1254} 1400}
1255 1401
1256void 1402void
1257ev_default_fork (void) 1403ev_default_fork (void)
… …
1259#if EV_MULTIPLICITY 1405#if EV_MULTIPLICITY
1260 struct ev_loop *loop = ev_default_loop_ptr; 1406 struct ev_loop *loop = ev_default_loop_ptr;
1261#endif 1407#endif
1262 1408
1263 if (backend) 1409 if (backend)
1264 postfork = 1; 1410 postfork = 1; /* must be in line with ev_loop_fork */
1265} 1411}
1266 1412
1267/*****************************************************************************/ 1413/*****************************************************************************/
1268 1414
1269void 1415void
… …
1478static int loop_done; 1624static int loop_done;
1479 1625
1480void 1626void
1481ev_loop (EV_P_ int flags) 1627ev_loop (EV_P_ int flags)
1482{ 1628{
1483 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1629 loop_done = EVUNLOOP_CANCEL;
1484 ? EVUNLOOP_ONE
1485 : EVUNLOOP_CANCEL;
1486 1630
1487 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 */
1488 1632
1489 do 1633 do
1490 { 1634 {
… …
1586 /* queue check watchers, to be executed first */ 1730 /* queue check watchers, to be executed first */
1587 if (expect_false (checkcnt)) 1731 if (expect_false (checkcnt))
1588 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1732 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1589 1733
1590 call_pending (EV_A); 1734 call_pending (EV_A);
1591
1592 } 1735 }
1593 while (expect_true (activecnt && !loop_done)); 1736 while (expect_true (
1737 activecnt
1738 && !loop_done
1739 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1740 ));
1594 1741
1595 if (loop_done == EVUNLOOP_ONE) 1742 if (loop_done == EVUNLOOP_ONE)
1596 loop_done = EVUNLOOP_CANCEL; 1743 loop_done = EVUNLOOP_CANCEL;
1597} 1744}
1598 1745
… …
1844 if (expect_false (ev_is_active (w))) 1991 if (expect_false (ev_is_active (w)))
1845 return; 1992 return;
1846 1993
1847 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));
1848 1995
1996 evpipe_init (EV_A);
1997
1849 { 1998 {
1850#ifndef _WIN32 1999#ifndef _WIN32
1851 sigset_t full, prev; 2000 sigset_t full, prev;
1852 sigfillset (&full); 2001 sigfillset (&full);
1853 sigprocmask (SIG_SETMASK, &full, &prev); 2002 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1864 wlist_add (&signals [w->signum - 1].head, (WL)w); 2013 wlist_add (&signals [w->signum - 1].head, (WL)w);
1865 2014
1866 if (!((WL)w)->next) 2015 if (!((WL)w)->next)
1867 { 2016 {
1868#if _WIN32 2017#if _WIN32
1869 signal (w->signum, sighandler); 2018 signal (w->signum, ev_sighandler);
1870#else 2019#else
1871 struct sigaction sa; 2020 struct sigaction sa;
1872 sa.sa_handler = sighandler; 2021 sa.sa_handler = ev_sighandler;
1873 sigfillset (&sa.sa_mask); 2022 sigfillset (&sa.sa_mask);
1874 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 */
1875 sigaction (w->signum, &sa, 0); 2024 sigaction (w->signum, &sa, 0);
1876#endif 2025#endif
1877 } 2026 }
… …
2366 2515
2367 ev_stop (EV_A_ (W)w); 2516 ev_stop (EV_A_ (W)w);
2368} 2517}
2369#endif 2518#endif
2370 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
2371/*****************************************************************************/ 2558/*****************************************************************************/
2372 2559
2373struct ev_once 2560struct ev_once
2374{ 2561{
2375 ev_io io; 2562 ev_io io;

Diff Legend

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