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

Comparing libev/ev.c (file contents):
Revision 1.201 by root, Thu Dec 27 08:00:18 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 modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
39 39
40#ifdef __cplusplus 40#ifdef __cplusplus
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44/* this big block deduces configuration from config.h */
44#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
45# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
46# include EV_CONFIG_H 47# include EV_CONFIG_H
47# else 48# else
48# include "config.h" 49# include "config.h"
… …
118# else 119# else
119# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
120# endif 121# endif
121# endif 122# endif
122 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
123#endif 132#endif
124 133
125#include <math.h> 134#include <math.h>
126#include <stdlib.h> 135#include <stdlib.h>
127#include <fcntl.h> 136#include <fcntl.h>
… …
152# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
153# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
154# endif 163# endif
155#endif 164#endif
156 165
157/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
158 167
159#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
160# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
161#endif 170#endif
162 171
… …
179# define EV_USE_POLL 1 188# define EV_USE_POLL 1
180# endif 189# endif
181#endif 190#endif
182 191
183#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
184# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
185#endif 198#endif
186 199
187#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
188# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
189#endif 202#endif
… …
191#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
192# define EV_USE_PORT 0 205# define EV_USE_PORT 0
193#endif 206#endif
194 207
195#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
196# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
197#endif 214#endif
198 215
199#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL 217# if EV_MINIMAL
201# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
210# else 227# else
211# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
212# endif 229# endif
213#endif 230#endif
214 231
215/**/ 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 */
216 241
217#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
218# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
219# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
220#endif 245#endif
… …
239# include <sys/inotify.h> 264# include <sys/inotify.h>
240#endif 265#endif
241 266
242#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
243# 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);
244#endif 275#endif
245 276
246/**/ 277/**/
247 278
248/* 279/*
… …
291typedef ev_watcher_time *WT; 322typedef ev_watcher_time *WT;
292 323
293#if EV_USE_MONOTONIC 324#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 325/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */ 326/* giving it a reasonably high chance of working on typical architetcures */
296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 327static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 328#endif
298 329
299#ifdef _WIN32 330#ifdef _WIN32
300# include "ev_win32.c" 331# include "ev_win32.c"
301#endif 332#endif
… …
451 ts.tv_sec = (time_t)delay; 482 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 483 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 484
454 nanosleep (&ts, 0); 485 nanosleep (&ts, 0);
455#elif defined(_WIN32) 486#elif defined(_WIN32)
456 Sleep (delay * 1e3); 487 Sleep ((unsigned long)(delay * 1e3));
457#else 488#else
458 struct timeval tv; 489 struct timeval tv;
459 490
460 tv.tv_sec = (time_t)delay; 491 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 492 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
763/*****************************************************************************/ 794/*****************************************************************************/
764 795
765typedef struct 796typedef struct
766{ 797{
767 WL head; 798 WL head;
768 sig_atomic_t volatile gotsig; 799 EV_ATOMIC_T gotsig;
769} ANSIG; 800} ANSIG;
770 801
771static ANSIG *signals; 802static ANSIG *signals;
772static int signalmax; 803static int signalmax;
773 804
774static int sigpipe [2]; 805static EV_ATOMIC_T gotsig;
775static sig_atomic_t volatile gotsig;
776static ev_io sigev;
777 806
778void inline_size 807void inline_size
779signals_init (ANSIG *base, int count) 808signals_init (ANSIG *base, int count)
780{ 809{
781 while (count--) 810 while (count--)
… …
785 814
786 ++base; 815 ++base;
787 } 816 }
788} 817}
789 818
790static void 819/*****************************************************************************/
791sighandler (int signum)
792{
793#if _WIN32
794 signal (signum, sighandler);
795#endif
796
797 signals [signum - 1].gotsig = 1;
798
799 if (!gotsig)
800 {
801 int old_errno = errno;
802 gotsig = 1;
803 write (sigpipe [1], &signum, 1);
804 errno = old_errno;
805 }
806}
807
808void noinline
809ev_feed_signal_event (EV_P_ int signum)
810{
811 WL w;
812
813#if EV_MULTIPLICITY
814 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
815#endif
816
817 --signum;
818
819 if (signum < 0 || signum >= signalmax)
820 return;
821
822 signals [signum].gotsig = 0;
823
824 for (w = signals [signum].head; w; w = w->next)
825 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
826}
827
828static void
829sigcb (EV_P_ ev_io *iow, int revents)
830{
831 int signum;
832
833 read (sigpipe [0], &revents, 1);
834 gotsig = 0;
835
836 for (signum = signalmax; signum--; )
837 if (signals [signum].gotsig)
838 ev_feed_signal_event (EV_A_ signum + 1);
839}
840 820
841void inline_speed 821void inline_speed
842fd_intern (int fd) 822fd_intern (int fd)
843{ 823{
844#ifdef _WIN32 824#ifdef _WIN32
… …
849 fcntl (fd, F_SETFL, O_NONBLOCK); 829 fcntl (fd, F_SETFL, O_NONBLOCK);
850#endif 830#endif
851} 831}
852 832
853static void noinline 833static void noinline
854siginit (EV_P) 834evpipe_init (EV_P)
855{ 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
856 fd_intern (sigpipe [0]); 851 fd_intern (evpipe [0]);
857 fd_intern (sigpipe [1]); 852 fd_intern (evpipe [1]);
853 ev_io_set (&pipeev, evpipe [0], EV_READ);
854 }
858 855
859 ev_io_set (&sigev, sigpipe [0], EV_READ);
860 ev_io_start (EV_A_ &sigev); 856 ev_io_start (EV_A_ &pipeev);
861 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
862} 924}
863 925
864/*****************************************************************************/ 926/*****************************************************************************/
865 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
866static WL childs [EV_PID_HASHSIZE]; 965static WL childs [EV_PID_HASHSIZE];
867 966
868#ifndef _WIN32 967#ifndef _WIN32
869 968
870static ev_signal childev; 969static ev_signal childev;
871 970
971#ifndef WIFCONTINUED
972# define WIFCONTINUED(status) 0
973#endif
974
872void inline_speed 975void inline_speed
873child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 976child_reap (EV_P_ int chain, int pid, int status)
874{ 977{
875 ev_child *w; 978 ev_child *w;
979 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
876 980
877 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 {
878 if (w->pid == pid || !w->pid) 983 if ((w->pid == pid || !w->pid)
984 && (!traced || (w->flags & 1)))
879 { 985 {
880 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 */
881 w->rpid = pid; 987 w->rpid = pid;
882 w->rstatus = status; 988 w->rstatus = status;
883 ev_feed_event (EV_A_ (W)w, EV_CHILD); 989 ev_feed_event (EV_A_ (W)w, EV_CHILD);
884 } 990 }
991 }
885} 992}
886 993
887#ifndef WCONTINUED 994#ifndef WCONTINUED
888# define WCONTINUED 0 995# define WCONTINUED 0
889#endif 996#endif
… …
898 if (!WCONTINUED 1005 if (!WCONTINUED
899 || errno != EINVAL 1006 || errno != EINVAL
900 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1007 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
901 return; 1008 return;
902 1009
903 /* 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 */
904 /* 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 */
905 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1012 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
906 1013
907 child_reap (EV_A_ sw, pid, pid, status); 1014 child_reap (EV_A_ pid, pid, status);
908 if (EV_PID_HASHSIZE > 1) 1015 if (EV_PID_HASHSIZE > 1)
909 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 */
910} 1017}
911 1018
912#endif 1019#endif
913 1020
914/*****************************************************************************/ 1021/*****************************************************************************/
… …
1032 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1139 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1033 have_monotonic = 1; 1140 have_monotonic = 1;
1034 } 1141 }
1035#endif 1142#endif
1036 1143
1037 ev_rt_now = ev_time (); 1144 ev_rt_now = ev_time ();
1038 mn_now = get_clock (); 1145 mn_now = get_clock ();
1039 now_floor = mn_now; 1146 now_floor = mn_now;
1040 rtmn_diff = ev_rt_now - mn_now; 1147 rtmn_diff = ev_rt_now - mn_now;
1041 1148
1042 io_blocktime = 0.; 1149 io_blocktime = 0.;
1043 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
1044 1157
1045 /* pid check not overridable via env */ 1158 /* pid check not overridable via env */
1046#ifndef _WIN32 1159#ifndef _WIN32
1047 if (flags & EVFLAG_FORKCHECK) 1160 if (flags & EVFLAG_FORKCHECK)
1048 curpid = getpid (); 1161 curpid = getpid ();
… …
1054 flags = atoi (getenv ("LIBEV_FLAGS")); 1167 flags = atoi (getenv ("LIBEV_FLAGS"));
1055 1168
1056 if (!(flags & 0x0000ffffUL)) 1169 if (!(flags & 0x0000ffffUL))
1057 flags |= ev_recommended_backends (); 1170 flags |= ev_recommended_backends ();
1058 1171
1059 backend = 0;
1060 backend_fd = -1;
1061#if EV_USE_INOTIFY
1062 fs_fd = -2;
1063#endif
1064
1065#if EV_USE_PORT 1172#if EV_USE_PORT
1066 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1173 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1067#endif 1174#endif
1068#if EV_USE_KQUEUE 1175#if EV_USE_KQUEUE
1069 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1176 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1076#endif 1183#endif
1077#if EV_USE_SELECT 1184#if EV_USE_SELECT
1078 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1185 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1079#endif 1186#endif
1080 1187
1081 ev_init (&sigev, sigcb); 1188 ev_init (&pipeev, pipecb);
1082 ev_set_priority (&sigev, EV_MAXPRI); 1189 ev_set_priority (&pipeev, EV_MAXPRI);
1083 } 1190 }
1084} 1191}
1085 1192
1086static void noinline 1193static void noinline
1087loop_destroy (EV_P) 1194loop_destroy (EV_P)
1088{ 1195{
1089 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 }
1090 1214
1091#if EV_USE_INOTIFY 1215#if EV_USE_INOTIFY
1092 if (fs_fd >= 0) 1216 if (fs_fd >= 0)
1093 close (fs_fd); 1217 close (fs_fd);
1094#endif 1218#endif
… …
1131#if EV_FORK_ENABLE 1255#if EV_FORK_ENABLE
1132 array_free (fork, EMPTY); 1256 array_free (fork, EMPTY);
1133#endif 1257#endif
1134 array_free (prepare, EMPTY); 1258 array_free (prepare, EMPTY);
1135 array_free (check, EMPTY); 1259 array_free (check, EMPTY);
1260#if EV_ASYNC_ENABLE
1261 array_free (async, EMPTY);
1262#endif
1136 1263
1137 backend = 0; 1264 backend = 0;
1138} 1265}
1139 1266
1140void inline_size infy_fork (EV_P); 1267void inline_size infy_fork (EV_P);
… …
1153#endif 1280#endif
1154#if EV_USE_INOTIFY 1281#if EV_USE_INOTIFY
1155 infy_fork (EV_A); 1282 infy_fork (EV_A);
1156#endif 1283#endif
1157 1284
1158 if (ev_is_active (&sigev)) 1285 if (ev_is_active (&pipeev))
1159 { 1286 {
1160 /* 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
1161 1293
1162 ev_ref (EV_A); 1294 ev_ref (EV_A);
1163 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 {
1164 close (sigpipe [0]); 1304 close (evpipe [0]);
1165 close (sigpipe [1]); 1305 close (evpipe [1]);
1306 }
1166 1307
1167 while (pipe (sigpipe))
1168 syserr ("(libev) error creating pipe");
1169
1170 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);
1171 } 1311 }
1172 1312
1173 postfork = 0; 1313 postfork = 0;
1174} 1314}
1175 1315
… …
1197} 1337}
1198 1338
1199void 1339void
1200ev_loop_fork (EV_P) 1340ev_loop_fork (EV_P)
1201{ 1341{
1202 postfork = 1; 1342 postfork = 1; /* must be in line with ev_default_fork */
1203} 1343}
1204 1344
1205#endif 1345#endif
1206 1346
1207#if EV_MULTIPLICITY 1347#if EV_MULTIPLICITY
… …
1210#else 1350#else
1211int 1351int
1212ev_default_loop (unsigned int flags) 1352ev_default_loop (unsigned int flags)
1213#endif 1353#endif
1214{ 1354{
1215 if (sigpipe [0] == sigpipe [1])
1216 if (pipe (sigpipe))
1217 return 0;
1218
1219 if (!ev_default_loop_ptr) 1355 if (!ev_default_loop_ptr)
1220 { 1356 {
1221#if EV_MULTIPLICITY 1357#if EV_MULTIPLICITY
1222 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1358 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1223#else 1359#else
… …
1226 1362
1227 loop_init (EV_A_ flags); 1363 loop_init (EV_A_ flags);
1228 1364
1229 if (ev_backend (EV_A)) 1365 if (ev_backend (EV_A))
1230 { 1366 {
1231 siginit (EV_A);
1232
1233#ifndef _WIN32 1367#ifndef _WIN32
1234 ev_signal_init (&childev, childcb, SIGCHLD); 1368 ev_signal_init (&childev, childcb, SIGCHLD);
1235 ev_set_priority (&childev, EV_MAXPRI); 1369 ev_set_priority (&childev, EV_MAXPRI);
1236 ev_signal_start (EV_A_ &childev); 1370 ev_signal_start (EV_A_ &childev);
1237 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1371 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1254#ifndef _WIN32 1388#ifndef _WIN32
1255 ev_ref (EV_A); /* child watcher */ 1389 ev_ref (EV_A); /* child watcher */
1256 ev_signal_stop (EV_A_ &childev); 1390 ev_signal_stop (EV_A_ &childev);
1257#endif 1391#endif
1258 1392
1259 ev_ref (EV_A); /* signal watcher */
1260 ev_io_stop (EV_A_ &sigev);
1261
1262 close (sigpipe [0]); sigpipe [0] = 0;
1263 close (sigpipe [1]); sigpipe [1] = 0;
1264
1265 loop_destroy (EV_A); 1393 loop_destroy (EV_A);
1266} 1394}
1267 1395
1268void 1396void
1269ev_default_fork (void) 1397ev_default_fork (void)
… …
1271#if EV_MULTIPLICITY 1399#if EV_MULTIPLICITY
1272 struct ev_loop *loop = ev_default_loop_ptr; 1400 struct ev_loop *loop = ev_default_loop_ptr;
1273#endif 1401#endif
1274 1402
1275 if (backend) 1403 if (backend)
1276 postfork = 1; 1404 postfork = 1; /* must be in line with ev_loop_fork */
1277} 1405}
1278 1406
1279/*****************************************************************************/ 1407/*****************************************************************************/
1280 1408
1281void 1409void
… …
1309{ 1437{
1310 while (timercnt && ((WT)timers [0])->at <= mn_now) 1438 while (timercnt && ((WT)timers [0])->at <= mn_now)
1311 { 1439 {
1312 ev_timer *w = (ev_timer *)timers [0]; 1440 ev_timer *w = (ev_timer *)timers [0];
1313 1441
1314 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1442 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1315 1443
1316 /* first reschedule or stop timer */ 1444 /* first reschedule or stop timer */
1317 if (w->repeat) 1445 if (w->repeat)
1318 { 1446 {
1319 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1447 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1490static int loop_done; 1618static int loop_done;
1491 1619
1492void 1620void
1493ev_loop (EV_P_ int flags) 1621ev_loop (EV_P_ int flags)
1494{ 1622{
1495 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1623 loop_done = EVUNLOOP_CANCEL;
1496 ? EVUNLOOP_ONE
1497 : EVUNLOOP_CANCEL;
1498 1624
1499 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 */
1500 1626
1501 do 1627 do
1502 { 1628 {
… …
1598 /* queue check watchers, to be executed first */ 1724 /* queue check watchers, to be executed first */
1599 if (expect_false (checkcnt)) 1725 if (expect_false (checkcnt))
1600 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1726 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1601 1727
1602 call_pending (EV_A); 1728 call_pending (EV_A);
1603
1604 } 1729 }
1605 while (expect_true (activecnt && !loop_done)); 1730 while (expect_true (
1731 activecnt
1732 && !loop_done
1733 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1734 ));
1606 1735
1607 if (loop_done == EVUNLOOP_ONE) 1736 if (loop_done == EVUNLOOP_ONE)
1608 loop_done = EVUNLOOP_CANCEL; 1737 loop_done = EVUNLOOP_CANCEL;
1609} 1738}
1610 1739
… …
1856 if (expect_false (ev_is_active (w))) 1985 if (expect_false (ev_is_active (w)))
1857 return; 1986 return;
1858 1987
1859 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));
1860 1989
1990 evpipe_init (EV_A);
1991
1861 { 1992 {
1862#ifndef _WIN32 1993#ifndef _WIN32
1863 sigset_t full, prev; 1994 sigset_t full, prev;
1864 sigfillset (&full); 1995 sigfillset (&full);
1865 sigprocmask (SIG_SETMASK, &full, &prev); 1996 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1876 wlist_add (&signals [w->signum - 1].head, (WL)w); 2007 wlist_add (&signals [w->signum - 1].head, (WL)w);
1877 2008
1878 if (!((WL)w)->next) 2009 if (!((WL)w)->next)
1879 { 2010 {
1880#if _WIN32 2011#if _WIN32
1881 signal (w->signum, sighandler); 2012 signal (w->signum, ev_sighandler);
1882#else 2013#else
1883 struct sigaction sa; 2014 struct sigaction sa;
1884 sa.sa_handler = sighandler; 2015 sa.sa_handler = ev_sighandler;
1885 sigfillset (&sa.sa_mask); 2016 sigfillset (&sa.sa_mask);
1886 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 */
1887 sigaction (w->signum, &sa, 0); 2018 sigaction (w->signum, &sa, 0);
1888#endif 2019#endif
1889 } 2020 }
… …
2378 2509
2379 ev_stop (EV_A_ (W)w); 2510 ev_stop (EV_A_ (W)w);
2380} 2511}
2381#endif 2512#endif
2382 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
2383/*****************************************************************************/ 2552/*****************************************************************************/
2384 2553
2385struct ev_once 2554struct ev_once
2386{ 2555{
2387 ev_io io; 2556 ev_io io;

Diff Legend

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