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

Comparing libev/ev.c (file contents):
Revision 1.200 by root, Wed Dec 26 08:06:09 2007 UTC vs.
Revision 1.226 by root, Fri Apr 18 17:16:44 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/*
… …
263# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
264# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
265#else 302#else
266# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
267# define noinline 304# define noinline
268# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
269# define inline 306# define inline
270# endif 307# endif
271#endif 308#endif
272 309
273#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
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
… …
323 perror (msg); 360 perror (msg);
324 abort (); 361 abort ();
325 } 362 }
326} 363}
327 364
365static void *
366ev_realloc_emul (void *ptr, long size)
367{
368 /* some systems, notably openbsd and darwin, fail to properly
369 * implement realloc (x, 0) (as required by both ansi c-98 and
370 * the single unix specification, so work around them here.
371 */
372
373 if (size)
374 return realloc (ptr, size);
375
376 free (ptr);
377 return 0;
378}
379
328static void *(*alloc)(void *ptr, long size); 380static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 381
330void 382void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 383ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 384{
333 alloc = cb; 385 alloc = cb;
334} 386}
335 387
336inline_speed void * 388inline_speed void *
337ev_realloc (void *ptr, long size) 389ev_realloc (void *ptr, long size)
338{ 390{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 391 ptr = alloc (ptr, size);
340 392
341 if (!ptr && size) 393 if (!ptr && size)
342 { 394 {
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 395 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
344 abort (); 396 abort ();
… …
451 ts.tv_sec = (time_t)delay; 503 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 504 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 505
454 nanosleep (&ts, 0); 506 nanosleep (&ts, 0);
455#elif defined(_WIN32) 507#elif defined(_WIN32)
456 Sleep (delay * 1e3); 508 Sleep ((unsigned long)(delay * 1e3));
457#else 509#else
458 struct timeval tv; 510 struct timeval tv;
459 511
460 tv.tv_sec = (time_t)delay; 512 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 513 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
763/*****************************************************************************/ 815/*****************************************************************************/
764 816
765typedef struct 817typedef struct
766{ 818{
767 WL head; 819 WL head;
768 sig_atomic_t volatile gotsig; 820 EV_ATOMIC_T gotsig;
769} ANSIG; 821} ANSIG;
770 822
771static ANSIG *signals; 823static ANSIG *signals;
772static int signalmax; 824static int signalmax;
773 825
774static int sigpipe [2]; 826static EV_ATOMIC_T gotsig;
775static sig_atomic_t volatile gotsig;
776static ev_io sigev;
777 827
778void inline_size 828void inline_size
779signals_init (ANSIG *base, int count) 829signals_init (ANSIG *base, int count)
780{ 830{
781 while (count--) 831 while (count--)
… …
785 835
786 ++base; 836 ++base;
787 } 837 }
788} 838}
789 839
790static void 840/*****************************************************************************/
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 841
841void inline_speed 842void inline_speed
842fd_intern (int fd) 843fd_intern (int fd)
843{ 844{
844#ifdef _WIN32 845#ifdef _WIN32
… …
849 fcntl (fd, F_SETFL, O_NONBLOCK); 850 fcntl (fd, F_SETFL, O_NONBLOCK);
850#endif 851#endif
851} 852}
852 853
853static void noinline 854static void noinline
854siginit (EV_P) 855evpipe_init (EV_P)
855{ 856{
857 if (!ev_is_active (&pipeev))
858 {
859#if EV_USE_EVENTFD
860 if ((evfd = eventfd (0, 0)) >= 0)
861 {
862 evpipe [0] = -1;
863 fd_intern (evfd);
864 ev_io_set (&pipeev, evfd, EV_READ);
865 }
866 else
867#endif
868 {
869 while (pipe (evpipe))
870 syserr ("(libev) error creating signal/async pipe");
871
856 fd_intern (sigpipe [0]); 872 fd_intern (evpipe [0]);
857 fd_intern (sigpipe [1]); 873 fd_intern (evpipe [1]);
874 ev_io_set (&pipeev, evpipe [0], EV_READ);
875 }
858 876
859 ev_io_set (&sigev, sigpipe [0], EV_READ);
860 ev_io_start (EV_A_ &sigev); 877 ev_io_start (EV_A_ &pipeev);
861 ev_unref (EV_A); /* child watcher should not keep loop alive */ 878 ev_unref (EV_A); /* watcher should not keep loop alive */
879 }
880}
881
882void inline_size
883evpipe_write (EV_P_ EV_ATOMIC_T *flag)
884{
885 if (!*flag)
886 {
887 int old_errno = errno; /* save errno because write might clobber it */
888
889 *flag = 1;
890
891#if EV_USE_EVENTFD
892 if (evfd >= 0)
893 {
894 uint64_t counter = 1;
895 write (evfd, &counter, sizeof (uint64_t));
896 }
897 else
898#endif
899 write (evpipe [1], &old_errno, 1);
900
901 errno = old_errno;
902 }
903}
904
905static void
906pipecb (EV_P_ ev_io *iow, int revents)
907{
908#if EV_USE_EVENTFD
909 if (evfd >= 0)
910 {
911 uint64_t counter = 1;
912 read (evfd, &counter, sizeof (uint64_t));
913 }
914 else
915#endif
916 {
917 char dummy;
918 read (evpipe [0], &dummy, 1);
919 }
920
921 if (gotsig && ev_is_default_loop (EV_A))
922 {
923 int signum;
924 gotsig = 0;
925
926 for (signum = signalmax; signum--; )
927 if (signals [signum].gotsig)
928 ev_feed_signal_event (EV_A_ signum + 1);
929 }
930
931#if EV_ASYNC_ENABLE
932 if (gotasync)
933 {
934 int i;
935 gotasync = 0;
936
937 for (i = asynccnt; i--; )
938 if (asyncs [i]->sent)
939 {
940 asyncs [i]->sent = 0;
941 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
942 }
943 }
944#endif
862} 945}
863 946
864/*****************************************************************************/ 947/*****************************************************************************/
865 948
949static void
950ev_sighandler (int signum)
951{
952#if EV_MULTIPLICITY
953 struct ev_loop *loop = &default_loop_struct;
954#endif
955
956#if _WIN32
957 signal (signum, ev_sighandler);
958#endif
959
960 signals [signum - 1].gotsig = 1;
961 evpipe_write (EV_A_ &gotsig);
962}
963
964void noinline
965ev_feed_signal_event (EV_P_ int signum)
966{
967 WL w;
968
969#if EV_MULTIPLICITY
970 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
971#endif
972
973 --signum;
974
975 if (signum < 0 || signum >= signalmax)
976 return;
977
978 signals [signum].gotsig = 0;
979
980 for (w = signals [signum].head; w; w = w->next)
981 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
982}
983
984/*****************************************************************************/
985
866static WL childs [EV_PID_HASHSIZE]; 986static WL childs [EV_PID_HASHSIZE];
867 987
868#ifndef _WIN32 988#ifndef _WIN32
869 989
870static ev_signal childev; 990static ev_signal childev;
871 991
992#ifndef WIFCONTINUED
993# define WIFCONTINUED(status) 0
994#endif
995
872void inline_speed 996void inline_speed
873child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 997child_reap (EV_P_ int chain, int pid, int status)
874{ 998{
875 ev_child *w; 999 ev_child *w;
1000 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
876 1001
877 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1002 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1003 {
878 if (w->pid == pid || !w->pid) 1004 if ((w->pid == pid || !w->pid)
1005 && (!traced || (w->flags & 1)))
879 { 1006 {
880 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1007 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; 1008 w->rpid = pid;
882 w->rstatus = status; 1009 w->rstatus = status;
883 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1010 ev_feed_event (EV_A_ (W)w, EV_CHILD);
884 } 1011 }
1012 }
885} 1013}
886 1014
887#ifndef WCONTINUED 1015#ifndef WCONTINUED
888# define WCONTINUED 0 1016# define WCONTINUED 0
889#endif 1017#endif
… …
898 if (!WCONTINUED 1026 if (!WCONTINUED
899 || errno != EINVAL 1027 || errno != EINVAL
900 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1028 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
901 return; 1029 return;
902 1030
903 /* make sure we are called again until all childs have been reaped */ 1031 /* 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 */ 1032 /* 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); 1033 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
906 1034
907 child_reap (EV_A_ sw, pid, pid, status); 1035 child_reap (EV_A_ pid, pid, status);
908 if (EV_PID_HASHSIZE > 1) 1036 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 */ 1037 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
910} 1038}
911 1039
912#endif 1040#endif
913 1041
914/*****************************************************************************/ 1042/*****************************************************************************/
… …
1032 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1160 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1033 have_monotonic = 1; 1161 have_monotonic = 1;
1034 } 1162 }
1035#endif 1163#endif
1036 1164
1037 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1038 mn_now = get_clock (); 1166 mn_now = get_clock ();
1039 now_floor = mn_now; 1167 now_floor = mn_now;
1040 rtmn_diff = ev_rt_now - mn_now; 1168 rtmn_diff = ev_rt_now - mn_now;
1041 1169
1042 io_blocktime = 0.; 1170 io_blocktime = 0.;
1043 timeout_blocktime = 0.; 1171 timeout_blocktime = 0.;
1172 backend = 0;
1173 backend_fd = -1;
1174 gotasync = 0;
1175#if EV_USE_INOTIFY
1176 fs_fd = -2;
1177#endif
1044 1178
1045 /* pid check not overridable via env */ 1179 /* pid check not overridable via env */
1046#ifndef _WIN32 1180#ifndef _WIN32
1047 if (flags & EVFLAG_FORKCHECK) 1181 if (flags & EVFLAG_FORKCHECK)
1048 curpid = getpid (); 1182 curpid = getpid ();
… …
1051 if (!(flags & EVFLAG_NOENV) 1185 if (!(flags & EVFLAG_NOENV)
1052 && !enable_secure () 1186 && !enable_secure ()
1053 && getenv ("LIBEV_FLAGS")) 1187 && getenv ("LIBEV_FLAGS"))
1054 flags = atoi (getenv ("LIBEV_FLAGS")); 1188 flags = atoi (getenv ("LIBEV_FLAGS"));
1055 1189
1056 if (!(flags & 0x0000ffffUL)) 1190 if (!(flags & 0x0000ffffU))
1057 flags |= ev_recommended_backends (); 1191 flags |= ev_recommended_backends ();
1058
1059 backend = 0;
1060 backend_fd = -1;
1061#if EV_USE_INOTIFY
1062 fs_fd = -2;
1063#endif
1064 1192
1065#if EV_USE_PORT 1193#if EV_USE_PORT
1066 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1194 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1067#endif 1195#endif
1068#if EV_USE_KQUEUE 1196#if EV_USE_KQUEUE
… …
1076#endif 1204#endif
1077#if EV_USE_SELECT 1205#if EV_USE_SELECT
1078 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1206 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1079#endif 1207#endif
1080 1208
1081 ev_init (&sigev, sigcb); 1209 ev_init (&pipeev, pipecb);
1082 ev_set_priority (&sigev, EV_MAXPRI); 1210 ev_set_priority (&pipeev, EV_MAXPRI);
1083 } 1211 }
1084} 1212}
1085 1213
1086static void noinline 1214static void noinline
1087loop_destroy (EV_P) 1215loop_destroy (EV_P)
1088{ 1216{
1089 int i; 1217 int i;
1218
1219 if (ev_is_active (&pipeev))
1220 {
1221 ev_ref (EV_A); /* signal watcher */
1222 ev_io_stop (EV_A_ &pipeev);
1223
1224#if EV_USE_EVENTFD
1225 if (evfd >= 0)
1226 close (evfd);
1227#endif
1228
1229 if (evpipe [0] >= 0)
1230 {
1231 close (evpipe [0]);
1232 close (evpipe [1]);
1233 }
1234 }
1090 1235
1091#if EV_USE_INOTIFY 1236#if EV_USE_INOTIFY
1092 if (fs_fd >= 0) 1237 if (fs_fd >= 0)
1093 close (fs_fd); 1238 close (fs_fd);
1094#endif 1239#endif
… …
1131#if EV_FORK_ENABLE 1276#if EV_FORK_ENABLE
1132 array_free (fork, EMPTY); 1277 array_free (fork, EMPTY);
1133#endif 1278#endif
1134 array_free (prepare, EMPTY); 1279 array_free (prepare, EMPTY);
1135 array_free (check, EMPTY); 1280 array_free (check, EMPTY);
1281#if EV_ASYNC_ENABLE
1282 array_free (async, EMPTY);
1283#endif
1136 1284
1137 backend = 0; 1285 backend = 0;
1138} 1286}
1139 1287
1288#if EV_USE_INOTIFY
1140void inline_size infy_fork (EV_P); 1289void inline_size infy_fork (EV_P);
1290#endif
1141 1291
1142void inline_size 1292void inline_size
1143loop_fork (EV_P) 1293loop_fork (EV_P)
1144{ 1294{
1145#if EV_USE_PORT 1295#if EV_USE_PORT
… …
1153#endif 1303#endif
1154#if EV_USE_INOTIFY 1304#if EV_USE_INOTIFY
1155 infy_fork (EV_A); 1305 infy_fork (EV_A);
1156#endif 1306#endif
1157 1307
1158 if (ev_is_active (&sigev)) 1308 if (ev_is_active (&pipeev))
1159 { 1309 {
1160 /* default loop */ 1310 /* this "locks" the handlers against writing to the pipe */
1311 /* while we modify the fd vars */
1312 gotsig = 1;
1313#if EV_ASYNC_ENABLE
1314 gotasync = 1;
1315#endif
1161 1316
1162 ev_ref (EV_A); 1317 ev_ref (EV_A);
1163 ev_io_stop (EV_A_ &sigev); 1318 ev_io_stop (EV_A_ &pipeev);
1319
1320#if EV_USE_EVENTFD
1321 if (evfd >= 0)
1322 close (evfd);
1323#endif
1324
1325 if (evpipe [0] >= 0)
1326 {
1164 close (sigpipe [0]); 1327 close (evpipe [0]);
1165 close (sigpipe [1]); 1328 close (evpipe [1]);
1329 }
1166 1330
1167 while (pipe (sigpipe))
1168 syserr ("(libev) error creating pipe");
1169
1170 siginit (EV_A); 1331 evpipe_init (EV_A);
1332 /* now iterate over everything, in case we missed something */
1333 pipecb (EV_A_ &pipeev, EV_READ);
1171 } 1334 }
1172 1335
1173 postfork = 0; 1336 postfork = 0;
1174} 1337}
1175 1338
… …
1197} 1360}
1198 1361
1199void 1362void
1200ev_loop_fork (EV_P) 1363ev_loop_fork (EV_P)
1201{ 1364{
1202 postfork = 1; 1365 postfork = 1; /* must be in line with ev_default_fork */
1203} 1366}
1204 1367
1205#endif 1368#endif
1206 1369
1207#if EV_MULTIPLICITY 1370#if EV_MULTIPLICITY
… …
1210#else 1373#else
1211int 1374int
1212ev_default_loop (unsigned int flags) 1375ev_default_loop (unsigned int flags)
1213#endif 1376#endif
1214{ 1377{
1215 if (sigpipe [0] == sigpipe [1])
1216 if (pipe (sigpipe))
1217 return 0;
1218
1219 if (!ev_default_loop_ptr) 1378 if (!ev_default_loop_ptr)
1220 { 1379 {
1221#if EV_MULTIPLICITY 1380#if EV_MULTIPLICITY
1222 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1381 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1223#else 1382#else
… …
1226 1385
1227 loop_init (EV_A_ flags); 1386 loop_init (EV_A_ flags);
1228 1387
1229 if (ev_backend (EV_A)) 1388 if (ev_backend (EV_A))
1230 { 1389 {
1231 siginit (EV_A);
1232
1233#ifndef _WIN32 1390#ifndef _WIN32
1234 ev_signal_init (&childev, childcb, SIGCHLD); 1391 ev_signal_init (&childev, childcb, SIGCHLD);
1235 ev_set_priority (&childev, EV_MAXPRI); 1392 ev_set_priority (&childev, EV_MAXPRI);
1236 ev_signal_start (EV_A_ &childev); 1393 ev_signal_start (EV_A_ &childev);
1237 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1394 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1254#ifndef _WIN32 1411#ifndef _WIN32
1255 ev_ref (EV_A); /* child watcher */ 1412 ev_ref (EV_A); /* child watcher */
1256 ev_signal_stop (EV_A_ &childev); 1413 ev_signal_stop (EV_A_ &childev);
1257#endif 1414#endif
1258 1415
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); 1416 loop_destroy (EV_A);
1266} 1417}
1267 1418
1268void 1419void
1269ev_default_fork (void) 1420ev_default_fork (void)
… …
1271#if EV_MULTIPLICITY 1422#if EV_MULTIPLICITY
1272 struct ev_loop *loop = ev_default_loop_ptr; 1423 struct ev_loop *loop = ev_default_loop_ptr;
1273#endif 1424#endif
1274 1425
1275 if (backend) 1426 if (backend)
1276 postfork = 1; 1427 postfork = 1; /* must be in line with ev_loop_fork */
1277} 1428}
1278 1429
1279/*****************************************************************************/ 1430/*****************************************************************************/
1280 1431
1281void 1432void
… …
1490static int loop_done; 1641static int loop_done;
1491 1642
1492void 1643void
1493ev_loop (EV_P_ int flags) 1644ev_loop (EV_P_ int flags)
1494{ 1645{
1495 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1646 loop_done = EVUNLOOP_CANCEL;
1496 ? EVUNLOOP_ONE
1497 : EVUNLOOP_CANCEL;
1498 1647
1499 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1648 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1500 1649
1501 do 1650 do
1502 { 1651 {
… …
1598 /* queue check watchers, to be executed first */ 1747 /* queue check watchers, to be executed first */
1599 if (expect_false (checkcnt)) 1748 if (expect_false (checkcnt))
1600 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1749 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1601 1750
1602 call_pending (EV_A); 1751 call_pending (EV_A);
1603
1604 } 1752 }
1605 while (expect_true (activecnt && !loop_done)); 1753 while (expect_true (
1754 activecnt
1755 && !loop_done
1756 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1757 ));
1606 1758
1607 if (loop_done == EVUNLOOP_ONE) 1759 if (loop_done == EVUNLOOP_ONE)
1608 loop_done = EVUNLOOP_CANCEL; 1760 loop_done = EVUNLOOP_CANCEL;
1609} 1761}
1610 1762
… …
1856 if (expect_false (ev_is_active (w))) 2008 if (expect_false (ev_is_active (w)))
1857 return; 2009 return;
1858 2010
1859 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2011 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1860 2012
2013 evpipe_init (EV_A);
2014
1861 { 2015 {
1862#ifndef _WIN32 2016#ifndef _WIN32
1863 sigset_t full, prev; 2017 sigset_t full, prev;
1864 sigfillset (&full); 2018 sigfillset (&full);
1865 sigprocmask (SIG_SETMASK, &full, &prev); 2019 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1876 wlist_add (&signals [w->signum - 1].head, (WL)w); 2030 wlist_add (&signals [w->signum - 1].head, (WL)w);
1877 2031
1878 if (!((WL)w)->next) 2032 if (!((WL)w)->next)
1879 { 2033 {
1880#if _WIN32 2034#if _WIN32
1881 signal (w->signum, sighandler); 2035 signal (w->signum, ev_sighandler);
1882#else 2036#else
1883 struct sigaction sa; 2037 struct sigaction sa;
1884 sa.sa_handler = sighandler; 2038 sa.sa_handler = ev_sighandler;
1885 sigfillset (&sa.sa_mask); 2039 sigfillset (&sa.sa_mask);
1886 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2040 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1887 sigaction (w->signum, &sa, 0); 2041 sigaction (w->signum, &sa, 0);
1888#endif 2042#endif
1889 } 2043 }
… …
2378 2532
2379 ev_stop (EV_A_ (W)w); 2533 ev_stop (EV_A_ (W)w);
2380} 2534}
2381#endif 2535#endif
2382 2536
2537#if EV_ASYNC_ENABLE
2538void
2539ev_async_start (EV_P_ ev_async *w)
2540{
2541 if (expect_false (ev_is_active (w)))
2542 return;
2543
2544 evpipe_init (EV_A);
2545
2546 ev_start (EV_A_ (W)w, ++asynccnt);
2547 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2548 asyncs [asynccnt - 1] = w;
2549}
2550
2551void
2552ev_async_stop (EV_P_ ev_async *w)
2553{
2554 clear_pending (EV_A_ (W)w);
2555 if (expect_false (!ev_is_active (w)))
2556 return;
2557
2558 {
2559 int active = ((W)w)->active;
2560 asyncs [active - 1] = asyncs [--asynccnt];
2561 ((W)asyncs [active - 1])->active = active;
2562 }
2563
2564 ev_stop (EV_A_ (W)w);
2565}
2566
2567void
2568ev_async_send (EV_P_ ev_async *w)
2569{
2570 w->sent = 1;
2571 evpipe_write (EV_A_ &gotasync);
2572}
2573#endif
2574
2383/*****************************************************************************/ 2575/*****************************************************************************/
2384 2576
2385struct ev_once 2577struct ev_once
2386{ 2578{
2387 ev_io io; 2579 ev_io io;

Diff Legend

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