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

Comparing libev/ev.c (file contents):
Revision 1.303 by root, Sun Jul 19 01:36:34 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 */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
219# define EV_NSIG 65
220#endif
190 221
191#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL 1
194# else 225# else
275# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
276# endif 307# endif
277#endif 308#endif
278 309
279#ifndef EV_USE_SIGNALFD 310#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 312# define EV_USE_SIGNALFD 1
282# else 313# else
283# define EV_USE_SIGNALFD 0 314# define EV_USE_SIGNALFD 0
284# endif 315# endif
285#endif 316#endif
316# endif 347# endif
317#endif 348#endif
318 349
319/* 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 */
320 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
321#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
324#endif 361#endif
325 362
359# include <stdint.h> 396# include <stdint.h>
360# ifndef EFD_NONBLOCK 397# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 398# define EFD_NONBLOCK O_NONBLOCK
362# endif 399# endif
363# ifndef EFD_CLOEXEC 400# ifndef EFD_CLOEXEC
401# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 402# define EFD_CLOEXEC O_CLOEXEC
403# else
404# define EFD_CLOEXEC 02000000
405# endif
365# endif 406# endif
366# ifdef __cplusplus 407# ifdef __cplusplus
367extern "C" { 408extern "C" {
368# endif 409# endif
369int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
370# ifdef __cplusplus 411# ifdef __cplusplus
371} 412}
372# endif 413# endif
373#endif 414#endif
374 415
375#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
376# 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
377#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
378 444
379/**/ 445/**/
380 446
381#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
394 */ 460 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 462
397#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) */
398#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) */
399/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
400 465
401#if __GNUC__ >= 4 466#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
404#else 469#else
445 510
446#if EV_USE_MONOTONIC 511#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
448#endif 513#endif
449 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
450#ifdef _WIN32 525#ifdef _WIN32
451# include "ev_win32.c" 526# include "ev_win32.c"
452#endif 527#endif
453 528
454/*****************************************************************************/ 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
455 538
456static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
457 540
458void 541void
459ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
469 552
470 if (syserr_cb) 553 if (syserr_cb)
471 syserr_cb (msg); 554 syserr_cb (msg);
472 else 555 else
473 { 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
474 perror (msg); 565 perror (msg);
566#endif
475 abort (); 567 abort ();
476 } 568 }
477} 569}
478 570
479static void * 571static void *
480ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
481{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
482 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
483 * 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
484 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
485 */ 580 */
486 581
487 if (size) 582 if (size)
488 return realloc (ptr, size); 583 return realloc (ptr, size);
489 584
490 free (ptr); 585 free (ptr);
491 return 0; 586 return 0;
587#endif
492} 588}
493 589
494static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
495 591
496void 592void
504{ 600{
505 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
506 602
507 if (!ptr && size) 603 if (!ptr && size)
508 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
509 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
510 abort (); 610 abort ();
511 } 611 }
512 612
513 return ptr; 613 return ptr;
514} 614}
791} 891}
792 892
793/*****************************************************************************/ 893/*****************************************************************************/
794 894
795inline_speed void 895inline_speed void
796fd_event_nc (EV_P_ int fd, int revents) 896fd_event_nocheck (EV_P_ int fd, int revents)
797{ 897{
798 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
799 ev_io *w; 899 ev_io *w;
800 900
801 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)
813fd_event (EV_P_ int fd, int revents) 913fd_event (EV_P_ int fd, int revents)
814{ 914{
815 ANFD *anfd = anfds + fd; 915 ANFD *anfd = anfds + fd;
816 916
817 if (expect_true (!anfd->reify)) 917 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
819} 919}
820 920
821void 921void
822ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
823{ 923{
824 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
825 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
826} 926}
827 927
828/* make sure the external fd watch events are in-sync */ 928/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */ 929/* with the kernel/libev internal state */
830inline_size void 930inline_size void
845 945
846#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
847 if (events) 947 if (events)
848 { 948 {
849 unsigned long arg; 949 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
852 #else
853 anfd->handle = _get_osfhandle (fd);
854 #endif
855 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));
856 } 952 }
857#endif 953#endif
858 954
859 { 955 {
897 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
898 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);
899 } 995 }
900} 996}
901 997
902/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
903inline_size int 999inline_size int
904fd_valid (int fd) 1000fd_valid (int fd)
905{ 1001{
906#ifdef _WIN32 1002#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 1004#else
909 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
910#endif 1006#endif
911} 1007}
912 1008
930 1026
931 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1028 if (anfds [fd].events)
933 { 1029 {
934 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
935 return; 1031 break;
936 } 1032 }
937} 1033}
938 1034
939/* 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 */
940static void noinline 1036static void noinline
947 { 1043 {
948 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
949 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
951 } 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
952} 1062}
953 1063
954/*****************************************************************************/ 1064/*****************************************************************************/
955 1065
956/* 1066/*
1030 1140
1031 for (;;) 1141 for (;;)
1032 { 1142 {
1033 int c = k << 1; 1143 int c = k << 1;
1034 1144
1035 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
1036 break; 1146 break;
1037 1147
1038 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])
1039 ? 1 : 0; 1149 ? 1 : 0;
1040 1150
1076 1186
1077/* move an element suitably so it is in a correct place */ 1187/* move an element suitably so it is in a correct place */
1078inline_size void 1188inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
1080{ 1190{
1081 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)]))
1082 upheap (heap, k); 1192 upheap (heap, k);
1083 else 1193 else
1084 downheap (heap, N, k); 1194 downheap (heap, N, k);
1085} 1195}
1086 1196
1099/*****************************************************************************/ 1209/*****************************************************************************/
1100 1210
1101/* associate signal watchers to a signal signal */ 1211/* associate signal watchers to a signal signal */
1102typedef struct 1212typedef struct
1103{ 1213{
1214 EV_ATOMIC_T pending;
1215#if EV_MULTIPLICITY
1216 EV_P;
1217#endif
1104 WL head; 1218 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1219} ANSIG;
1107 1220
1108static ANSIG *signals; 1221static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1222
1113/*****************************************************************************/ 1223/*****************************************************************************/
1114 1224
1115/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1116/* this is not fork-safe */
1117inline_speed void
1118fd_intern (int fd)
1119{
1120#ifdef _WIN32
1121 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1123#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif
1127}
1128 1226
1129static void noinline 1227static void noinline
1130evpipe_init (EV_P) 1228evpipe_init (EV_P)
1131{ 1229{
1132 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1133 { 1231 {
1134#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL) 1234 if (evfd < 0 && errno == EINVAL)
1137 evfd = eventfd (0, 0); 1235 evfd = eventfd (0, 0);
1138 1236
1139 if (evfd >= 0) 1237 if (evfd >= 0)
1141 evpipe [0] = -1; 1239 evpipe [0] = -1;
1142 fd_intern (evfd); /* doing it twice doesn't hurt */ 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1143 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1144 } 1242 }
1145 else 1243 else
1146#endif 1244# endif
1147 { 1245 {
1148 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1149 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1150 1248
1151 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1162evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1163{ 1261{
1164 if (!*flag) 1262 if (!*flag)
1165 { 1263 {
1166 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;
1167 1266
1168 *flag = 1; 1267 *flag = 1;
1169 1268
1170#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1171 if (evfd >= 0) 1270 if (evfd >= 0)
1173 uint64_t counter = 1; 1272 uint64_t counter = 1;
1174 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1175 } 1274 }
1176 else 1275 else
1177#endif 1276#endif
1178 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1179 1278
1180 errno = old_errno; 1279 errno = old_errno;
1181 } 1280 }
1182} 1281}
1183 1282
1184/* called whenever the libev signal pipe */ 1283/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1284/* got some events (signal, async) */
1186static void 1285static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1287{
1288 int i;
1289
1189#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1291 if (evfd >= 0)
1191 { 1292 {
1192 uint64_t counter; 1293 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
1197 { 1298 {
1198 char dummy; 1299 char dummy;
1199 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1200 } 1301 }
1201 1302
1202 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1203 { 1304 {
1204 int signum; 1305 sig_pending = 0;
1205 gotsig = 0;
1206 1306
1207 for (signum = signalmax; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1310 }
1211 1311
1212#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1213 if (gotasync) 1313 if (async_pending)
1214 { 1314 {
1215 int i; 1315 async_pending = 0;
1216 gotasync = 0;
1217 1316
1218 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1220 { 1319 {
1221 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
1229 1328
1230static void 1329static void
1231ev_sighandler (int signum) 1330ev_sighandler (int signum)
1232{ 1331{
1233#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1333 EV_P = signals [signum - 1].loop;
1235#endif 1334#endif
1236 1335
1237#if _WIN32 1336#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1239#endif 1338#endif
1240 1339
1241 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1243} 1342}
1244 1343
1245void noinline 1344void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1247{ 1346{
1248 WL w; 1347 WL w;
1249 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1250#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1251 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 */
1252#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1357
1254 --signum; 1358 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1359 return;
1360#endif
1258 1361
1259 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1260 1363
1261 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1366}
1264 1367
1265#if EV_USE_SIGNALFD 1368#if EV_USE_SIGNALFD
1266static void 1369static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1370sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1371{
1269 struct signalfd_siginfo si[4], *sip; 1372 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1373
1271 for (;;) 1374 for (;;)
1272 { 1375 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1376 ssize_t res = read (sigfd, si, sizeof (si));
1274 1377
1280 break; 1383 break;
1281 } 1384 }
1282} 1385}
1283#endif 1386#endif
1284 1387
1388#endif
1389
1285/*****************************************************************************/ 1390/*****************************************************************************/
1286 1391
1392#if EV_CHILD_ENABLE
1287static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1288
1289#ifndef _WIN32
1290 1394
1291static ev_signal childev; 1395static ev_signal childev;
1292 1396
1293#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1294# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1612 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1613 have_monotonic = 1;
1510 } 1614 }
1511#endif 1615#endif
1512 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
1513 ev_rt_now = ev_time (); 1628 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1629 mn_now = get_clock ();
1515 now_floor = mn_now; 1630 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1631 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1632#if EV_MINIMAL < 2
1520 1635
1521 io_blocktime = 0.; 1636 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1523 backend = 0; 1638 backend = 0;
1524 backend_fd = -1; 1639 backend_fd = -1;
1525 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1526#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1527 fs_fd = -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1646#endif
1529#if EV_USE_SIGNALFD 1647#if EV_USE_SIGNALFD
1530 sigfd = -2; 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1649#endif
1532
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV)
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543 1650
1544 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1546 1653
1547#if EV_USE_PORT 1654#if EV_USE_PORT
1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1561#endif 1668#endif
1562 1669
1563 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1564 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1565 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1566 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1567 } 1676 }
1568} 1677}
1569 1678
1570/* free up a loop structure */ 1679/* free up a loop structure */
1571static void noinline 1680static void noinline
1583 close (evfd); 1692 close (evfd);
1584#endif 1693#endif
1585 1694
1586 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1587 { 1696 {
1588 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1699 }
1591 } 1700 }
1592 1701
1593#if EV_USE_SIGNALFD 1702#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1703 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1704 close (sigfd);
1600 }
1601#endif 1705#endif
1602 1706
1603#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1605 close (fs_fd); 1709 close (fs_fd);
1630#if EV_IDLE_ENABLE 1734#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1735 array_free (idle, [i]);
1632#endif 1736#endif
1633 } 1737 }
1634 1738
1635 ev_free (anfds); anfdmax = 0; 1739 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1740
1637 /* have to use the microsoft-never-gets-it-right macro */ 1741 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1742 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1743 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1744 array_free (timer, EMPTY);
1675 1779
1676 if (ev_is_active (&pipe_w)) 1780 if (ev_is_active (&pipe_w))
1677 { 1781 {
1678 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1680 gotsig = 1; 1784 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1786 async_pending = 1;
1683#endif 1787#endif
1684 1788
1685 ev_ref (EV_A); 1789 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1790 ev_io_stop (EV_A_ &pipe_w);
1687 1791
1690 close (evfd); 1794 close (evfd);
1691#endif 1795#endif
1692 1796
1693 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1694 { 1798 {
1695 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1801 }
1698 1802
1803#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1699 evpipe_init (EV_A); 1804 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1805 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1806 pipecb (EV_A_ &pipe_w, EV_READ);
1807#endif
1702 } 1808 }
1703 1809
1704 postfork = 0; 1810 postfork = 0;
1705} 1811}
1706 1812
1707#if EV_MULTIPLICITY 1813#if EV_MULTIPLICITY
1708 1814
1709struct ev_loop * 1815struct ev_loop *
1710ev_loop_new (unsigned int flags) 1816ev_loop_new (unsigned int flags)
1711{ 1817{
1712 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));
1713 1819
1714 memset (loop, 0, sizeof (struct ev_loop)); 1820 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1821 loop_init (EV_A_ flags);
1716 1822
1717 if (ev_backend (EV_A)) 1823 if (ev_backend (EV_A))
1718 return loop; 1824 return EV_A;
1719 1825
1720 return 0; 1826 return 0;
1721} 1827}
1722 1828
1723void 1829void
1819#if EV_ASYNC_ENABLE 1925#if EV_ASYNC_ENABLE
1820 assert (asyncmax >= asynccnt); 1926 assert (asyncmax >= asynccnt);
1821 array_verify (EV_A_ (W *)asyncs, asynccnt); 1927 array_verify (EV_A_ (W *)asyncs, asynccnt);
1822#endif 1928#endif
1823 1929
1930#if EV_PREPARE_ENABLE
1824 assert (preparemax >= preparecnt); 1931 assert (preparemax >= preparecnt);
1825 array_verify (EV_A_ (W *)prepares, preparecnt); 1932 array_verify (EV_A_ (W *)prepares, preparecnt);
1933#endif
1826 1934
1935#if EV_CHECK_ENABLE
1827 assert (checkmax >= checkcnt); 1936 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1937 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif
1829 1939
1830# if 0 1940# if 0
1941#if EV_CHILD_ENABLE
1831 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)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif
1833# endif 1945# endif
1834#endif 1946#endif
1835} 1947}
1836#endif 1948#endif
1837 1949
1844#endif 1956#endif
1845{ 1957{
1846 if (!ev_default_loop_ptr) 1958 if (!ev_default_loop_ptr)
1847 { 1959 {
1848#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1961 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1962#else
1851 ev_default_loop_ptr = 1; 1963 ev_default_loop_ptr = 1;
1852#endif 1964#endif
1853 1965
1854 loop_init (EV_A_ flags); 1966 loop_init (EV_A_ flags);
1855 1967
1856 if (ev_backend (EV_A)) 1968 if (ev_backend (EV_A))
1857 { 1969 {
1858#ifndef _WIN32 1970#if EV_CHILD_ENABLE
1859 ev_signal_init (&childev, childcb, SIGCHLD); 1971 ev_signal_init (&childev, childcb, SIGCHLD);
1860 ev_set_priority (&childev, EV_MAXPRI); 1972 ev_set_priority (&childev, EV_MAXPRI);
1861 ev_signal_start (EV_A_ &childev); 1973 ev_signal_start (EV_A_ &childev);
1862 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1974 ev_unref (EV_A); /* child watcher should not keep loop alive */
1863#endif 1975#endif
1871 1983
1872void 1984void
1873ev_default_destroy (void) 1985ev_default_destroy (void)
1874{ 1986{
1875#if EV_MULTIPLICITY 1987#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1988 EV_P = ev_default_loop_ptr;
1877#endif 1989#endif
1878 1990
1879 ev_default_loop_ptr = 0; 1991 ev_default_loop_ptr = 0;
1880 1992
1881#ifndef _WIN32 1993#if EV_CHILD_ENABLE
1882 ev_ref (EV_A); /* child watcher */ 1994 ev_ref (EV_A); /* child watcher */
1883 ev_signal_stop (EV_A_ &childev); 1995 ev_signal_stop (EV_A_ &childev);
1884#endif 1996#endif
1885 1997
1886 loop_destroy (EV_A); 1998 loop_destroy (EV_A);
1888 2000
1889void 2001void
1890ev_default_fork (void) 2002ev_default_fork (void)
1891{ 2003{
1892#if EV_MULTIPLICITY 2004#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 2005 EV_P = ev_default_loop_ptr;
1894#endif 2006#endif
1895 2007
1896 postfork = 1; /* must be in line with ev_loop_fork */ 2008 postfork = 1; /* must be in line with ev_loop_fork */
1897} 2009}
1898 2010
2093 ANHE_at_cache (*he); 2205 ANHE_at_cache (*he);
2094 } 2206 }
2095} 2207}
2096 2208
2097/* fetch new monotonic and realtime times from the kernel */ 2209/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2210/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2211inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2212time_update (EV_P_ ev_tstamp max_block)
2101{ 2213{
2102#if EV_USE_MONOTONIC 2214#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2215 if (expect_true (have_monotonic))
2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2310 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2199 EV_INVOKE_PENDING; 2311 EV_INVOKE_PENDING;
2200 } 2312 }
2201#endif 2313#endif
2202 2314
2315#if EV_PREPARE_ENABLE
2203 /* queue prepare watchers (and execute them) */ 2316 /* queue prepare watchers (and execute them) */
2204 if (expect_false (preparecnt)) 2317 if (expect_false (preparecnt))
2205 { 2318 {
2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2319 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2207 EV_INVOKE_PENDING; 2320 EV_INVOKE_PENDING;
2208 } 2321 }
2322#endif
2209 2323
2210 if (expect_false (loop_done)) 2324 if (expect_false (loop_done))
2211 break; 2325 break;
2212 2326
2213 /* we might have forked, so reify kernel state if necessary */ 2327 /* we might have forked, so reify kernel state if necessary */
2286#if EV_IDLE_ENABLE 2400#if EV_IDLE_ENABLE
2287 /* queue idle watchers unless other events are pending */ 2401 /* queue idle watchers unless other events are pending */
2288 idle_reify (EV_A); 2402 idle_reify (EV_A);
2289#endif 2403#endif
2290 2404
2405#if EV_CHECK_ENABLE
2291 /* queue check watchers, to be executed first */ 2406 /* queue check watchers, to be executed first */
2292 if (expect_false (checkcnt)) 2407 if (expect_false (checkcnt))
2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2408 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2409#endif
2294 2410
2295 EV_INVOKE_PENDING; 2411 EV_INVOKE_PENDING;
2296 } 2412 }
2297 while (expect_true ( 2413 while (expect_true (
2298 activecnt 2414 activecnt
2364inline_size void 2480inline_size void
2365wlist_del (WL *head, WL elem) 2481wlist_del (WL *head, WL elem)
2366{ 2482{
2367 while (*head) 2483 while (*head)
2368 { 2484 {
2369 if (*head == elem) 2485 if (expect_true (*head == elem))
2370 { 2486 {
2371 *head = elem->next; 2487 *head = elem->next;
2372 return; 2488 break;
2373 } 2489 }
2374 2490
2375 head = &(*head)->next; 2491 head = &(*head)->next;
2376 } 2492 }
2377} 2493}
2437 2553
2438 if (expect_false (ev_is_active (w))) 2554 if (expect_false (ev_is_active (w)))
2439 return; 2555 return;
2440 2556
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2557 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 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))));
2443 2559
2444 EV_FREQUENT_CHECK; 2560 EV_FREQUENT_CHECK;
2445 2561
2446 ev_start (EV_A_ (W)w, 1); 2562 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2563 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2517 timers [active] = timers [timercnt + HEAP0]; 2633 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2634 adjustheap (timers, timercnt, active);
2519 } 2635 }
2520 } 2636 }
2521 2637
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2638 ev_at (w) -= mn_now;
2525 2639
2526 ev_stop (EV_A_ (W)w); 2640 ev_stop (EV_A_ (W)w);
2641
2642 EV_FREQUENT_CHECK;
2527} 2643}
2528 2644
2529void noinline 2645void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2646ev_timer_again (EV_P_ ev_timer *w)
2531{ 2647{
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2726 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2727 adjustheap (periodics, periodiccnt, active);
2612 } 2728 }
2613 } 2729 }
2614 2730
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2731 ev_stop (EV_A_ (W)w);
2732
2733 EV_FREQUENT_CHECK;
2618} 2734}
2619 2735
2620void noinline 2736void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2737ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2738{
2628 2744
2629#ifndef SA_RESTART 2745#ifndef SA_RESTART
2630# define SA_RESTART 0 2746# define SA_RESTART 0
2631#endif 2747#endif
2632 2748
2749#if EV_SIGNAL_ENABLE
2750
2633void noinline 2751void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2752ev_signal_start (EV_P_ ev_signal *w)
2635{ 2753{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2754 if (expect_false (ev_is_active (w)))
2640 return; 2755 return;
2641 2756
2642 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
2643 2765
2644 EV_FREQUENT_CHECK; 2766 EV_FREQUENT_CHECK;
2645 2767
2646#if EV_USE_SIGNALFD 2768#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2769 if (sigfd == -2)
2669 sigaddset (&sigfd_set, w->signum); 2791 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2792 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2793
2672 signalfd (sigfd, &sigfd_set, 0); 2794 signalfd (sigfd, &sigfd_set, 0);
2673 } 2795 }
2674 else
2675#endif 2796#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688 if (sigfd < 0)/*TODO*/
2689 sigdelset (&prev, w->signum);
2690 sigprocmask (SIG_SETMASK, &prev, 0);
2691#endif
2692 }
2693 2797
2694 ev_start (EV_A_ (W)w, 1); 2798 ev_start (EV_A_ (W)w, 1);
2695 wlist_add (&signals [w->signum - 1].head, (WL)w); 2799 wlist_add (&signals [w->signum - 1].head, (WL)w);
2696 2800
2697 if (!((WL)w)->next) 2801 if (!((WL)w)->next)
2802# if EV_USE_SIGNALFD
2803 if (sigfd < 0) /*TODO*/
2804# endif
2698 { 2805 {
2699#if _WIN32 2806# ifdef _WIN32
2807 evpipe_init (EV_A);
2808
2700 signal (w->signum, ev_sighandler); 2809 signal (w->signum, ev_sighandler);
2701#else 2810# else
2702 if (sigfd < 0) /*TODO*/
2703 {
2704 struct sigaction sa = { }; 2811 struct sigaction sa;
2812
2813 evpipe_init (EV_A);
2814
2705 sa.sa_handler = ev_sighandler; 2815 sa.sa_handler = ev_sighandler;
2706 sigfillset (&sa.sa_mask); 2816 sigfillset (&sa.sa_mask);
2707 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 */
2708 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
2709 } 2824 }
2710#endif
2711 }
2712 2825
2713 EV_FREQUENT_CHECK; 2826 EV_FREQUENT_CHECK;
2714} 2827}
2715 2828
2716void noinline 2829void noinline
2724 2837
2725 wlist_del (&signals [w->signum - 1].head, (WL)w); 2838 wlist_del (&signals [w->signum - 1].head, (WL)w);
2726 ev_stop (EV_A_ (W)w); 2839 ev_stop (EV_A_ (W)w);
2727 2840
2728 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
2729#if EV_USE_SIGNALFD 2846#if EV_USE_SIGNALFD
2730 if (sigfd >= 0) 2847 if (sigfd >= 0)
2731 { 2848 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2849 sigset_t ss;
2850
2851 sigemptyset (&ss);
2852 sigaddset (&ss, w->signum);
2733 sigdelset (&sigfd_set, w->signum); 2853 sigdelset (&sigfd_set, w->signum);
2854
2734 signalfd (sigfd, &sigfd_set, 0); 2855 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2856 sigprocmask (SIG_UNBLOCK, &ss, 0);
2736 /*TODO: maybe unblock signal? */
2737 } 2857 }
2738 else 2858 else
2739#endif 2859#endif
2740 signal (w->signum, SIG_DFL); 2860 signal (w->signum, SIG_DFL);
2861 }
2741 2862
2742 EV_FREQUENT_CHECK; 2863 EV_FREQUENT_CHECK;
2743} 2864}
2865
2866#endif
2867
2868#if EV_CHILD_ENABLE
2744 2869
2745void 2870void
2746ev_child_start (EV_P_ ev_child *w) 2871ev_child_start (EV_P_ ev_child *w)
2747{ 2872{
2748#if EV_MULTIPLICITY 2873#if EV_MULTIPLICITY
2772 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2773 2898
2774 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2775} 2900}
2776 2901
2902#endif
2903
2777#if EV_STAT_ENABLE 2904#if EV_STAT_ENABLE
2778 2905
2779# ifdef _WIN32 2906# ifdef _WIN32
2780# undef lstat 2907# undef lstat
2781# define lstat(a,b) _stati64 (a,b) 2908# define lstat(a,b) _stati64 (a,b)
2786#define MIN_STAT_INTERVAL 0.1074891 2913#define MIN_STAT_INTERVAL 0.1074891
2787 2914
2788static 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);
2789 2916
2790#if EV_USE_INOTIFY 2917#if EV_USE_INOTIFY
2791# 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)
2792 2921
2793static void noinline 2922static void noinline
2794infy_add (EV_P_ ev_stat *w) 2923infy_add (EV_P_ ev_stat *w)
2795{ 2924{
2796 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);
2797 2926
2798 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 */
2799 { 2947 }
2948 else
2949 {
2950 /* can't use inotify, continue to stat */
2800 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2951 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2801 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2802 2952
2803 /* monitor some parent directory for speedup hints */ 2953 /* if path is not there, monitor some parent directory for speedup hints */
2804 /* 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, */
2805 /* but an efficiency issue only */ 2955 /* but an efficiency issue only */
2806 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2956 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2807 { 2957 {
2808 char path [4096]; 2958 char path [4096];
2824 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2825 } 2975 }
2826 } 2976 }
2827 2977
2828 if (w->wd >= 0) 2978 if (w->wd >= 0)
2829 {
2830 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);
2831 2980
2832 /* now local changes will be tracked by inotify, but remote changes won't */ 2981 /* now re-arm timer, if required */
2833 /* unless the filesystem it known to be local, we therefore still poll */ 2982 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2834 /* also do poll on <2.6.25, but with normal frequency */
2835 struct statfs sfs;
2836
2837 if (fs_2625 && !statfs (w->path, &sfs))
2838 if (sfs.f_type == 0x1373 /* devfs */
2839 || sfs.f_type == 0xEF53 /* ext2/3 */
2840 || sfs.f_type == 0x3153464a /* jfs */
2841 || sfs.f_type == 0x52654973 /* reiser3 */
2842 || sfs.f_type == 0x01021994 /* tempfs */
2843 || sfs.f_type == 0x58465342 /* xfs */)
2844 return;
2845
2846 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2847 ev_timer_again (EV_A_ &w->timer); 2983 ev_timer_again (EV_A_ &w->timer);
2848 } 2984 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2849} 2985}
2850 2986
2851static void noinline 2987static void noinline
2852infy_del (EV_P_ ev_stat *w) 2988infy_del (EV_P_ ev_stat *w)
2853{ 2989{
2898 3034
2899static void 3035static void
2900infy_cb (EV_P_ ev_io *w, int revents) 3036infy_cb (EV_P_ ev_io *w, int revents)
2901{ 3037{
2902 char buf [EV_INOTIFY_BUFSIZE]; 3038 char buf [EV_INOTIFY_BUFSIZE];
2903 struct inotify_event *ev = (struct inotify_event *)buf;
2904 int ofs; 3039 int ofs;
2905 int len = read (fs_fd, buf, sizeof (buf)); 3040 int len = read (fs_fd, buf, sizeof (buf));
2906 3041
2907 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);
2908 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;
2909} 3080}
2910 3081
2911inline_size void 3082inline_size void
2912check_2625 (EV_P) 3083ev_check_2625 (EV_P)
2913{ 3084{
2914 /* kernels < 2.6.25 are borked 3085 /* kernels < 2.6.25 are borked
2915 * 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
2916 */ 3087 */
2917 struct utsname buf; 3088 if (ev_linux_version () < 0x020619)
2918 int major, minor, micro;
2919
2920 if (uname (&buf))
2921 return; 3089 return;
2922 3090
2923 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2924 return;
2925
2926 if (major < 2
2927 || (major == 2 && minor < 6)
2928 || (major == 2 && minor == 6 && micro < 25))
2929 return;
2930
2931 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 ();
2932} 3103}
2933 3104
2934inline_size void 3105inline_size void
2935infy_init (EV_P) 3106infy_init (EV_P)
2936{ 3107{
2937 if (fs_fd != -2) 3108 if (fs_fd != -2)
2938 return; 3109 return;
2939 3110
2940 fs_fd = -1; 3111 fs_fd = -1;
2941 3112
2942 check_2625 (EV_A); 3113 ev_check_2625 (EV_A);
2943 3114
2944 fs_fd = inotify_init (); 3115 fs_fd = infy_newfd ();
2945 3116
2946 if (fs_fd >= 0) 3117 if (fs_fd >= 0)
2947 { 3118 {
3119 fd_intern (fs_fd);
2948 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3120 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2949 ev_set_priority (&fs_w, EV_MAXPRI); 3121 ev_set_priority (&fs_w, EV_MAXPRI);
2950 ev_io_start (EV_A_ &fs_w); 3122 ev_io_start (EV_A_ &fs_w);
3123 ev_unref (EV_A);
2951 } 3124 }
2952} 3125}
2953 3126
2954inline_size void 3127inline_size void
2955infy_fork (EV_P) 3128infy_fork (EV_P)
2957 int slot; 3130 int slot;
2958 3131
2959 if (fs_fd < 0) 3132 if (fs_fd < 0)
2960 return; 3133 return;
2961 3134
3135 ev_ref (EV_A);
3136 ev_io_stop (EV_A_ &fs_w);
2962 close (fs_fd); 3137 close (fs_fd);
2963 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 }
2964 3147
2965 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2966 { 3149 {
2967 WL w_ = fs_hash [slot].head; 3150 WL w_ = fs_hash [slot].head;
2968 fs_hash [slot].head = 0; 3151 fs_hash [slot].head = 0;
2975 w->wd = -1; 3158 w->wd = -1;
2976 3159
2977 if (fs_fd >= 0) 3160 if (fs_fd >= 0)
2978 infy_add (EV_A_ w); /* re-add, no matter what */ 3161 infy_add (EV_A_ w); /* re-add, no matter what */
2979 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);
2980 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 }
2981 } 3169 }
2982 } 3170 }
2983} 3171}
2984 3172
2985#endif 3173#endif
3002static void noinline 3190static void noinline
3003stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3191stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3004{ 3192{
3005 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3193 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3006 3194
3007 /* we copy this here each the time so that */ 3195 ev_statdata prev = w->attr;
3008 /* prev has the old value when the callback gets invoked */
3009 w->prev = w->attr;
3010 ev_stat_stat (EV_A_ w); 3196 ev_stat_stat (EV_A_ w);
3011 3197
3012 /* 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 */
3013 if ( 3199 if (
3014 w->prev.st_dev != w->attr.st_dev 3200 prev.st_dev != w->attr.st_dev
3015 || w->prev.st_ino != w->attr.st_ino 3201 || prev.st_ino != w->attr.st_ino
3016 || w->prev.st_mode != w->attr.st_mode 3202 || prev.st_mode != w->attr.st_mode
3017 || w->prev.st_nlink != w->attr.st_nlink 3203 || prev.st_nlink != w->attr.st_nlink
3018 || w->prev.st_uid != w->attr.st_uid 3204 || prev.st_uid != w->attr.st_uid
3019 || w->prev.st_gid != w->attr.st_gid 3205 || prev.st_gid != w->attr.st_gid
3020 || w->prev.st_rdev != w->attr.st_rdev 3206 || prev.st_rdev != w->attr.st_rdev
3021 || w->prev.st_size != w->attr.st_size 3207 || prev.st_size != w->attr.st_size
3022 || w->prev.st_atime != w->attr.st_atime 3208 || prev.st_atime != w->attr.st_atime
3023 || w->prev.st_mtime != w->attr.st_mtime 3209 || prev.st_mtime != w->attr.st_mtime
3024 || w->prev.st_ctime != w->attr.st_ctime 3210 || prev.st_ctime != w->attr.st_ctime
3025 ) { 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
3026 #if EV_USE_INOTIFY 3217 #if EV_USE_INOTIFY
3027 if (fs_fd >= 0) 3218 if (fs_fd >= 0)
3028 { 3219 {
3029 infy_del (EV_A_ w); 3220 infy_del (EV_A_ w);
3030 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
3055 3246
3056 if (fs_fd >= 0) 3247 if (fs_fd >= 0)
3057 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
3058 else 3249 else
3059#endif 3250#endif
3251 {
3060 ev_timer_again (EV_A_ &w->timer); 3252 ev_timer_again (EV_A_ &w->timer);
3253 ev_unref (EV_A);
3254 }
3061 3255
3062 ev_start (EV_A_ (W)w, 1); 3256 ev_start (EV_A_ (W)w, 1);
3063 3257
3064 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
3065} 3259}
3074 EV_FREQUENT_CHECK; 3268 EV_FREQUENT_CHECK;
3075 3269
3076#if EV_USE_INOTIFY 3270#if EV_USE_INOTIFY
3077 infy_del (EV_A_ w); 3271 infy_del (EV_A_ w);
3078#endif 3272#endif
3273
3274 if (ev_is_active (&w->timer))
3275 {
3276 ev_ref (EV_A);
3079 ev_timer_stop (EV_A_ &w->timer); 3277 ev_timer_stop (EV_A_ &w->timer);
3278 }
3080 3279
3081 ev_stop (EV_A_ (W)w); 3280 ev_stop (EV_A_ (W)w);
3082 3281
3083 EV_FREQUENT_CHECK; 3282 EV_FREQUENT_CHECK;
3084} 3283}
3129 3328
3130 EV_FREQUENT_CHECK; 3329 EV_FREQUENT_CHECK;
3131} 3330}
3132#endif 3331#endif
3133 3332
3333#if EV_PREPARE_ENABLE
3134void 3334void
3135ev_prepare_start (EV_P_ ev_prepare *w) 3335ev_prepare_start (EV_P_ ev_prepare *w)
3136{ 3336{
3137 if (expect_false (ev_is_active (w))) 3337 if (expect_false (ev_is_active (w)))
3138 return; 3338 return;
3164 3364
3165 ev_stop (EV_A_ (W)w); 3365 ev_stop (EV_A_ (W)w);
3166 3366
3167 EV_FREQUENT_CHECK; 3367 EV_FREQUENT_CHECK;
3168} 3368}
3369#endif
3169 3370
3371#if EV_CHECK_ENABLE
3170void 3372void
3171ev_check_start (EV_P_ ev_check *w) 3373ev_check_start (EV_P_ ev_check *w)
3172{ 3374{
3173 if (expect_false (ev_is_active (w))) 3375 if (expect_false (ev_is_active (w)))
3174 return; 3376 return;
3200 3402
3201 ev_stop (EV_A_ (W)w); 3403 ev_stop (EV_A_ (W)w);
3202 3404
3203 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
3204} 3406}
3407#endif
3205 3408
3206#if EV_EMBED_ENABLE 3409#if EV_EMBED_ENABLE
3207void noinline 3410void noinline
3208ev_embed_sweep (EV_P_ ev_embed *w) 3411ev_embed_sweep (EV_P_ ev_embed *w)
3209{ 3412{
3225embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3428embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3226{ 3429{
3227 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3430 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3228 3431
3229 { 3432 {
3230 struct ev_loop *loop = w->other; 3433 EV_P = w->other;
3231 3434
3232 while (fdchangecnt) 3435 while (fdchangecnt)
3233 { 3436 {
3234 fd_reify (EV_A); 3437 fd_reify (EV_A);
3235 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3438 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3243 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));
3244 3447
3245 ev_embed_stop (EV_A_ w); 3448 ev_embed_stop (EV_A_ w);
3246 3449
3247 { 3450 {
3248 struct ev_loop *loop = w->other; 3451 EV_P = w->other;
3249 3452
3250 ev_loop_fork (EV_A); 3453 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3454 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 } 3455 }
3253 3456
3267{ 3470{
3268 if (expect_false (ev_is_active (w))) 3471 if (expect_false (ev_is_active (w)))
3269 return; 3472 return;
3270 3473
3271 { 3474 {
3272 struct ev_loop *loop = w->other; 3475 EV_P = w->other;
3273 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 ()));
3274 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);
3275 } 3478 }
3276 3479
3277 EV_FREQUENT_CHECK; 3480 EV_FREQUENT_CHECK;
3304 3507
3305 ev_io_stop (EV_A_ &w->io); 3508 ev_io_stop (EV_A_ &w->io);
3306 ev_prepare_stop (EV_A_ &w->prepare); 3509 ev_prepare_stop (EV_A_ &w->prepare);
3307 ev_fork_stop (EV_A_ &w->fork); 3510 ev_fork_stop (EV_A_ &w->fork);
3308 3511
3512 ev_stop (EV_A_ (W)w);
3513
3309 EV_FREQUENT_CHECK; 3514 EV_FREQUENT_CHECK;
3310} 3515}
3311#endif 3516#endif
3312 3517
3313#if EV_FORK_ENABLE 3518#if EV_FORK_ENABLE
3389 3594
3390void 3595void
3391ev_async_send (EV_P_ ev_async *w) 3596ev_async_send (EV_P_ ev_async *w)
3392{ 3597{
3393 w->sent = 1; 3598 w->sent = 1;
3394 evpipe_write (EV_A_ &gotasync); 3599 evpipe_write (EV_A_ &async_pending);
3395} 3600}
3396#endif 3601#endif
3397 3602
3398/*****************************************************************************/ 3603/*****************************************************************************/
3399 3604
3536 if (types & EV_ASYNC) 3741 if (types & EV_ASYNC)
3537 for (i = asynccnt; i--; ) 3742 for (i = asynccnt; i--; )
3538 cb (EV_A_ EV_ASYNC, asyncs [i]); 3743 cb (EV_A_ EV_ASYNC, asyncs [i]);
3539#endif 3744#endif
3540 3745
3746#if EV_PREPARE_ENABLE
3541 if (types & EV_PREPARE) 3747 if (types & EV_PREPARE)
3542 for (i = preparecnt; i--; ) 3748 for (i = preparecnt; i--; )
3543#if EV_EMBED_ENABLE 3749# if EV_EMBED_ENABLE
3544 if (ev_cb (prepares [i]) != embed_prepare_cb) 3750 if (ev_cb (prepares [i]) != embed_prepare_cb)
3545#endif 3751# endif
3546 cb (EV_A_ EV_PREPARE, prepares [i]); 3752 cb (EV_A_ EV_PREPARE, prepares [i]);
3753#endif
3547 3754
3755#if EV_CHECK_ENABLE
3548 if (types & EV_CHECK) 3756 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; ) 3757 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]); 3758 cb (EV_A_ EV_CHECK, checks [i]);
3759#endif
3551 3760
3761#if EV_SIGNAL_ENABLE
3552 if (types & EV_SIGNAL) 3762 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i) 3763 for (i = 0; i < EV_NSIG - 1; ++i)
3554 for (wl = signals [i].head; wl; ) 3764 for (wl = signals [i].head; wl; )
3555 { 3765 {
3556 wn = wl->next; 3766 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl); 3767 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn; 3768 wl = wn;
3559 } 3769 }
3770#endif
3560 3771
3772#if EV_CHILD_ENABLE
3561 if (types & EV_CHILD) 3773 if (types & EV_CHILD)
3562 for (i = EV_PID_HASHSIZE; i--; ) 3774 for (i = EV_PID_HASHSIZE; i--; )
3563 for (wl = childs [i]; wl; ) 3775 for (wl = childs [i]; wl; )
3564 { 3776 {
3565 wn = wl->next; 3777 wn = wl->next;
3566 cb (EV_A_ EV_CHILD, wl); 3778 cb (EV_A_ EV_CHILD, wl);
3567 wl = wn; 3779 wl = wn;
3568 } 3780 }
3781#endif
3569/* EV_STAT 0x00001000 /* stat data changed */ 3782/* EV_STAT 0x00001000 /* stat data changed */
3570/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3783/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3571} 3784}
3572#endif 3785#endif
3573 3786

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines