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.220 by root, Sun Apr 6 09:53:17 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 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 */
273int eventfd (unsigned int initval, int flags);
244#endif 274#endif
245 275
246/**/ 276/**/
247 277
248/* 278/*
… …
291typedef ev_watcher_time *WT; 321typedef ev_watcher_time *WT;
292 322
293#if EV_USE_MONOTONIC 323#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 324/* 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 */ 325/* giving it a reasonably high chance of working on typical architetcures */
296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 326static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 327#endif
298 328
299#ifdef _WIN32 329#ifdef _WIN32
300# include "ev_win32.c" 330# include "ev_win32.c"
301#endif 331#endif
… …
451 ts.tv_sec = (time_t)delay; 481 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 482 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 483
454 nanosleep (&ts, 0); 484 nanosleep (&ts, 0);
455#elif defined(_WIN32) 485#elif defined(_WIN32)
456 Sleep (delay * 1e3); 486 Sleep ((unsigned long)(delay * 1e3));
457#else 487#else
458 struct timeval tv; 488 struct timeval tv;
459 489
460 tv.tv_sec = (time_t)delay; 490 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 491 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
600 630
601#if EV_SELECT_IS_WINSOCKET 631#if EV_SELECT_IS_WINSOCKET
602 if (events) 632 if (events)
603 { 633 {
604 unsigned long argp; 634 unsigned long argp;
635 #ifdef EV_FD_TO_WIN32_HANDLE
636 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
637 #else
605 anfd->handle = _get_osfhandle (fd); 638 anfd->handle = _get_osfhandle (fd);
639 #endif
606 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 640 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
607 } 641 }
608#endif 642#endif
609 643
610 { 644 {
… …
759/*****************************************************************************/ 793/*****************************************************************************/
760 794
761typedef struct 795typedef struct
762{ 796{
763 WL head; 797 WL head;
764 sig_atomic_t volatile gotsig; 798 EV_ATOMIC_T gotsig;
765} ANSIG; 799} ANSIG;
766 800
767static ANSIG *signals; 801static ANSIG *signals;
768static int signalmax; 802static int signalmax;
769 803
770static int sigpipe [2]; 804static EV_ATOMIC_T gotsig;
771static sig_atomic_t volatile gotsig;
772static ev_io sigev;
773 805
774void inline_size 806void inline_size
775signals_init (ANSIG *base, int count) 807signals_init (ANSIG *base, int count)
776{ 808{
777 while (count--) 809 while (count--)
… …
781 813
782 ++base; 814 ++base;
783 } 815 }
784} 816}
785 817
786static void 818/*****************************************************************************/
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 819
837void inline_speed 820void inline_speed
838fd_intern (int fd) 821fd_intern (int fd)
839{ 822{
840#ifdef _WIN32 823#ifdef _WIN32
… …
845 fcntl (fd, F_SETFL, O_NONBLOCK); 828 fcntl (fd, F_SETFL, O_NONBLOCK);
846#endif 829#endif
847} 830}
848 831
849static void noinline 832static void noinline
850siginit (EV_P) 833evpipe_init (EV_P)
851{ 834{
835 if (!ev_is_active (&pipeev))
836 {
837#if EV_USE_EVENTFD
838 if ((evfd = eventfd (0, 0)) >= 0)
839 {
840 evpipe [0] = -1;
841 fd_intern (evfd);
842 ev_io_set (&pipeev, evfd, EV_READ);
843 }
844 else
845#endif
846 {
847 while (pipe (evpipe))
848 syserr ("(libev) error creating signal/async pipe");
849
852 fd_intern (sigpipe [0]); 850 fd_intern (evpipe [0]);
853 fd_intern (sigpipe [1]); 851 fd_intern (evpipe [1]);
852 ev_io_set (&pipeev, evpipe [0], EV_READ);
853 }
854 854
855 ev_io_set (&sigev, sigpipe [0], EV_READ);
856 ev_io_start (EV_A_ &sigev); 855 ev_io_start (EV_A_ &pipeev);
857 ev_unref (EV_A); /* child watcher should not keep loop alive */ 856 ev_unref (EV_A); /* watcher should not keep loop alive */
857 }
858}
859
860void inline_size
861evpipe_write (EV_P_ EV_ATOMIC_T *flag)
862{
863 if (!*flag)
864 {
865 int old_errno = errno; /* save errno because write might clobber it */
866
867 *flag = 1;
868
869#if EV_USE_EVENTFD
870 if (evfd >= 0)
871 {
872 uint64_t counter = 1;
873 write (evfd, &counter, sizeof (uint64_t));
874 }
875 else
876#endif
877 write (evpipe [1], &old_errno, 1);
878
879 errno = old_errno;
880 }
881}
882
883static void
884pipecb (EV_P_ ev_io *iow, int revents)
885{
886#if EV_USE_EVENTFD
887 if (evfd >= 0)
888 {
889 uint64_t counter = 1;
890 read (evfd, &counter, sizeof (uint64_t));
891 }
892 else
893#endif
894 {
895 char dummy;
896 read (evpipe [0], &dummy, 1);
897 }
898
899 if (gotsig && ev_is_default_loop (EV_A))
900 {
901 int signum;
902 gotsig = 0;
903
904 for (signum = signalmax; signum--; )
905 if (signals [signum].gotsig)
906 ev_feed_signal_event (EV_A_ signum + 1);
907 }
908
909#if EV_ASYNC_ENABLE
910 if (gotasync)
911 {
912 int i;
913 gotasync = 0;
914
915 for (i = asynccnt; i--; )
916 if (asyncs [i]->sent)
917 {
918 asyncs [i]->sent = 0;
919 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
920 }
921 }
922#endif
858} 923}
859 924
860/*****************************************************************************/ 925/*****************************************************************************/
861 926
927static void
928ev_sighandler (int signum)
929{
930#if EV_MULTIPLICITY
931 struct ev_loop *loop = &default_loop_struct;
932#endif
933
934#if _WIN32
935 signal (signum, ev_sighandler);
936#endif
937
938 signals [signum - 1].gotsig = 1;
939 evpipe_write (EV_A_ &gotsig);
940}
941
942void noinline
943ev_feed_signal_event (EV_P_ int signum)
944{
945 WL w;
946
947#if EV_MULTIPLICITY
948 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
949#endif
950
951 --signum;
952
953 if (signum < 0 || signum >= signalmax)
954 return;
955
956 signals [signum].gotsig = 0;
957
958 for (w = signals [signum].head; w; w = w->next)
959 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
960}
961
962/*****************************************************************************/
963
862static WL childs [EV_PID_HASHSIZE]; 964static WL childs [EV_PID_HASHSIZE];
863 965
864#ifndef _WIN32 966#ifndef _WIN32
865 967
866static ev_signal childev; 968static ev_signal childev;
867 969
970#ifndef WIFCONTINUED
971# define WIFCONTINUED(status) 0
972#endif
973
868void inline_speed 974void inline_speed
869child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 975child_reap (EV_P_ int chain, int pid, int status)
870{ 976{
871 ev_child *w; 977 ev_child *w;
978 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
872 979
873 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 980 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
981 {
874 if (w->pid == pid || !w->pid) 982 if ((w->pid == pid || !w->pid)
983 && (!traced || (w->flags & 1)))
875 { 984 {
876 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 985 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
877 w->rpid = pid; 986 w->rpid = pid;
878 w->rstatus = status; 987 w->rstatus = status;
879 ev_feed_event (EV_A_ (W)w, EV_CHILD); 988 ev_feed_event (EV_A_ (W)w, EV_CHILD);
880 } 989 }
990 }
881} 991}
882 992
883#ifndef WCONTINUED 993#ifndef WCONTINUED
884# define WCONTINUED 0 994# define WCONTINUED 0
885#endif 995#endif
… …
894 if (!WCONTINUED 1004 if (!WCONTINUED
895 || errno != EINVAL 1005 || errno != EINVAL
896 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1006 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
897 return; 1007 return;
898 1008
899 /* make sure we are called again until all childs have been reaped */ 1009 /* make sure we are called again until all children have been reaped */
900 /* we need to do it this way so that the callback gets called before we continue */ 1010 /* we need to do it this way so that the callback gets called before we continue */
901 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1011 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
902 1012
903 child_reap (EV_A_ sw, pid, pid, status); 1013 child_reap (EV_A_ pid, pid, status);
904 if (EV_PID_HASHSIZE > 1) 1014 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 */ 1015 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
906} 1016}
907 1017
908#endif 1018#endif
909 1019
910/*****************************************************************************/ 1020/*****************************************************************************/
… …
1028 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1138 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1029 have_monotonic = 1; 1139 have_monotonic = 1;
1030 } 1140 }
1031#endif 1141#endif
1032 1142
1033 ev_rt_now = ev_time (); 1143 ev_rt_now = ev_time ();
1034 mn_now = get_clock (); 1144 mn_now = get_clock ();
1035 now_floor = mn_now; 1145 now_floor = mn_now;
1036 rtmn_diff = ev_rt_now - mn_now; 1146 rtmn_diff = ev_rt_now - mn_now;
1037 1147
1038 io_blocktime = 0.; 1148 io_blocktime = 0.;
1039 timeout_blocktime = 0.; 1149 timeout_blocktime = 0.;
1150 backend = 0;
1151 backend_fd = -1;
1152 gotasync = 0;
1153#if EV_USE_INOTIFY
1154 fs_fd = -2;
1155#endif
1040 1156
1041 /* pid check not overridable via env */ 1157 /* pid check not overridable via env */
1042#ifndef _WIN32 1158#ifndef _WIN32
1043 if (flags & EVFLAG_FORKCHECK) 1159 if (flags & EVFLAG_FORKCHECK)
1044 curpid = getpid (); 1160 curpid = getpid ();
… …
1050 flags = atoi (getenv ("LIBEV_FLAGS")); 1166 flags = atoi (getenv ("LIBEV_FLAGS"));
1051 1167
1052 if (!(flags & 0x0000ffffUL)) 1168 if (!(flags & 0x0000ffffUL))
1053 flags |= ev_recommended_backends (); 1169 flags |= ev_recommended_backends ();
1054 1170
1055 backend = 0;
1056 backend_fd = -1;
1057#if EV_USE_INOTIFY
1058 fs_fd = -2;
1059#endif
1060
1061#if EV_USE_PORT 1171#if EV_USE_PORT
1062 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1172 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1063#endif 1173#endif
1064#if EV_USE_KQUEUE 1174#if EV_USE_KQUEUE
1065 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1175 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1072#endif 1182#endif
1073#if EV_USE_SELECT 1183#if EV_USE_SELECT
1074 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1184 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1075#endif 1185#endif
1076 1186
1077 ev_init (&sigev, sigcb); 1187 ev_init (&pipeev, pipecb);
1078 ev_set_priority (&sigev, EV_MAXPRI); 1188 ev_set_priority (&pipeev, EV_MAXPRI);
1079 } 1189 }
1080} 1190}
1081 1191
1082static void noinline 1192static void noinline
1083loop_destroy (EV_P) 1193loop_destroy (EV_P)
1084{ 1194{
1085 int i; 1195 int i;
1196
1197 if (ev_is_active (&pipeev))
1198 {
1199 ev_ref (EV_A); /* signal watcher */
1200 ev_io_stop (EV_A_ &pipeev);
1201
1202#if EV_USE_EVENTFD
1203 if (evfd >= 0)
1204 close (evfd);
1205#endif
1206
1207 if (evpipe [0] >= 0)
1208 {
1209 close (evpipe [0]);
1210 close (evpipe [1]);
1211 }
1212 }
1086 1213
1087#if EV_USE_INOTIFY 1214#if EV_USE_INOTIFY
1088 if (fs_fd >= 0) 1215 if (fs_fd >= 0)
1089 close (fs_fd); 1216 close (fs_fd);
1090#endif 1217#endif
… …
1127#if EV_FORK_ENABLE 1254#if EV_FORK_ENABLE
1128 array_free (fork, EMPTY); 1255 array_free (fork, EMPTY);
1129#endif 1256#endif
1130 array_free (prepare, EMPTY); 1257 array_free (prepare, EMPTY);
1131 array_free (check, EMPTY); 1258 array_free (check, EMPTY);
1259#if EV_ASYNC_ENABLE
1260 array_free (async, EMPTY);
1261#endif
1132 1262
1133 backend = 0; 1263 backend = 0;
1134} 1264}
1135 1265
1136void inline_size infy_fork (EV_P); 1266void inline_size infy_fork (EV_P);
… …
1149#endif 1279#endif
1150#if EV_USE_INOTIFY 1280#if EV_USE_INOTIFY
1151 infy_fork (EV_A); 1281 infy_fork (EV_A);
1152#endif 1282#endif
1153 1283
1154 if (ev_is_active (&sigev)) 1284 if (ev_is_active (&pipeev))
1155 { 1285 {
1156 /* default loop */ 1286 /* this "locks" the handlers against writing to the pipe */
1287 /* while we modify the fd vars */
1288 gotsig = 1;
1289#if EV_ASYNC_ENABLE
1290 gotasync = 1;
1291#endif
1157 1292
1158 ev_ref (EV_A); 1293 ev_ref (EV_A);
1159 ev_io_stop (EV_A_ &sigev); 1294 ev_io_stop (EV_A_ &pipeev);
1295
1296#if EV_USE_EVENTFD
1297 if (evfd >= 0)
1298 close (evfd);
1299#endif
1300
1301 if (evpipe [0] >= 0)
1302 {
1160 close (sigpipe [0]); 1303 close (evpipe [0]);
1161 close (sigpipe [1]); 1304 close (evpipe [1]);
1305 }
1162 1306
1163 while (pipe (sigpipe))
1164 syserr ("(libev) error creating pipe");
1165
1166 siginit (EV_A); 1307 evpipe_init (EV_A);
1308 /* now iterate over everything, in case we missed something */
1309 pipecb (EV_A_ &pipeev, EV_READ);
1167 } 1310 }
1168 1311
1169 postfork = 0; 1312 postfork = 0;
1170} 1313}
1171 1314
… …
1193} 1336}
1194 1337
1195void 1338void
1196ev_loop_fork (EV_P) 1339ev_loop_fork (EV_P)
1197{ 1340{
1198 postfork = 1; 1341 postfork = 1; /* must be in line with ev_default_fork */
1199} 1342}
1200 1343
1201#endif 1344#endif
1202 1345
1203#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
… …
1206#else 1349#else
1207int 1350int
1208ev_default_loop (unsigned int flags) 1351ev_default_loop (unsigned int flags)
1209#endif 1352#endif
1210{ 1353{
1211 if (sigpipe [0] == sigpipe [1])
1212 if (pipe (sigpipe))
1213 return 0;
1214
1215 if (!ev_default_loop_ptr) 1354 if (!ev_default_loop_ptr)
1216 { 1355 {
1217#if EV_MULTIPLICITY 1356#if EV_MULTIPLICITY
1218 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1357 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1219#else 1358#else
… …
1222 1361
1223 loop_init (EV_A_ flags); 1362 loop_init (EV_A_ flags);
1224 1363
1225 if (ev_backend (EV_A)) 1364 if (ev_backend (EV_A))
1226 { 1365 {
1227 siginit (EV_A);
1228
1229#ifndef _WIN32 1366#ifndef _WIN32
1230 ev_signal_init (&childev, childcb, SIGCHLD); 1367 ev_signal_init (&childev, childcb, SIGCHLD);
1231 ev_set_priority (&childev, EV_MAXPRI); 1368 ev_set_priority (&childev, EV_MAXPRI);
1232 ev_signal_start (EV_A_ &childev); 1369 ev_signal_start (EV_A_ &childev);
1233 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1370 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1250#ifndef _WIN32 1387#ifndef _WIN32
1251 ev_ref (EV_A); /* child watcher */ 1388 ev_ref (EV_A); /* child watcher */
1252 ev_signal_stop (EV_A_ &childev); 1389 ev_signal_stop (EV_A_ &childev);
1253#endif 1390#endif
1254 1391
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); 1392 loop_destroy (EV_A);
1262} 1393}
1263 1394
1264void 1395void
1265ev_default_fork (void) 1396ev_default_fork (void)
… …
1267#if EV_MULTIPLICITY 1398#if EV_MULTIPLICITY
1268 struct ev_loop *loop = ev_default_loop_ptr; 1399 struct ev_loop *loop = ev_default_loop_ptr;
1269#endif 1400#endif
1270 1401
1271 if (backend) 1402 if (backend)
1272 postfork = 1; 1403 postfork = 1; /* must be in line with ev_loop_fork */
1273} 1404}
1274 1405
1275/*****************************************************************************/ 1406/*****************************************************************************/
1276 1407
1277void 1408void
… …
1486static int loop_done; 1617static int loop_done;
1487 1618
1488void 1619void
1489ev_loop (EV_P_ int flags) 1620ev_loop (EV_P_ int flags)
1490{ 1621{
1491 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1622 loop_done = EVUNLOOP_CANCEL;
1492 ? EVUNLOOP_ONE
1493 : EVUNLOOP_CANCEL;
1494 1623
1495 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1624 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1496 1625
1497 do 1626 do
1498 { 1627 {
… …
1594 /* queue check watchers, to be executed first */ 1723 /* queue check watchers, to be executed first */
1595 if (expect_false (checkcnt)) 1724 if (expect_false (checkcnt))
1596 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1725 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1597 1726
1598 call_pending (EV_A); 1727 call_pending (EV_A);
1599
1600 } 1728 }
1601 while (expect_true (activecnt && !loop_done)); 1729 while (expect_true (
1730 activecnt
1731 && !loop_done
1732 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1733 ));
1602 1734
1603 if (loop_done == EVUNLOOP_ONE) 1735 if (loop_done == EVUNLOOP_ONE)
1604 loop_done = EVUNLOOP_CANCEL; 1736 loop_done = EVUNLOOP_CANCEL;
1605} 1737}
1606 1738
… …
1852 if (expect_false (ev_is_active (w))) 1984 if (expect_false (ev_is_active (w)))
1853 return; 1985 return;
1854 1986
1855 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1987 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1856 1988
1989 evpipe_init (EV_A);
1990
1857 { 1991 {
1858#ifndef _WIN32 1992#ifndef _WIN32
1859 sigset_t full, prev; 1993 sigset_t full, prev;
1860 sigfillset (&full); 1994 sigfillset (&full);
1861 sigprocmask (SIG_SETMASK, &full, &prev); 1995 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1872 wlist_add (&signals [w->signum - 1].head, (WL)w); 2006 wlist_add (&signals [w->signum - 1].head, (WL)w);
1873 2007
1874 if (!((WL)w)->next) 2008 if (!((WL)w)->next)
1875 { 2009 {
1876#if _WIN32 2010#if _WIN32
1877 signal (w->signum, sighandler); 2011 signal (w->signum, ev_sighandler);
1878#else 2012#else
1879 struct sigaction sa; 2013 struct sigaction sa;
1880 sa.sa_handler = sighandler; 2014 sa.sa_handler = ev_sighandler;
1881 sigfillset (&sa.sa_mask); 2015 sigfillset (&sa.sa_mask);
1882 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2016 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1883 sigaction (w->signum, &sa, 0); 2017 sigaction (w->signum, &sa, 0);
1884#endif 2018#endif
1885 } 2019 }
… …
2374 2508
2375 ev_stop (EV_A_ (W)w); 2509 ev_stop (EV_A_ (W)w);
2376} 2510}
2377#endif 2511#endif
2378 2512
2513#if EV_ASYNC_ENABLE
2514void
2515ev_async_start (EV_P_ ev_async *w)
2516{
2517 if (expect_false (ev_is_active (w)))
2518 return;
2519
2520 evpipe_init (EV_A);
2521
2522 ev_start (EV_A_ (W)w, ++asynccnt);
2523 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2524 asyncs [asynccnt - 1] = w;
2525}
2526
2527void
2528ev_async_stop (EV_P_ ev_async *w)
2529{
2530 clear_pending (EV_A_ (W)w);
2531 if (expect_false (!ev_is_active (w)))
2532 return;
2533
2534 {
2535 int active = ((W)w)->active;
2536 asyncs [active - 1] = asyncs [--asynccnt];
2537 ((W)asyncs [active - 1])->active = active;
2538 }
2539
2540 ev_stop (EV_A_ (W)w);
2541}
2542
2543void
2544ev_async_send (EV_P_ ev_async *w)
2545{
2546 w->sent = 1;
2547 evpipe_write (EV_A_ &gotasync);
2548}
2549#endif
2550
2379/*****************************************************************************/ 2551/*****************************************************************************/
2380 2552
2381struct ev_once 2553struct ev_once
2382{ 2554{
2383 ev_io io; 2555 ev_io io;

Diff Legend

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