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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.337 by root, Wed Mar 10 09:18:24 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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 *
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
204#elif defined (MAXSIG) 207#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
215# define EV_NSIG 64 219# define EV_NSIG 65
216#endif 220#endif
217 221
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL 1
228# else 225# else
229# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
309# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
310# endif 307# endif
311#endif 308#endif
312 309
313#ifndef EV_USE_SIGNALFD 310#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 312# define EV_USE_SIGNALFD 1
316# else 313# else
317# define EV_USE_SIGNALFD 0 314# define EV_USE_SIGNALFD 0
318# endif 315# endif
319#endif 316#endif
350# endif 347# endif
351#endif 348#endif
352 349
353/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 350/* this block fixes any misconfiguration where we know we run into trouble otherwise */
354 351
352#ifdef _AIX
353/* AIX has a completely broken poll.h header */
354# undef EV_USE_POLL
355# define EV_USE_POLL 0
356#endif
357
355#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
358#endif 361#endif
359 362
393# include <stdint.h> 396# include <stdint.h>
394# ifndef EFD_NONBLOCK 397# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 398# define EFD_NONBLOCK O_NONBLOCK
396# endif 399# endif
397# ifndef EFD_CLOEXEC 400# ifndef EFD_CLOEXEC
401# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 402# define EFD_CLOEXEC O_CLOEXEC
403# else
404# define EFD_CLOEXEC 02000000
405# endif
399# endif 406# endif
400# ifdef __cplusplus 407# ifdef __cplusplus
401extern "C" { 408extern "C" {
402# endif 409# endif
403int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
404# ifdef __cplusplus 411# ifdef __cplusplus
405} 412}
406# endif 413# endif
407#endif 414#endif
408 415
409#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
410# include <sys/signalfd.h> 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
411#endif 421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags);
433
434struct signalfd_siginfo
435{
436 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)];
438};
439# ifdef __cplusplus
440}
441# endif
442#endif
443
412 444
413/**/ 445/**/
414 446
415#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
428 */ 460 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 462
431#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
432#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
433/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
434 465
435#if __GNUC__ >= 4 466#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
438#else 469#else
479 510
480#if EV_USE_MONOTONIC 511#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
482#endif 513#endif
483 514
515#ifndef EV_FD_TO_WIN32_HANDLE
516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
517#endif
518#ifndef EV_WIN32_HANDLE_TO_FD
519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
520#endif
521#ifndef EV_WIN32_CLOSE_FD
522# define EV_WIN32_CLOSE_FD(fd) close (fd)
523#endif
524
484#ifdef _WIN32 525#ifdef _WIN32
485# include "ev_win32.c" 526# include "ev_win32.c"
486#endif 527#endif
487 528
488/*****************************************************************************/ 529/*****************************************************************************/
530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
489 538
490static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
491 540
492void 541void
493ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
503 552
504 if (syserr_cb) 553 if (syserr_cb)
505 syserr_cb (msg); 554 syserr_cb (msg);
506 else 555 else
507 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
508 perror (msg); 565 perror (msg);
566#endif
509 abort (); 567 abort ();
510 } 568 }
511} 569}
512 570
513static void * 571static void *
514ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
515{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
516 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
517 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
518 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
519 */ 580 */
520 581
521 if (size) 582 if (size)
522 return realloc (ptr, size); 583 return realloc (ptr, size);
523 584
524 free (ptr); 585 free (ptr);
525 return 0; 586 return 0;
587#endif
526} 588}
527 589
528static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
529 591
530void 592void
538{ 600{
539 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
540 602
541 if (!ptr && size) 603 if (!ptr && size)
542 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
544 abort (); 610 abort ();
545 } 611 }
546 612
547 return ptr; 613 return ptr;
548} 614}
825} 891}
826 892
827/*****************************************************************************/ 893/*****************************************************************************/
828 894
829inline_speed void 895inline_speed void
830fd_event_nc (EV_P_ int fd, int revents) 896fd_event_nocheck (EV_P_ int fd, int revents)
831{ 897{
832 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
833 ev_io *w; 899 ev_io *w;
834 900
835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
847fd_event (EV_P_ int fd, int revents) 913fd_event (EV_P_ int fd, int revents)
848{ 914{
849 ANFD *anfd = anfds + fd; 915 ANFD *anfd = anfds + fd;
850 916
851 if (expect_true (!anfd->reify)) 917 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
853} 919}
854 920
855void 921void
856ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
857{ 923{
858 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
859 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
860} 926}
861 927
862/* make sure the external fd watch events are in-sync */ 928/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */ 929/* with the kernel/libev internal state */
864inline_size void 930inline_size void
879 945
880#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
881 if (events) 947 if (events)
882 { 948 {
883 unsigned long arg; 949 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
886 #else
887 anfd->handle = _get_osfhandle (fd);
888 #endif
889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 952 }
891#endif 953#endif
892 954
893 { 955 {
931 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
932 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
933 } 995 }
934} 996}
935 997
936/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
937inline_size int 999inline_size int
938fd_valid (int fd) 1000fd_valid (int fd)
939{ 1001{
940#ifdef _WIN32 1002#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 1004#else
943 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
944#endif 1006#endif
945} 1007}
946 1008
964 1026
965 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1028 if (anfds [fd].events)
967 { 1029 {
968 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
969 return; 1031 break;
970 } 1032 }
971} 1033}
972 1034
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1035/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1036static void noinline
981 { 1043 {
982 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
983 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
985 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
986} 1062}
987 1063
988/*****************************************************************************/ 1064/*****************************************************************************/
989 1065
990/* 1066/*
1064 1140
1065 for (;;) 1141 for (;;)
1066 { 1142 {
1067 int c = k << 1; 1143 int c = k << 1;
1068 1144
1069 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
1070 break; 1146 break;
1071 1147
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1148 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1149 ? 1 : 0;
1074 1150
1110 1186
1111/* move an element suitably so it is in a correct place */ 1187/* move an element suitably so it is in a correct place */
1112inline_size void 1188inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
1114{ 1190{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1191 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1192 upheap (heap, k);
1117 else 1193 else
1118 downheap (heap, N, k); 1194 downheap (heap, N, k);
1119} 1195}
1120 1196
1133/*****************************************************************************/ 1209/*****************************************************************************/
1134 1210
1135/* associate signal watchers to a signal signal */ 1211/* associate signal watchers to a signal signal */
1136typedef struct 1212typedef struct
1137{ 1213{
1214 EV_ATOMIC_T pending;
1215#if EV_MULTIPLICITY
1216 EV_P;
1217#endif
1138 WL head; 1218 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1219} ANSIG;
1141 1220
1142static ANSIG *signals; 1221static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1222
1147/*****************************************************************************/ 1223/*****************************************************************************/
1148 1224
1149/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1150/* this is not fork-safe */
1151inline_speed void
1152fd_intern (int fd)
1153{
1154#ifdef _WIN32
1155 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1157#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif
1161}
1162 1226
1163static void noinline 1227static void noinline
1164evpipe_init (EV_P) 1228evpipe_init (EV_P)
1165{ 1229{
1166 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1167 { 1231 {
1168#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL) 1234 if (evfd < 0 && errno == EINVAL)
1171 evfd = eventfd (0, 0); 1235 evfd = eventfd (0, 0);
1172 1236
1173 if (evfd >= 0) 1237 if (evfd >= 0)
1175 evpipe [0] = -1; 1239 evpipe [0] = -1;
1176 fd_intern (evfd); /* doing it twice doesn't hurt */ 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1177 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1178 } 1242 }
1179 else 1243 else
1180#endif 1244# endif
1181 { 1245 {
1182 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1183 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1184 1248
1185 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1196evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1197{ 1261{
1198 if (!*flag) 1262 if (!*flag)
1199 { 1263 {
1200 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1201 1266
1202 *flag = 1; 1267 *flag = 1;
1203 1268
1204#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1205 if (evfd >= 0) 1270 if (evfd >= 0)
1207 uint64_t counter = 1; 1272 uint64_t counter = 1;
1208 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1209 } 1274 }
1210 else 1275 else
1211#endif 1276#endif
1212 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1213 1278
1214 errno = old_errno; 1279 errno = old_errno;
1215 } 1280 }
1216} 1281}
1217 1282
1218/* called whenever the libev signal pipe */ 1283/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1284/* got some events (signal, async) */
1220static void 1285static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1287{
1288 int i;
1289
1223#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1291 if (evfd >= 0)
1225 { 1292 {
1226 uint64_t counter; 1293 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
1231 { 1298 {
1232 char dummy; 1299 char dummy;
1233 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1234 } 1301 }
1235 1302
1236 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1237 { 1304 {
1238 int signum; 1305 sig_pending = 0;
1239 gotsig = 0;
1240 1306
1241 for (signum = signalmax; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1310 }
1245 1311
1246#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1247 if (gotasync) 1313 if (async_pending)
1248 { 1314 {
1249 int i; 1315 async_pending = 0;
1250 gotasync = 0;
1251 1316
1252 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1254 { 1319 {
1255 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
1263 1328
1264static void 1329static void
1265ev_sighandler (int signum) 1330ev_sighandler (int signum)
1266{ 1331{
1267#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1333 EV_P = signals [signum - 1].loop;
1269#endif 1334#endif
1270 1335
1271#if _WIN32 1336#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1273#endif 1338#endif
1274 1339
1275 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1277} 1342}
1278 1343
1279void noinline 1344void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1281{ 1346{
1282 WL w; 1347 WL w;
1283 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1284#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1355 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1357
1288 --signum; 1358 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1359 return;
1360#endif
1292 1361
1293 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1294 1363
1295 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1366}
1298 1367
1299#if EV_USE_SIGNALFD 1368#if EV_USE_SIGNALFD
1300static void 1369static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1370sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1371{
1303 struct signalfd_siginfo si[4], *sip; 1372 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1373
1305 for (;;) 1374 for (;;)
1306 { 1375 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1376 ssize_t res = read (sigfd, si, sizeof (si));
1308 1377
1314 break; 1383 break;
1315 } 1384 }
1316} 1385}
1317#endif 1386#endif
1318 1387
1388#endif
1389
1319/*****************************************************************************/ 1390/*****************************************************************************/
1320 1391
1392#if EV_CHILD_ENABLE
1321static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1322
1323#ifndef _WIN32
1324 1394
1325static ev_signal childev; 1395static ev_signal childev;
1326 1396
1327#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1328# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1612 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1613 have_monotonic = 1;
1544 } 1614 }
1545#endif 1615#endif
1546 1616
1617 /* pid check not overridable via env */
1618#ifndef _WIN32
1619 if (flags & EVFLAG_FORKCHECK)
1620 curpid = getpid ();
1621#endif
1622
1623 if (!(flags & EVFLAG_NOENV)
1624 && !enable_secure ()
1625 && getenv ("LIBEV_FLAGS"))
1626 flags = atoi (getenv ("LIBEV_FLAGS"));
1627
1547 ev_rt_now = ev_time (); 1628 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1629 mn_now = get_clock ();
1549 now_floor = mn_now; 1630 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1631 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1632#if EV_MINIMAL < 2
1554 1635
1555 io_blocktime = 0.; 1636 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1557 backend = 0; 1638 backend = 0;
1558 backend_fd = -1; 1639 backend_fd = -1;
1559 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1560#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1561 fs_fd = -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1646#endif
1563#if EV_USE_SIGNALFD 1647#if EV_USE_SIGNALFD
1564 sigfd = -2; 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1649#endif
1566
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV)
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577 1650
1578 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1580 1653
1581#if EV_USE_PORT 1654#if EV_USE_PORT
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1668#endif
1596 1669
1597 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1598 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1601 } 1676 }
1602} 1677}
1603 1678
1604/* free up a loop structure */ 1679/* free up a loop structure */
1605static void noinline 1680static void noinline
1617 close (evfd); 1692 close (evfd);
1618#endif 1693#endif
1619 1694
1620 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1621 { 1696 {
1622 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1699 }
1625 } 1700 }
1626 1701
1627#if EV_USE_SIGNALFD 1702#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1703 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1704 close (sigfd);
1634 }
1635#endif 1705#endif
1636 1706
1637#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1639 close (fs_fd); 1709 close (fs_fd);
1709 1779
1710 if (ev_is_active (&pipe_w)) 1780 if (ev_is_active (&pipe_w))
1711 { 1781 {
1712 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1714 gotsig = 1; 1784 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1786 async_pending = 1;
1717#endif 1787#endif
1718 1788
1719 ev_ref (EV_A); 1789 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1790 ev_io_stop (EV_A_ &pipe_w);
1721 1791
1724 close (evfd); 1794 close (evfd);
1725#endif 1795#endif
1726 1796
1727 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1728 { 1798 {
1729 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1801 }
1732 1802
1803#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1804 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1805 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1806 pipecb (EV_A_ &pipe_w, EV_READ);
1807#endif
1736 } 1808 }
1737 1809
1738 postfork = 0; 1810 postfork = 0;
1739} 1811}
1740 1812
1741#if EV_MULTIPLICITY 1813#if EV_MULTIPLICITY
1742 1814
1743struct ev_loop * 1815struct ev_loop *
1744ev_loop_new (unsigned int flags) 1816ev_loop_new (unsigned int flags)
1745{ 1817{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1818 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1819
1748 memset (loop, 0, sizeof (struct ev_loop)); 1820 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1821 loop_init (EV_A_ flags);
1750 1822
1751 if (ev_backend (EV_A)) 1823 if (ev_backend (EV_A))
1752 return loop; 1824 return EV_A;
1753 1825
1754 return 0; 1826 return 0;
1755} 1827}
1756 1828
1757void 1829void
1853#if EV_ASYNC_ENABLE 1925#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 1926 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 1927 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 1928#endif
1857 1929
1930#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 1931 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 1932 array_verify (EV_A_ (W *)prepares, preparecnt);
1933#endif
1860 1934
1935#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 1936 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1937 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif
1863 1939
1864# if 0 1940# if 0
1941#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1942 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif
1867# endif 1945# endif
1868#endif 1946#endif
1869} 1947}
1870#endif 1948#endif
1871 1949
1878#endif 1956#endif
1879{ 1957{
1880 if (!ev_default_loop_ptr) 1958 if (!ev_default_loop_ptr)
1881 { 1959 {
1882#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1961 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1962#else
1885 ev_default_loop_ptr = 1; 1963 ev_default_loop_ptr = 1;
1886#endif 1964#endif
1887 1965
1888 loop_init (EV_A_ flags); 1966 loop_init (EV_A_ flags);
1889 1967
1890 if (ev_backend (EV_A)) 1968 if (ev_backend (EV_A))
1891 { 1969 {
1892#ifndef _WIN32 1970#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 1971 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 1972 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 1973 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1974 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 1975#endif
1905 1983
1906void 1984void
1907ev_default_destroy (void) 1985ev_default_destroy (void)
1908{ 1986{
1909#if EV_MULTIPLICITY 1987#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1988 EV_P = ev_default_loop_ptr;
1911#endif 1989#endif
1912 1990
1913 ev_default_loop_ptr = 0; 1991 ev_default_loop_ptr = 0;
1914 1992
1915#ifndef _WIN32 1993#if EV_CHILD_ENABLE
1916 ev_ref (EV_A); /* child watcher */ 1994 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev); 1995 ev_signal_stop (EV_A_ &childev);
1918#endif 1996#endif
1919 1997
1920 loop_destroy (EV_A); 1998 loop_destroy (EV_A);
1922 2000
1923void 2001void
1924ev_default_fork (void) 2002ev_default_fork (void)
1925{ 2003{
1926#if EV_MULTIPLICITY 2004#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 2005 EV_P = ev_default_loop_ptr;
1928#endif 2006#endif
1929 2007
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2008 postfork = 1; /* must be in line with ev_loop_fork */
1931} 2009}
1932 2010
2127 ANHE_at_cache (*he); 2205 ANHE_at_cache (*he);
2128 } 2206 }
2129} 2207}
2130 2208
2131/* fetch new monotonic and realtime times from the kernel */ 2209/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2210/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2211inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2212time_update (EV_P_ ev_tstamp max_block)
2135{ 2213{
2136#if EV_USE_MONOTONIC 2214#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2215 if (expect_true (have_monotonic))
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2310 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2311 EV_INVOKE_PENDING;
2234 } 2312 }
2235#endif 2313#endif
2236 2314
2315#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2316 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2317 if (expect_false (preparecnt))
2239 { 2318 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2319 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2320 EV_INVOKE_PENDING;
2242 } 2321 }
2322#endif
2243 2323
2244 if (expect_false (loop_done)) 2324 if (expect_false (loop_done))
2245 break; 2325 break;
2246 2326
2247 /* we might have forked, so reify kernel state if necessary */ 2327 /* we might have forked, so reify kernel state if necessary */
2320#if EV_IDLE_ENABLE 2400#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2401 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2402 idle_reify (EV_A);
2323#endif 2403#endif
2324 2404
2405#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2406 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2407 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2408 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2409#endif
2328 2410
2329 EV_INVOKE_PENDING; 2411 EV_INVOKE_PENDING;
2330 } 2412 }
2331 while (expect_true ( 2413 while (expect_true (
2332 activecnt 2414 activecnt
2398inline_size void 2480inline_size void
2399wlist_del (WL *head, WL elem) 2481wlist_del (WL *head, WL elem)
2400{ 2482{
2401 while (*head) 2483 while (*head)
2402 { 2484 {
2403 if (*head == elem) 2485 if (expect_true (*head == elem))
2404 { 2486 {
2405 *head = elem->next; 2487 *head = elem->next;
2406 return; 2488 break;
2407 } 2489 }
2408 2490
2409 head = &(*head)->next; 2491 head = &(*head)->next;
2410 } 2492 }
2411} 2493}
2471 2553
2472 if (expect_false (ev_is_active (w))) 2554 if (expect_false (ev_is_active (w)))
2473 return; 2555 return;
2474 2556
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2557 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2558 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2559
2478 EV_FREQUENT_CHECK; 2560 EV_FREQUENT_CHECK;
2479 2561
2480 ev_start (EV_A_ (W)w, 1); 2562 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2563 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2551 timers [active] = timers [timercnt + HEAP0]; 2633 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2634 adjustheap (timers, timercnt, active);
2553 } 2635 }
2554 } 2636 }
2555 2637
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2638 ev_at (w) -= mn_now;
2559 2639
2560 ev_stop (EV_A_ (W)w); 2640 ev_stop (EV_A_ (W)w);
2641
2642 EV_FREQUENT_CHECK;
2561} 2643}
2562 2644
2563void noinline 2645void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2646ev_timer_again (EV_P_ ev_timer *w)
2565{ 2647{
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2726 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2727 adjustheap (periodics, periodiccnt, active);
2646 } 2728 }
2647 } 2729 }
2648 2730
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2731 ev_stop (EV_A_ (W)w);
2732
2733 EV_FREQUENT_CHECK;
2652} 2734}
2653 2735
2654void noinline 2736void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2737ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2738{
2662 2744
2663#ifndef SA_RESTART 2745#ifndef SA_RESTART
2664# define SA_RESTART 0 2746# define SA_RESTART 0
2665#endif 2747#endif
2666 2748
2749#if EV_SIGNAL_ENABLE
2750
2667void noinline 2751void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2752ev_signal_start (EV_P_ ev_signal *w)
2669{ 2753{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2754 if (expect_false (ev_is_active (w)))
2674 return; 2755 return;
2675 2756
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2757 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2758
2759#if EV_MULTIPLICITY
2760 assert (("libev: a signal must not be attached to two different loops",
2761 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2762
2763 signals [w->signum - 1].loop = EV_A;
2764#endif
2677 2765
2678 EV_FREQUENT_CHECK; 2766 EV_FREQUENT_CHECK;
2679 2767
2680#if EV_USE_SIGNALFD 2768#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2769 if (sigfd == -2)
2703 sigaddset (&sigfd_set, w->signum); 2791 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2792 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2793
2706 signalfd (sigfd, &sigfd_set, 0); 2794 signalfd (sigfd, &sigfd_set, 0);
2707 } 2795 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2796#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2797
2730 ev_start (EV_A_ (W)w, 1); 2798 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2799 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2800
2733 if (!((WL)w)->next) 2801 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2802# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2803 if (sigfd < 0) /*TODO*/
2740# endif 2804# endif
2741 { 2805 {
2806# ifdef _WIN32
2807 evpipe_init (EV_A);
2808
2809 signal (w->signum, ev_sighandler);
2810# else
2742 struct sigaction sa = { }; 2811 struct sigaction sa;
2812
2813 evpipe_init (EV_A);
2814
2743 sa.sa_handler = ev_sighandler; 2815 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2816 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2817 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2818 sigaction (w->signum, &sa, 0);
2819
2820 sigemptyset (&sa.sa_mask);
2821 sigaddset (&sa.sa_mask, w->signum);
2822 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2823#endif
2747 } 2824 }
2748#endif
2749 }
2750 2825
2751 EV_FREQUENT_CHECK; 2826 EV_FREQUENT_CHECK;
2752} 2827}
2753 2828
2754void noinline 2829void noinline
2762 2837
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2838 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2839 ev_stop (EV_A_ (W)w);
2765 2840
2766 if (!signals [w->signum - 1].head) 2841 if (!signals [w->signum - 1].head)
2842 {
2843#if EV_MULTIPLICITY
2844 signals [w->signum - 1].loop = 0; /* unattach from signal */
2845#endif
2767#if EV_USE_SIGNALFD 2846#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2847 if (sigfd >= 0)
2769 { 2848 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2849 sigset_t ss;
2850
2851 sigemptyset (&ss);
2852 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2853 sigdelset (&sigfd_set, w->signum);
2854
2772 signalfd (sigfd, &sigfd_set, 0); 2855 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2856 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2857 }
2776 else 2858 else
2777#endif 2859#endif
2778 signal (w->signum, SIG_DFL); 2860 signal (w->signum, SIG_DFL);
2861 }
2779 2862
2780 EV_FREQUENT_CHECK; 2863 EV_FREQUENT_CHECK;
2781} 2864}
2865
2866#endif
2867
2868#if EV_CHILD_ENABLE
2782 2869
2783void 2870void
2784ev_child_start (EV_P_ ev_child *w) 2871ev_child_start (EV_P_ ev_child *w)
2785{ 2872{
2786#if EV_MULTIPLICITY 2873#if EV_MULTIPLICITY
2810 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2811 2898
2812 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2813} 2900}
2814 2901
2902#endif
2903
2815#if EV_STAT_ENABLE 2904#if EV_STAT_ENABLE
2816 2905
2817# ifdef _WIN32 2906# ifdef _WIN32
2818# undef lstat 2907# undef lstat
2819# define lstat(a,b) _stati64 (a,b) 2908# define lstat(a,b) _stati64 (a,b)
2824#define MIN_STAT_INTERVAL 0.1074891 2913#define MIN_STAT_INTERVAL 0.1074891
2825 2914
2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2915static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2827 2916
2828#if EV_USE_INOTIFY 2917#if EV_USE_INOTIFY
2829# define EV_INOTIFY_BUFSIZE 8192 2918
2919/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2920# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2830 2921
2831static void noinline 2922static void noinline
2832infy_add (EV_P_ ev_stat *w) 2923infy_add (EV_P_ ev_stat *w)
2833{ 2924{
2834 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2925 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2835 2926
2836 if (w->wd < 0) 2927 if (w->wd >= 0)
2928 {
2929 struct statfs sfs;
2930
2931 /* now local changes will be tracked by inotify, but remote changes won't */
2932 /* unless the filesystem is known to be local, we therefore still poll */
2933 /* also do poll on <2.6.25, but with normal frequency */
2934
2935 if (!fs_2625)
2936 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2937 else if (!statfs (w->path, &sfs)
2938 && (sfs.f_type == 0x1373 /* devfs */
2939 || sfs.f_type == 0xEF53 /* ext2/3 */
2940 || sfs.f_type == 0x3153464a /* jfs */
2941 || sfs.f_type == 0x52654973 /* reiser3 */
2942 || sfs.f_type == 0x01021994 /* tempfs */
2943 || sfs.f_type == 0x58465342 /* xfs */))
2944 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2945 else
2946 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 2947 }
2948 else
2949 {
2950 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2951 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2839 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2840 2952
2841 /* monitor some parent directory for speedup hints */ 2953 /* if path is not there, monitor some parent directory for speedup hints */
2842 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2954 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 2955 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2956 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 2957 {
2846 char path [4096]; 2958 char path [4096];
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 2975 }
2864 } 2976 }
2865 2977
2866 if (w->wd >= 0) 2978 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2979 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869 2980
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2981 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2982 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874
2875 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */)
2882 return;
2883
2884 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2885 ev_timer_again (EV_A_ &w->timer); 2983 ev_timer_again (EV_A_ &w->timer);
2886 } 2984 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 2985}
2888 2986
2889static void noinline 2987static void noinline
2890infy_del (EV_P_ ev_stat *w) 2988infy_del (EV_P_ ev_stat *w)
2891{ 2989{
2936 3034
2937static void 3035static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3036infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3037{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3038 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3039 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3040 int len = read (fs_fd, buf, sizeof (buf));
2944 3041
2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3042 for (ofs = 0; ofs < len; )
3043 {
3044 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2946 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3045 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3046 ofs += sizeof (struct inotify_event) + ev->len;
3047 }
3048}
3049
3050inline_size unsigned int
3051ev_linux_version (void)
3052{
3053 struct utsname buf;
3054 unsigned int v;
3055 int i;
3056 char *p = buf.release;
3057
3058 if (uname (&buf))
3059 return 0;
3060
3061 for (i = 3+1; --i; )
3062 {
3063 unsigned int c = 0;
3064
3065 for (;;)
3066 {
3067 if (*p >= '0' && *p <= '9')
3068 c = c * 10 + *p++ - '0';
3069 else
3070 {
3071 p += *p == '.';
3072 break;
3073 }
3074 }
3075
3076 v = (v << 8) | c;
3077 }
3078
3079 return v;
2947} 3080}
2948 3081
2949inline_size void 3082inline_size void
2950check_2625 (EV_P) 3083ev_check_2625 (EV_P)
2951{ 3084{
2952 /* kernels < 2.6.25 are borked 3085 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3086 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */ 3087 */
2955 struct utsname buf; 3088 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3089 return;
2960 3090
2961 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2962 return;
2963
2964 if (major < 2
2965 || (major == 2 && minor < 6)
2966 || (major == 2 && minor == 6 && micro < 25))
2967 return;
2968
2969 fs_2625 = 1; 3091 fs_2625 = 1;
3092}
3093
3094inline_size int
3095infy_newfd (void)
3096{
3097#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3098 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3099 if (fd >= 0)
3100 return fd;
3101#endif
3102 return inotify_init ();
2970} 3103}
2971 3104
2972inline_size void 3105inline_size void
2973infy_init (EV_P) 3106infy_init (EV_P)
2974{ 3107{
2975 if (fs_fd != -2) 3108 if (fs_fd != -2)
2976 return; 3109 return;
2977 3110
2978 fs_fd = -1; 3111 fs_fd = -1;
2979 3112
2980 check_2625 (EV_A); 3113 ev_check_2625 (EV_A);
2981 3114
2982 fs_fd = inotify_init (); 3115 fs_fd = infy_newfd ();
2983 3116
2984 if (fs_fd >= 0) 3117 if (fs_fd >= 0)
2985 { 3118 {
3119 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3120 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3121 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3122 ev_io_start (EV_A_ &fs_w);
3123 ev_unref (EV_A);
2989 } 3124 }
2990} 3125}
2991 3126
2992inline_size void 3127inline_size void
2993infy_fork (EV_P) 3128infy_fork (EV_P)
2995 int slot; 3130 int slot;
2996 3131
2997 if (fs_fd < 0) 3132 if (fs_fd < 0)
2998 return; 3133 return;
2999 3134
3135 ev_ref (EV_A);
3136 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3137 close (fs_fd);
3001 fs_fd = inotify_init (); 3138 fs_fd = infy_newfd ();
3139
3140 if (fs_fd >= 0)
3141 {
3142 fd_intern (fs_fd);
3143 ev_io_set (&fs_w, fs_fd, EV_READ);
3144 ev_io_start (EV_A_ &fs_w);
3145 ev_unref (EV_A);
3146 }
3002 3147
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3004 { 3149 {
3005 WL w_ = fs_hash [slot].head; 3150 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3151 fs_hash [slot].head = 0;
3013 w->wd = -1; 3158 w->wd = -1;
3014 3159
3015 if (fs_fd >= 0) 3160 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3161 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3162 else
3163 {
3164 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3165 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3168 }
3019 } 3169 }
3020 } 3170 }
3021} 3171}
3022 3172
3023#endif 3173#endif
3040static void noinline 3190static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3191stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3192{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3193 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3194
3045 /* we copy this here each the time so that */ 3195 ev_statdata prev = w->attr;
3046 /* prev has the old value when the callback gets invoked */
3047 w->prev = w->attr;
3048 ev_stat_stat (EV_A_ w); 3196 ev_stat_stat (EV_A_ w);
3049 3197
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3198 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3199 if (
3052 w->prev.st_dev != w->attr.st_dev 3200 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3201 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3202 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3203 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3204 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3205 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3206 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3207 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3208 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3209 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3210 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3211 ) {
3212 /* we only update w->prev on actual differences */
3213 /* in case we test more often than invoke the callback, */
3214 /* to ensure that prev is always different to attr */
3215 w->prev = prev;
3216
3064 #if EV_USE_INOTIFY 3217 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3218 if (fs_fd >= 0)
3066 { 3219 {
3067 infy_del (EV_A_ w); 3220 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
3093 3246
3094 if (fs_fd >= 0) 3247 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
3096 else 3249 else
3097#endif 3250#endif
3251 {
3098 ev_timer_again (EV_A_ &w->timer); 3252 ev_timer_again (EV_A_ &w->timer);
3253 ev_unref (EV_A);
3254 }
3099 3255
3100 ev_start (EV_A_ (W)w, 1); 3256 ev_start (EV_A_ (W)w, 1);
3101 3257
3102 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
3103} 3259}
3112 EV_FREQUENT_CHECK; 3268 EV_FREQUENT_CHECK;
3113 3269
3114#if EV_USE_INOTIFY 3270#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3271 infy_del (EV_A_ w);
3116#endif 3272#endif
3273
3274 if (ev_is_active (&w->timer))
3275 {
3276 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3277 ev_timer_stop (EV_A_ &w->timer);
3278 }
3118 3279
3119 ev_stop (EV_A_ (W)w); 3280 ev_stop (EV_A_ (W)w);
3120 3281
3121 EV_FREQUENT_CHECK; 3282 EV_FREQUENT_CHECK;
3122} 3283}
3167 3328
3168 EV_FREQUENT_CHECK; 3329 EV_FREQUENT_CHECK;
3169} 3330}
3170#endif 3331#endif
3171 3332
3333#if EV_PREPARE_ENABLE
3172void 3334void
3173ev_prepare_start (EV_P_ ev_prepare *w) 3335ev_prepare_start (EV_P_ ev_prepare *w)
3174{ 3336{
3175 if (expect_false (ev_is_active (w))) 3337 if (expect_false (ev_is_active (w)))
3176 return; 3338 return;
3202 3364
3203 ev_stop (EV_A_ (W)w); 3365 ev_stop (EV_A_ (W)w);
3204 3366
3205 EV_FREQUENT_CHECK; 3367 EV_FREQUENT_CHECK;
3206} 3368}
3369#endif
3207 3370
3371#if EV_CHECK_ENABLE
3208void 3372void
3209ev_check_start (EV_P_ ev_check *w) 3373ev_check_start (EV_P_ ev_check *w)
3210{ 3374{
3211 if (expect_false (ev_is_active (w))) 3375 if (expect_false (ev_is_active (w)))
3212 return; 3376 return;
3238 3402
3239 ev_stop (EV_A_ (W)w); 3403 ev_stop (EV_A_ (W)w);
3240 3404
3241 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
3242} 3406}
3407#endif
3243 3408
3244#if EV_EMBED_ENABLE 3409#if EV_EMBED_ENABLE
3245void noinline 3410void noinline
3246ev_embed_sweep (EV_P_ ev_embed *w) 3411ev_embed_sweep (EV_P_ ev_embed *w)
3247{ 3412{
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3428embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3429{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3430 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3431
3267 { 3432 {
3268 struct ev_loop *loop = w->other; 3433 EV_P = w->other;
3269 3434
3270 while (fdchangecnt) 3435 while (fdchangecnt)
3271 { 3436 {
3272 fd_reify (EV_A); 3437 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3438 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3446 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3447
3283 ev_embed_stop (EV_A_ w); 3448 ev_embed_stop (EV_A_ w);
3284 3449
3285 { 3450 {
3286 struct ev_loop *loop = w->other; 3451 EV_P = w->other;
3287 3452
3288 ev_loop_fork (EV_A); 3453 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3454 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3455 }
3291 3456
3305{ 3470{
3306 if (expect_false (ev_is_active (w))) 3471 if (expect_false (ev_is_active (w)))
3307 return; 3472 return;
3308 3473
3309 { 3474 {
3310 struct ev_loop *loop = w->other; 3475 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3476 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3312 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3477 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3478 }
3314 3479
3315 EV_FREQUENT_CHECK; 3480 EV_FREQUENT_CHECK;
3342 3507
3343 ev_io_stop (EV_A_ &w->io); 3508 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3509 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3510 ev_fork_stop (EV_A_ &w->fork);
3346 3511
3512 ev_stop (EV_A_ (W)w);
3513
3347 EV_FREQUENT_CHECK; 3514 EV_FREQUENT_CHECK;
3348} 3515}
3349#endif 3516#endif
3350 3517
3351#if EV_FORK_ENABLE 3518#if EV_FORK_ENABLE
3427 3594
3428void 3595void
3429ev_async_send (EV_P_ ev_async *w) 3596ev_async_send (EV_P_ ev_async *w)
3430{ 3597{
3431 w->sent = 1; 3598 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3599 evpipe_write (EV_A_ &async_pending);
3433} 3600}
3434#endif 3601#endif
3435 3602
3436/*****************************************************************************/ 3603/*****************************************************************************/
3437 3604
3574 if (types & EV_ASYNC) 3741 if (types & EV_ASYNC)
3575 for (i = asynccnt; i--; ) 3742 for (i = asynccnt; i--; )
3576 cb (EV_A_ EV_ASYNC, asyncs [i]); 3743 cb (EV_A_ EV_ASYNC, asyncs [i]);
3577#endif 3744#endif
3578 3745
3746#if EV_PREPARE_ENABLE
3579 if (types & EV_PREPARE) 3747 if (types & EV_PREPARE)
3580 for (i = preparecnt; i--; ) 3748 for (i = preparecnt; i--; )
3581#if EV_EMBED_ENABLE 3749# if EV_EMBED_ENABLE
3582 if (ev_cb (prepares [i]) != embed_prepare_cb) 3750 if (ev_cb (prepares [i]) != embed_prepare_cb)
3583#endif 3751# endif
3584 cb (EV_A_ EV_PREPARE, prepares [i]); 3752 cb (EV_A_ EV_PREPARE, prepares [i]);
3753#endif
3585 3754
3755#if EV_CHECK_ENABLE
3586 if (types & EV_CHECK) 3756 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3757 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3758 cb (EV_A_ EV_CHECK, checks [i]);
3759#endif
3589 3760
3761#if EV_SIGNAL_ENABLE
3590 if (types & EV_SIGNAL) 3762 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3763 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3764 for (wl = signals [i].head; wl; )
3593 { 3765 {
3594 wn = wl->next; 3766 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3767 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3768 wl = wn;
3597 } 3769 }
3770#endif
3598 3771
3772#if EV_CHILD_ENABLE
3599 if (types & EV_CHILD) 3773 if (types & EV_CHILD)
3600 for (i = EV_PID_HASHSIZE; i--; ) 3774 for (i = EV_PID_HASHSIZE; i--; )
3601 for (wl = childs [i]; wl; ) 3775 for (wl = childs [i]; wl; )
3602 { 3776 {
3603 wn = wl->next; 3777 wn = wl->next;
3604 cb (EV_A_ EV_CHILD, wl); 3778 cb (EV_A_ EV_CHILD, wl);
3605 wl = wn; 3779 wl = wn;
3606 } 3780 }
3781#endif
3607/* EV_STAT 0x00001000 /* stat data changed */ 3782/* EV_STAT 0x00001000 /* stat data changed */
3608/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3783/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3609} 3784}
3610#endif 3785#endif
3611 3786

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines