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

Comparing libev/ev.c (file contents):
Revision 1.199 by root, Tue Dec 25 07:05:45 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 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>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
244#endif 281#endif
245 282
246/**/ 283/**/
247 284
248/* 285/*
… …
291typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
292 329
293#if EV_USE_MONOTONIC 330#if EV_USE_MONOTONIC
294/* 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 */
295/* giving it a reasonably high chance of working on typical architetcures */ 332/* giving it a reasonably high chance of working on typical architetcures */
296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 334#endif
298 335
299#ifdef _WIN32 336#ifdef _WIN32
300# include "ev_win32.c" 337# include "ev_win32.c"
301#endif 338#endif
… …
451 ts.tv_sec = (time_t)delay; 488 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 489 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 490
454 nanosleep (&ts, 0); 491 nanosleep (&ts, 0);
455#elif defined(_WIN32) 492#elif defined(_WIN32)
456 Sleep (delay * 1e3); 493 Sleep ((unsigned long)(delay * 1e3));
457#else 494#else
458 struct timeval tv; 495 struct timeval tv;
459 496
460 tv.tv_sec = (time_t)delay; 497 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 498 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
600 637
601#if EV_SELECT_IS_WINSOCKET 638#if EV_SELECT_IS_WINSOCKET
602 if (events) 639 if (events)
603 { 640 {
604 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
605 anfd->handle = _get_osfhandle (fd); 645 anfd->handle = _get_osfhandle (fd);
646 #endif
606 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));
607 } 648 }
608#endif 649#endif
609 650
610 { 651 {
… …
759/*****************************************************************************/ 800/*****************************************************************************/
760 801
761typedef struct 802typedef struct
762{ 803{
763 WL head; 804 WL head;
764 sig_atomic_t volatile gotsig; 805 EV_ATOMIC_T gotsig;
765} ANSIG; 806} ANSIG;
766 807
767static ANSIG *signals; 808static ANSIG *signals;
768static int signalmax; 809static int signalmax;
769 810
770static int sigpipe [2]; 811static EV_ATOMIC_T gotsig;
771static sig_atomic_t volatile gotsig;
772static ev_io sigev;
773 812
774void inline_size 813void inline_size
775signals_init (ANSIG *base, int count) 814signals_init (ANSIG *base, int count)
776{ 815{
777 while (count--) 816 while (count--)
… …
781 820
782 ++base; 821 ++base;
783 } 822 }
784} 823}
785 824
786static void 825/*****************************************************************************/
787sighandler (int signum)
788{
789#if _WIN32
790 signal (signum, sighandler);
791#endif
792
793 signals [signum - 1].gotsig = 1;
794
795 if (!gotsig)
796 {
797 int old_errno = errno;
798 gotsig = 1;
799 write (sigpipe [1], &signum, 1);
800 errno = old_errno;
801 }
802}
803
804void noinline
805ev_feed_signal_event (EV_P_ int signum)
806{
807 WL w;
808
809#if EV_MULTIPLICITY
810 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
811#endif
812
813 --signum;
814
815 if (signum < 0 || signum >= signalmax)
816 return;
817
818 signals [signum].gotsig = 0;
819
820 for (w = signals [signum].head; w; w = w->next)
821 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
822}
823
824static void
825sigcb (EV_P_ ev_io *iow, int revents)
826{
827 int signum;
828
829 read (sigpipe [0], &revents, 1);
830 gotsig = 0;
831
832 for (signum = signalmax; signum--; )
833 if (signals [signum].gotsig)
834 ev_feed_signal_event (EV_A_ signum + 1);
835}
836 826
837void inline_speed 827void inline_speed
838fd_intern (int fd) 828fd_intern (int fd)
839{ 829{
840#ifdef _WIN32 830#ifdef _WIN32
… …
845 fcntl (fd, F_SETFL, O_NONBLOCK); 835 fcntl (fd, F_SETFL, O_NONBLOCK);
846#endif 836#endif
847} 837}
848 838
849static void noinline 839static void noinline
850siginit (EV_P) 840evpipe_init (EV_P)
851{ 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
852 fd_intern (sigpipe [0]); 857 fd_intern (evpipe [0]);
853 fd_intern (sigpipe [1]); 858 fd_intern (evpipe [1]);
859 ev_io_set (&pipeev, evpipe [0], EV_READ);
860 }
854 861
855 ev_io_set (&sigev, sigpipe [0], EV_READ);
856 ev_io_start (EV_A_ &sigev); 862 ev_io_start (EV_A_ &pipeev);
857 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
858} 930}
859 931
860/*****************************************************************************/ 932/*****************************************************************************/
861 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
862static WL childs [EV_PID_HASHSIZE]; 971static WL childs [EV_PID_HASHSIZE];
863 972
864#ifndef _WIN32 973#ifndef _WIN32
865 974
866static ev_signal childev; 975static ev_signal childev;
867 976
977#ifndef WIFCONTINUED
978# define WIFCONTINUED(status) 0
979#endif
980
868void inline_speed 981void inline_speed
869child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 982child_reap (EV_P_ int chain, int pid, int status)
870{ 983{
871 ev_child *w; 984 ev_child *w;
985 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
872 986
873 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 {
874 if (w->pid == pid || !w->pid) 989 if ((w->pid == pid || !w->pid)
990 && (!traced || (w->flags & 1)))
875 { 991 {
876 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 */
877 w->rpid = pid; 993 w->rpid = pid;
878 w->rstatus = status; 994 w->rstatus = status;
879 ev_feed_event (EV_A_ (W)w, EV_CHILD); 995 ev_feed_event (EV_A_ (W)w, EV_CHILD);
880 } 996 }
997 }
881} 998}
882 999
883#ifndef WCONTINUED 1000#ifndef WCONTINUED
884# define WCONTINUED 0 1001# define WCONTINUED 0
885#endif 1002#endif
… …
894 if (!WCONTINUED 1011 if (!WCONTINUED
895 || errno != EINVAL 1012 || errno != EINVAL
896 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1013 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
897 return; 1014 return;
898 1015
899 /* 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 */
900 /* 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 */
901 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1018 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
902 1019
903 child_reap (EV_A_ sw, pid, pid, status); 1020 child_reap (EV_A_ pid, pid, status);
904 if (EV_PID_HASHSIZE > 1) 1021 if (EV_PID_HASHSIZE > 1)
905 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 */
906} 1023}
907 1024
908#endif 1025#endif
909 1026
910/*****************************************************************************/ 1027/*****************************************************************************/
… …
1028 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1145 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1029 have_monotonic = 1; 1146 have_monotonic = 1;
1030 } 1147 }
1031#endif 1148#endif
1032 1149
1033 ev_rt_now = ev_time (); 1150 ev_rt_now = ev_time ();
1034 mn_now = get_clock (); 1151 mn_now = get_clock ();
1035 now_floor = mn_now; 1152 now_floor = mn_now;
1036 rtmn_diff = ev_rt_now - mn_now; 1153 rtmn_diff = ev_rt_now - mn_now;
1037 1154
1038 io_blocktime = 0.; 1155 io_blocktime = 0.;
1039 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
1040 1163
1041 /* pid check not overridable via env */ 1164 /* pid check not overridable via env */
1042#ifndef _WIN32 1165#ifndef _WIN32
1043 if (flags & EVFLAG_FORKCHECK) 1166 if (flags & EVFLAG_FORKCHECK)
1044 curpid = getpid (); 1167 curpid = getpid ();
… …
1050 flags = atoi (getenv ("LIBEV_FLAGS")); 1173 flags = atoi (getenv ("LIBEV_FLAGS"));
1051 1174
1052 if (!(flags & 0x0000ffffUL)) 1175 if (!(flags & 0x0000ffffUL))
1053 flags |= ev_recommended_backends (); 1176 flags |= ev_recommended_backends ();
1054 1177
1055 backend = 0;
1056 backend_fd = -1;
1057#if EV_USE_INOTIFY
1058 fs_fd = -2;
1059#endif
1060
1061#if EV_USE_PORT 1178#if EV_USE_PORT
1062 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1179 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1063#endif 1180#endif
1064#if EV_USE_KQUEUE 1181#if EV_USE_KQUEUE
1065 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1182 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1072#endif 1189#endif
1073#if EV_USE_SELECT 1190#if EV_USE_SELECT
1074 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1191 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1075#endif 1192#endif
1076 1193
1077 ev_init (&sigev, sigcb); 1194 ev_init (&pipeev, pipecb);
1078 ev_set_priority (&sigev, EV_MAXPRI); 1195 ev_set_priority (&pipeev, EV_MAXPRI);
1079 } 1196 }
1080} 1197}
1081 1198
1082static void noinline 1199static void noinline
1083loop_destroy (EV_P) 1200loop_destroy (EV_P)
1084{ 1201{
1085 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 }
1086 1220
1087#if EV_USE_INOTIFY 1221#if EV_USE_INOTIFY
1088 if (fs_fd >= 0) 1222 if (fs_fd >= 0)
1089 close (fs_fd); 1223 close (fs_fd);
1090#endif 1224#endif
… …
1127#if EV_FORK_ENABLE 1261#if EV_FORK_ENABLE
1128 array_free (fork, EMPTY); 1262 array_free (fork, EMPTY);
1129#endif 1263#endif
1130 array_free (prepare, EMPTY); 1264 array_free (prepare, EMPTY);
1131 array_free (check, EMPTY); 1265 array_free (check, EMPTY);
1266#if EV_ASYNC_ENABLE
1267 array_free (async, EMPTY);
1268#endif
1132 1269
1133 backend = 0; 1270 backend = 0;
1134} 1271}
1135 1272
1136void inline_size infy_fork (EV_P); 1273void inline_size infy_fork (EV_P);
… …
1149#endif 1286#endif
1150#if EV_USE_INOTIFY 1287#if EV_USE_INOTIFY
1151 infy_fork (EV_A); 1288 infy_fork (EV_A);
1152#endif 1289#endif
1153 1290
1154 if (ev_is_active (&sigev)) 1291 if (ev_is_active (&pipeev))
1155 { 1292 {
1156 /* 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
1157 1299
1158 ev_ref (EV_A); 1300 ev_ref (EV_A);
1159 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 {
1160 close (sigpipe [0]); 1310 close (evpipe [0]);
1161 close (sigpipe [1]); 1311 close (evpipe [1]);
1312 }
1162 1313
1163 while (pipe (sigpipe))
1164 syserr ("(libev) error creating pipe");
1165
1166 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);
1167 } 1317 }
1168 1318
1169 postfork = 0; 1319 postfork = 0;
1170} 1320}
1171 1321
… …
1193} 1343}
1194 1344
1195void 1345void
1196ev_loop_fork (EV_P) 1346ev_loop_fork (EV_P)
1197{ 1347{
1198 postfork = 1; 1348 postfork = 1; /* must be in line with ev_default_fork */
1199} 1349}
1200 1350
1201#endif 1351#endif
1202 1352
1203#if EV_MULTIPLICITY 1353#if EV_MULTIPLICITY
… …
1206#else 1356#else
1207int 1357int
1208ev_default_loop (unsigned int flags) 1358ev_default_loop (unsigned int flags)
1209#endif 1359#endif
1210{ 1360{
1211 if (sigpipe [0] == sigpipe [1])
1212 if (pipe (sigpipe))
1213 return 0;
1214
1215 if (!ev_default_loop_ptr) 1361 if (!ev_default_loop_ptr)
1216 { 1362 {
1217#if EV_MULTIPLICITY 1363#if EV_MULTIPLICITY
1218 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1364 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1219#else 1365#else
… …
1222 1368
1223 loop_init (EV_A_ flags); 1369 loop_init (EV_A_ flags);
1224 1370
1225 if (ev_backend (EV_A)) 1371 if (ev_backend (EV_A))
1226 { 1372 {
1227 siginit (EV_A);
1228
1229#ifndef _WIN32 1373#ifndef _WIN32
1230 ev_signal_init (&childev, childcb, SIGCHLD); 1374 ev_signal_init (&childev, childcb, SIGCHLD);
1231 ev_set_priority (&childev, EV_MAXPRI); 1375 ev_set_priority (&childev, EV_MAXPRI);
1232 ev_signal_start (EV_A_ &childev); 1376 ev_signal_start (EV_A_ &childev);
1233 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1377 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1250#ifndef _WIN32 1394#ifndef _WIN32
1251 ev_ref (EV_A); /* child watcher */ 1395 ev_ref (EV_A); /* child watcher */
1252 ev_signal_stop (EV_A_ &childev); 1396 ev_signal_stop (EV_A_ &childev);
1253#endif 1397#endif
1254 1398
1255 ev_ref (EV_A); /* signal watcher */
1256 ev_io_stop (EV_A_ &sigev);
1257
1258 close (sigpipe [0]); sigpipe [0] = 0;
1259 close (sigpipe [1]); sigpipe [1] = 0;
1260
1261 loop_destroy (EV_A); 1399 loop_destroy (EV_A);
1262} 1400}
1263 1401
1264void 1402void
1265ev_default_fork (void) 1403ev_default_fork (void)
… …
1267#if EV_MULTIPLICITY 1405#if EV_MULTIPLICITY
1268 struct ev_loop *loop = ev_default_loop_ptr; 1406 struct ev_loop *loop = ev_default_loop_ptr;
1269#endif 1407#endif
1270 1408
1271 if (backend) 1409 if (backend)
1272 postfork = 1; 1410 postfork = 1; /* must be in line with ev_loop_fork */
1273} 1411}
1274 1412
1275/*****************************************************************************/ 1413/*****************************************************************************/
1276 1414
1277void 1415void
… …
1486static int loop_done; 1624static int loop_done;
1487 1625
1488void 1626void
1489ev_loop (EV_P_ int flags) 1627ev_loop (EV_P_ int flags)
1490{ 1628{
1491 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1629 loop_done = EVUNLOOP_CANCEL;
1492 ? EVUNLOOP_ONE
1493 : EVUNLOOP_CANCEL;
1494 1630
1495 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 */
1496 1632
1497 do 1633 do
1498 { 1634 {
… …
1594 /* queue check watchers, to be executed first */ 1730 /* queue check watchers, to be executed first */
1595 if (expect_false (checkcnt)) 1731 if (expect_false (checkcnt))
1596 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1732 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1597 1733
1598 call_pending (EV_A); 1734 call_pending (EV_A);
1599
1600 } 1735 }
1601 while (expect_true (activecnt && !loop_done)); 1736 while (expect_true (
1737 activecnt
1738 && !loop_done
1739 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1740 ));
1602 1741
1603 if (loop_done == EVUNLOOP_ONE) 1742 if (loop_done == EVUNLOOP_ONE)
1604 loop_done = EVUNLOOP_CANCEL; 1743 loop_done = EVUNLOOP_CANCEL;
1605} 1744}
1606 1745
… …
1852 if (expect_false (ev_is_active (w))) 1991 if (expect_false (ev_is_active (w)))
1853 return; 1992 return;
1854 1993
1855 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));
1856 1995
1996 evpipe_init (EV_A);
1997
1857 { 1998 {
1858#ifndef _WIN32 1999#ifndef _WIN32
1859 sigset_t full, prev; 2000 sigset_t full, prev;
1860 sigfillset (&full); 2001 sigfillset (&full);
1861 sigprocmask (SIG_SETMASK, &full, &prev); 2002 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1872 wlist_add (&signals [w->signum - 1].head, (WL)w); 2013 wlist_add (&signals [w->signum - 1].head, (WL)w);
1873 2014
1874 if (!((WL)w)->next) 2015 if (!((WL)w)->next)
1875 { 2016 {
1876#if _WIN32 2017#if _WIN32
1877 signal (w->signum, sighandler); 2018 signal (w->signum, ev_sighandler);
1878#else 2019#else
1879 struct sigaction sa; 2020 struct sigaction sa;
1880 sa.sa_handler = sighandler; 2021 sa.sa_handler = ev_sighandler;
1881 sigfillset (&sa.sa_mask); 2022 sigfillset (&sa.sa_mask);
1882 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 */
1883 sigaction (w->signum, &sa, 0); 2024 sigaction (w->signum, &sa, 0);
1884#endif 2025#endif
1885 } 2026 }
… …
2374 2515
2375 ev_stop (EV_A_ (W)w); 2516 ev_stop (EV_A_ (W)w);
2376} 2517}
2377#endif 2518#endif
2378 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
2379/*****************************************************************************/ 2558/*****************************************************************************/
2380 2559
2381struct ev_once 2560struct ev_once
2382{ 2561{
2383 ev_io io; 2562 ev_io io;

Diff Legend

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