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

Comparing libev/ev.c (file contents):
Revision 1.302 by root, Thu Jul 16 15:08:08 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
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
155#include <assert.h> 164#include <assert.h>
156#include <errno.h> 165#include <errno.h>
157#include <sys/types.h> 166#include <sys/types.h>
158#include <time.h> 167#include <time.h>
168#include <limits.h>
159 169
160#include <signal.h> 170#include <signal.h>
161 171
162#ifdef EV_H 172#ifdef EV_H
163# include EV_H 173# include EV_H
174# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 185# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
178# endif 188# endif
189# undef EV_AVOID_STDIO
179#endif 190#endif
180 191
181/* 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
182 221
183#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL 1
186# else 225# else
263#ifndef EV_USE_EVENTFD 302#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 304# define EV_USE_EVENTFD 1
266# else 305# else
267# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
307# endif
308#endif
309
310#ifndef EV_USE_SIGNALFD
311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
312# define EV_USE_SIGNALFD 1
313# else
314# define EV_USE_SIGNALFD 0
268# endif 315# endif
269#endif 316#endif
270 317
271#if 0 /* debugging */ 318#if 0 /* debugging */
272# define EV_VERIFY 3 319# define EV_VERIFY 3
300# endif 347# endif
301#endif 348#endif
302 349
303/* 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 */
304 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
305#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
308#endif 361#endif
309 362
339#endif 392#endif
340 393
341#if EV_USE_EVENTFD 394#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 395/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 396# include <stdint.h>
397# ifndef EFD_NONBLOCK
398# define EFD_NONBLOCK O_NONBLOCK
399# endif
400# ifndef EFD_CLOEXEC
401# ifdef O_CLOEXEC
402# define EFD_CLOEXEC O_CLOEXEC
403# else
404# define EFD_CLOEXEC 02000000
405# endif
406# endif
344# ifdef __cplusplus 407# ifdef __cplusplus
345extern "C" { 408extern "C" {
346# endif 409# endif
347int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 411# ifdef __cplusplus
349} 412}
350# endif 413# endif
351#endif 414#endif
415
416#if EV_USE_SIGNALFD
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
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
352 444
353/**/ 445/**/
354 446
355#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 460 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 462
371#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) */
372#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) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 465
375#if __GNUC__ >= 4 466#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
378#else 469#else
419 510
420#if EV_USE_MONOTONIC 511#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 513#endif
423 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
424#ifdef _WIN32 525#ifdef _WIN32
425# include "ev_win32.c" 526# include "ev_win32.c"
426#endif 527#endif
427 528
428/*****************************************************************************/ 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
429 538
430static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
431 540
432void 541void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
443 552
444 if (syserr_cb) 553 if (syserr_cb)
445 syserr_cb (msg); 554 syserr_cb (msg);
446 else 555 else
447 { 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
448 perror (msg); 565 perror (msg);
566#endif
449 abort (); 567 abort ();
450 } 568 }
451} 569}
452 570
453static void * 571static void *
454ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
455{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
456 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
457 * 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
458 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
459 */ 580 */
460 581
461 if (size) 582 if (size)
462 return realloc (ptr, size); 583 return realloc (ptr, size);
463 584
464 free (ptr); 585 free (ptr);
465 return 0; 586 return 0;
587#endif
466} 588}
467 589
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 591
470void 592void
478{ 600{
479 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
480 602
481 if (!ptr && size) 603 if (!ptr && size)
482 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
484 abort (); 610 abort ();
485 } 611 }
486 612
487 return ptr; 613 return ptr;
488} 614}
765} 891}
766 892
767/*****************************************************************************/ 893/*****************************************************************************/
768 894
769inline_speed void 895inline_speed void
770fd_event_nc (EV_P_ int fd, int revents) 896fd_event_nocheck (EV_P_ int fd, int revents)
771{ 897{
772 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
773 ev_io *w; 899 ev_io *w;
774 900
775 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)
787fd_event (EV_P_ int fd, int revents) 913fd_event (EV_P_ int fd, int revents)
788{ 914{
789 ANFD *anfd = anfds + fd; 915 ANFD *anfd = anfds + fd;
790 916
791 if (expect_true (!anfd->reify)) 917 if (expect_true (!anfd->reify))
792 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
793} 919}
794 920
795void 921void
796ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
797{ 923{
798 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
799 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
800} 926}
801 927
802/* make sure the external fd watch events are in-sync */ 928/* make sure the external fd watch events are in-sync */
803/* with the kernel/libev internal state */ 929/* with the kernel/libev internal state */
804inline_size void 930inline_size void
819 945
820#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
821 if (events) 947 if (events)
822 { 948 {
823 unsigned long arg; 949 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
826 #else
827 anfd->handle = _get_osfhandle (fd);
828 #endif
829 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));
830 } 952 }
831#endif 953#endif
832 954
833 { 955 {
871 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
872 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);
873 } 995 }
874} 996}
875 997
876/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
877inline_size int 999inline_size int
878fd_valid (int fd) 1000fd_valid (int fd)
879{ 1001{
880#ifdef _WIN32 1002#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 1004#else
883 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
884#endif 1006#endif
885} 1007}
886 1008
904 1026
905 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1028 if (anfds [fd].events)
907 { 1029 {
908 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
909 return; 1031 break;
910 } 1032 }
911} 1033}
912 1034
913/* 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 */
914static void noinline 1036static void noinline
921 { 1043 {
922 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
923 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
924 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
925 } 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
926} 1062}
927 1063
928/*****************************************************************************/ 1064/*****************************************************************************/
929 1065
930/* 1066/*
1004 1140
1005 for (;;) 1141 for (;;)
1006 { 1142 {
1007 int c = k << 1; 1143 int c = k << 1;
1008 1144
1009 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
1010 break; 1146 break;
1011 1147
1012 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])
1013 ? 1 : 0; 1149 ? 1 : 0;
1014 1150
1050 1186
1051/* move an element suitably so it is in a correct place */ 1187/* move an element suitably so it is in a correct place */
1052inline_size void 1188inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
1054{ 1190{
1055 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)]))
1056 upheap (heap, k); 1192 upheap (heap, k);
1057 else 1193 else
1058 downheap (heap, N, k); 1194 downheap (heap, N, k);
1059} 1195}
1060 1196
1073/*****************************************************************************/ 1209/*****************************************************************************/
1074 1210
1075/* associate signal watchers to a signal signal */ 1211/* associate signal watchers to a signal signal */
1076typedef struct 1212typedef struct
1077{ 1213{
1214 EV_ATOMIC_T pending;
1215#if EV_MULTIPLICITY
1216 EV_P;
1217#endif
1078 WL head; 1218 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1219} ANSIG;
1081 1220
1082static ANSIG *signals; 1221static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1222
1087/*****************************************************************************/ 1223/*****************************************************************************/
1088 1224
1089/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1090/* this is not fork-safe */
1091inline_speed void
1092fd_intern (int fd)
1093{
1094#ifdef _WIN32
1095 unsigned long arg = 1;
1096 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1097#else
1098 fcntl (fd, F_SETFD, FD_CLOEXEC);
1099 fcntl (fd, F_SETFL, O_NONBLOCK);
1100#endif
1101}
1102 1226
1103static void noinline 1227static void noinline
1104evpipe_init (EV_P) 1228evpipe_init (EV_P)
1105{ 1229{
1106 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1107 { 1231 {
1108#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1234 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1235 evfd = eventfd (0, 0);
1236
1237 if (evfd >= 0)
1110 { 1238 {
1111 evpipe [0] = -1; 1239 evpipe [0] = -1;
1112 fd_intern (evfd); 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1242 }
1115 else 1243 else
1116#endif 1244# endif
1117 { 1245 {
1118 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1119 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1120 1248
1121 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1132evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1133{ 1261{
1134 if (!*flag) 1262 if (!*flag)
1135 { 1263 {
1136 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;
1137 1266
1138 *flag = 1; 1267 *flag = 1;
1139 1268
1140#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1141 if (evfd >= 0) 1270 if (evfd >= 0)
1143 uint64_t counter = 1; 1272 uint64_t counter = 1;
1144 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1145 } 1274 }
1146 else 1275 else
1147#endif 1276#endif
1148 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1149 1278
1150 errno = old_errno; 1279 errno = old_errno;
1151 } 1280 }
1152} 1281}
1153 1282
1154/* called whenever the libev signal pipe */ 1283/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1284/* got some events (signal, async) */
1156static void 1285static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1287{
1288 int i;
1289
1159#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1291 if (evfd >= 0)
1161 { 1292 {
1162 uint64_t counter; 1293 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
1167 { 1298 {
1168 char dummy; 1299 char dummy;
1169 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1170 } 1301 }
1171 1302
1172 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1173 { 1304 {
1174 int signum; 1305 sig_pending = 0;
1175 gotsig = 0;
1176 1306
1177 for (signum = signalmax; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1310 }
1181 1311
1182#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1183 if (gotasync) 1313 if (async_pending)
1184 { 1314 {
1185 int i; 1315 async_pending = 0;
1186 gotasync = 0;
1187 1316
1188 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1190 { 1319 {
1191 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
1199 1328
1200static void 1329static void
1201ev_sighandler (int signum) 1330ev_sighandler (int signum)
1202{ 1331{
1203#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1333 EV_P = signals [signum - 1].loop;
1205#endif 1334#endif
1206 1335
1207#if _WIN32 1336#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1209#endif 1338#endif
1210 1339
1211 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1213} 1342}
1214 1343
1215void noinline 1344void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1217{ 1346{
1218 WL w; 1347 WL w;
1219 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1220#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1221 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 */
1222#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1357
1224 --signum; 1358 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1359 return;
1360#endif
1228 1361
1229 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1230 1363
1231 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1366}
1234 1367
1368#if EV_USE_SIGNALFD
1369static void
1370sigfdcb (EV_P_ ev_io *iow, int revents)
1371{
1372 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1373
1374 for (;;)
1375 {
1376 ssize_t res = read (sigfd, si, sizeof (si));
1377
1378 /* not ISO-C, as res might be -1, but works with SuS */
1379 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1380 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1381
1382 if (res < (ssize_t)sizeof (si))
1383 break;
1384 }
1385}
1386#endif
1387
1388#endif
1389
1235/*****************************************************************************/ 1390/*****************************************************************************/
1236 1391
1392#if EV_CHILD_ENABLE
1237static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1238
1239#ifndef _WIN32
1240 1394
1241static ev_signal childev; 1395static ev_signal childev;
1242 1396
1243#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1244# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1612 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1613 have_monotonic = 1;
1460 } 1614 }
1461#endif 1615#endif
1462 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
1463 ev_rt_now = ev_time (); 1628 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1629 mn_now = get_clock ();
1465 now_floor = mn_now; 1630 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1631 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1632#if EV_MINIMAL < 2
1470 1635
1471 io_blocktime = 0.; 1636 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1473 backend = 0; 1638 backend = 0;
1474 backend_fd = -1; 1639 backend_fd = -1;
1475 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1476#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1477 fs_fd = -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1646#endif
1479 1647#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1649#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1650
1491 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1493 1653
1494#if EV_USE_PORT 1654#if EV_USE_PORT
1507 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1508#endif 1668#endif
1509 1669
1510 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1511 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1512 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1513 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1514 } 1676 }
1515} 1677}
1516 1678
1517/* free up a loop structure */ 1679/* free up a loop structure */
1518static void noinline 1680static void noinline
1520{ 1682{
1521 int i; 1683 int i;
1522 1684
1523 if (ev_is_active (&pipe_w)) 1685 if (ev_is_active (&pipe_w))
1524 { 1686 {
1525 ev_ref (EV_A); /* signal watcher */ 1687 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1688 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1689
1528#if EV_USE_EVENTFD 1690#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1691 if (evfd >= 0)
1530 close (evfd); 1692 close (evfd);
1531#endif 1693#endif
1532 1694
1533 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1534 { 1696 {
1535 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1699 }
1538 } 1700 }
1701
1702#if EV_USE_SIGNALFD
1703 if (ev_is_active (&sigfd_w))
1704 close (sigfd);
1705#endif
1539 1706
1540#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1542 close (fs_fd); 1709 close (fs_fd);
1543#endif 1710#endif
1567#if EV_IDLE_ENABLE 1734#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1735 array_free (idle, [i]);
1569#endif 1736#endif
1570 } 1737 }
1571 1738
1572 ev_free (anfds); anfdmax = 0; 1739 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1740
1574 /* have to use the microsoft-never-gets-it-right macro */ 1741 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1742 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1743 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1744 array_free (timer, EMPTY);
1612 1779
1613 if (ev_is_active (&pipe_w)) 1780 if (ev_is_active (&pipe_w))
1614 { 1781 {
1615 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1617 gotsig = 1; 1784 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1786 async_pending = 1;
1620#endif 1787#endif
1621 1788
1622 ev_ref (EV_A); 1789 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1790 ev_io_stop (EV_A_ &pipe_w);
1624 1791
1627 close (evfd); 1794 close (evfd);
1628#endif 1795#endif
1629 1796
1630 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1631 { 1798 {
1632 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1801 }
1635 1802
1803#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1636 evpipe_init (EV_A); 1804 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1805 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1806 pipecb (EV_A_ &pipe_w, EV_READ);
1807#endif
1639 } 1808 }
1640 1809
1641 postfork = 0; 1810 postfork = 0;
1642} 1811}
1643 1812
1644#if EV_MULTIPLICITY 1813#if EV_MULTIPLICITY
1645 1814
1646struct ev_loop * 1815struct ev_loop *
1647ev_loop_new (unsigned int flags) 1816ev_loop_new (unsigned int flags)
1648{ 1817{
1649 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));
1650 1819
1651 memset (loop, 0, sizeof (struct ev_loop)); 1820 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1821 loop_init (EV_A_ flags);
1654 1822
1655 if (ev_backend (EV_A)) 1823 if (ev_backend (EV_A))
1656 return loop; 1824 return EV_A;
1657 1825
1658 return 0; 1826 return 0;
1659} 1827}
1660 1828
1661void 1829void
1757#if EV_ASYNC_ENABLE 1925#if EV_ASYNC_ENABLE
1758 assert (asyncmax >= asynccnt); 1926 assert (asyncmax >= asynccnt);
1759 array_verify (EV_A_ (W *)asyncs, asynccnt); 1927 array_verify (EV_A_ (W *)asyncs, asynccnt);
1760#endif 1928#endif
1761 1929
1930#if EV_PREPARE_ENABLE
1762 assert (preparemax >= preparecnt); 1931 assert (preparemax >= preparecnt);
1763 array_verify (EV_A_ (W *)prepares, preparecnt); 1932 array_verify (EV_A_ (W *)prepares, preparecnt);
1933#endif
1764 1934
1935#if EV_CHECK_ENABLE
1765 assert (checkmax >= checkcnt); 1936 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1937 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif
1767 1939
1768# if 0 1940# if 0
1941#if EV_CHILD_ENABLE
1769 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)
1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif
1771# endif 1945# endif
1772#endif 1946#endif
1773} 1947}
1774#endif 1948#endif
1775 1949
1782#endif 1956#endif
1783{ 1957{
1784 if (!ev_default_loop_ptr) 1958 if (!ev_default_loop_ptr)
1785 { 1959 {
1786#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1961 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1962#else
1789 ev_default_loop_ptr = 1; 1963 ev_default_loop_ptr = 1;
1790#endif 1964#endif
1791 1965
1792 loop_init (EV_A_ flags); 1966 loop_init (EV_A_ flags);
1793 1967
1794 if (ev_backend (EV_A)) 1968 if (ev_backend (EV_A))
1795 { 1969 {
1796#ifndef _WIN32 1970#if EV_CHILD_ENABLE
1797 ev_signal_init (&childev, childcb, SIGCHLD); 1971 ev_signal_init (&childev, childcb, SIGCHLD);
1798 ev_set_priority (&childev, EV_MAXPRI); 1972 ev_set_priority (&childev, EV_MAXPRI);
1799 ev_signal_start (EV_A_ &childev); 1973 ev_signal_start (EV_A_ &childev);
1800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1974 ev_unref (EV_A); /* child watcher should not keep loop alive */
1801#endif 1975#endif
1809 1983
1810void 1984void
1811ev_default_destroy (void) 1985ev_default_destroy (void)
1812{ 1986{
1813#if EV_MULTIPLICITY 1987#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1988 EV_P = ev_default_loop_ptr;
1815#endif 1989#endif
1816 1990
1817 ev_default_loop_ptr = 0; 1991 ev_default_loop_ptr = 0;
1818 1992
1819#ifndef _WIN32 1993#if EV_CHILD_ENABLE
1820 ev_ref (EV_A); /* child watcher */ 1994 ev_ref (EV_A); /* child watcher */
1821 ev_signal_stop (EV_A_ &childev); 1995 ev_signal_stop (EV_A_ &childev);
1822#endif 1996#endif
1823 1997
1824 loop_destroy (EV_A); 1998 loop_destroy (EV_A);
1826 2000
1827void 2001void
1828ev_default_fork (void) 2002ev_default_fork (void)
1829{ 2003{
1830#if EV_MULTIPLICITY 2004#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 2005 EV_P = ev_default_loop_ptr;
1832#endif 2006#endif
1833 2007
1834 postfork = 1; /* must be in line with ev_loop_fork */ 2008 postfork = 1; /* must be in line with ev_loop_fork */
1835} 2009}
1836 2010
2031 ANHE_at_cache (*he); 2205 ANHE_at_cache (*he);
2032 } 2206 }
2033} 2207}
2034 2208
2035/* fetch new monotonic and realtime times from the kernel */ 2209/* fetch new monotonic and realtime times from the kernel */
2036/* also detetc if there was a timejump, and act accordingly */ 2210/* also detect if there was a timejump, and act accordingly */
2037inline_speed void 2211inline_speed void
2038time_update (EV_P_ ev_tstamp max_block) 2212time_update (EV_P_ ev_tstamp max_block)
2039{ 2213{
2040#if EV_USE_MONOTONIC 2214#if EV_USE_MONOTONIC
2041 if (expect_true (have_monotonic)) 2215 if (expect_true (have_monotonic))
2136 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2310 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2137 EV_INVOKE_PENDING; 2311 EV_INVOKE_PENDING;
2138 } 2312 }
2139#endif 2313#endif
2140 2314
2315#if EV_PREPARE_ENABLE
2141 /* queue prepare watchers (and execute them) */ 2316 /* queue prepare watchers (and execute them) */
2142 if (expect_false (preparecnt)) 2317 if (expect_false (preparecnt))
2143 { 2318 {
2144 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2319 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2145 EV_INVOKE_PENDING; 2320 EV_INVOKE_PENDING;
2146 } 2321 }
2322#endif
2147 2323
2148 if (expect_false (loop_done)) 2324 if (expect_false (loop_done))
2149 break; 2325 break;
2150 2326
2151 /* we might have forked, so reify kernel state if necessary */ 2327 /* we might have forked, so reify kernel state if necessary */
2224#if EV_IDLE_ENABLE 2400#if EV_IDLE_ENABLE
2225 /* queue idle watchers unless other events are pending */ 2401 /* queue idle watchers unless other events are pending */
2226 idle_reify (EV_A); 2402 idle_reify (EV_A);
2227#endif 2403#endif
2228 2404
2405#if EV_CHECK_ENABLE
2229 /* queue check watchers, to be executed first */ 2406 /* queue check watchers, to be executed first */
2230 if (expect_false (checkcnt)) 2407 if (expect_false (checkcnt))
2231 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2408 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2409#endif
2232 2410
2233 EV_INVOKE_PENDING; 2411 EV_INVOKE_PENDING;
2234 } 2412 }
2235 while (expect_true ( 2413 while (expect_true (
2236 activecnt 2414 activecnt
2302inline_size void 2480inline_size void
2303wlist_del (WL *head, WL elem) 2481wlist_del (WL *head, WL elem)
2304{ 2482{
2305 while (*head) 2483 while (*head)
2306 { 2484 {
2307 if (*head == elem) 2485 if (expect_true (*head == elem))
2308 { 2486 {
2309 *head = elem->next; 2487 *head = elem->next;
2310 return; 2488 break;
2311 } 2489 }
2312 2490
2313 head = &(*head)->next; 2491 head = &(*head)->next;
2314 } 2492 }
2315} 2493}
2375 2553
2376 if (expect_false (ev_is_active (w))) 2554 if (expect_false (ev_is_active (w)))
2377 return; 2555 return;
2378 2556
2379 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2557 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2380 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))));
2381 2559
2382 EV_FREQUENT_CHECK; 2560 EV_FREQUENT_CHECK;
2383 2561
2384 ev_start (EV_A_ (W)w, 1); 2562 ev_start (EV_A_ (W)w, 1);
2385 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2563 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2455 timers [active] = timers [timercnt + HEAP0]; 2633 timers [active] = timers [timercnt + HEAP0];
2456 adjustheap (timers, timercnt, active); 2634 adjustheap (timers, timercnt, active);
2457 } 2635 }
2458 } 2636 }
2459 2637
2460 EV_FREQUENT_CHECK;
2461
2462 ev_at (w) -= mn_now; 2638 ev_at (w) -= mn_now;
2463 2639
2464 ev_stop (EV_A_ (W)w); 2640 ev_stop (EV_A_ (W)w);
2641
2642 EV_FREQUENT_CHECK;
2465} 2643}
2466 2644
2467void noinline 2645void noinline
2468ev_timer_again (EV_P_ ev_timer *w) 2646ev_timer_again (EV_P_ ev_timer *w)
2469{ 2647{
2548 periodics [active] = periodics [periodiccnt + HEAP0]; 2726 periodics [active] = periodics [periodiccnt + HEAP0];
2549 adjustheap (periodics, periodiccnt, active); 2727 adjustheap (periodics, periodiccnt, active);
2550 } 2728 }
2551 } 2729 }
2552 2730
2553 EV_FREQUENT_CHECK;
2554
2555 ev_stop (EV_A_ (W)w); 2731 ev_stop (EV_A_ (W)w);
2732
2733 EV_FREQUENT_CHECK;
2556} 2734}
2557 2735
2558void noinline 2736void noinline
2559ev_periodic_again (EV_P_ ev_periodic *w) 2737ev_periodic_again (EV_P_ ev_periodic *w)
2560{ 2738{
2566 2744
2567#ifndef SA_RESTART 2745#ifndef SA_RESTART
2568# define SA_RESTART 0 2746# define SA_RESTART 0
2569#endif 2747#endif
2570 2748
2749#if EV_SIGNAL_ENABLE
2750
2571void noinline 2751void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2752ev_signal_start (EV_P_ ev_signal *w)
2573{ 2753{
2574#if EV_MULTIPLICITY
2575 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2576#endif
2577 if (expect_false (ev_is_active (w))) 2754 if (expect_false (ev_is_active (w)))
2578 return; 2755 return;
2579 2756
2580 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));
2581 2758
2582 evpipe_init (EV_A); 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));
2583 2762
2584 EV_FREQUENT_CHECK; 2763 signals [w->signum - 1].loop = EV_A;
2764#endif
2585 2765
2766 EV_FREQUENT_CHECK;
2767
2768#if EV_USE_SIGNALFD
2769 if (sigfd == -2)
2586 { 2770 {
2587#ifndef _WIN32 2771 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2772 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2773 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2774
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2775 if (sigfd >= 0)
2776 {
2777 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2778
2595#ifndef _WIN32 2779 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2780
2597#endif 2781 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2782 ev_set_priority (&sigfd_w, EV_MAXPRI);
2783 ev_io_start (EV_A_ &sigfd_w);
2784 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2785 }
2598 } 2786 }
2787
2788 if (sigfd >= 0)
2789 {
2790 /* TODO: check .head */
2791 sigaddset (&sigfd_set, w->signum);
2792 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2793
2794 signalfd (sigfd, &sigfd_set, 0);
2795 }
2796#endif
2599 2797
2600 ev_start (EV_A_ (W)w, 1); 2798 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2799 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2800
2603 if (!((WL)w)->next) 2801 if (!((WL)w)->next)
2802# if EV_USE_SIGNALFD
2803 if (sigfd < 0) /*TODO*/
2804# endif
2604 { 2805 {
2605#if _WIN32 2806# ifdef _WIN32
2807 evpipe_init (EV_A);
2808
2606 signal (w->signum, ev_sighandler); 2809 signal (w->signum, ev_sighandler);
2607#else 2810# else
2608 struct sigaction sa = { }; 2811 struct sigaction sa;
2812
2813 evpipe_init (EV_A);
2814
2609 sa.sa_handler = ev_sighandler; 2815 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2816 sigfillset (&sa.sa_mask);
2611 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 */
2612 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);
2613#endif 2823#endif
2614 } 2824 }
2615 2825
2616 EV_FREQUENT_CHECK; 2826 EV_FREQUENT_CHECK;
2617} 2827}
2618 2828
2619void noinline 2829void noinline
2627 2837
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2838 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2839 ev_stop (EV_A_ (W)w);
2630 2840
2631 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
2846#if EV_USE_SIGNALFD
2847 if (sigfd >= 0)
2848 {
2849 sigset_t ss;
2850
2851 sigemptyset (&ss);
2852 sigaddset (&ss, w->signum);
2853 sigdelset (&sigfd_set, w->signum);
2854
2855 signalfd (sigfd, &sigfd_set, 0);
2856 sigprocmask (SIG_UNBLOCK, &ss, 0);
2857 }
2858 else
2859#endif
2632 signal (w->signum, SIG_DFL); 2860 signal (w->signum, SIG_DFL);
2861 }
2633 2862
2634 EV_FREQUENT_CHECK; 2863 EV_FREQUENT_CHECK;
2635} 2864}
2865
2866#endif
2867
2868#if EV_CHILD_ENABLE
2636 2869
2637void 2870void
2638ev_child_start (EV_P_ ev_child *w) 2871ev_child_start (EV_P_ ev_child *w)
2639{ 2872{
2640#if EV_MULTIPLICITY 2873#if EV_MULTIPLICITY
2664 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2665 2898
2666 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2667} 2900}
2668 2901
2902#endif
2903
2669#if EV_STAT_ENABLE 2904#if EV_STAT_ENABLE
2670 2905
2671# ifdef _WIN32 2906# ifdef _WIN32
2672# undef lstat 2907# undef lstat
2673# define lstat(a,b) _stati64 (a,b) 2908# define lstat(a,b) _stati64 (a,b)
2678#define MIN_STAT_INTERVAL 0.1074891 2913#define MIN_STAT_INTERVAL 0.1074891
2679 2914
2680static 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);
2681 2916
2682#if EV_USE_INOTIFY 2917#if EV_USE_INOTIFY
2683# 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)
2684 2921
2685static void noinline 2922static void noinline
2686infy_add (EV_P_ ev_stat *w) 2923infy_add (EV_P_ ev_stat *w)
2687{ 2924{
2688 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);
2689 2926
2690 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 */
2691 { 2947 }
2948 else
2949 {
2950 /* can't use inotify, continue to stat */
2692 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2951 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2693 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2694 2952
2695 /* monitor some parent directory for speedup hints */ 2953 /* if path is not there, monitor some parent directory for speedup hints */
2696 /* 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, */
2697 /* but an efficiency issue only */ 2955 /* but an efficiency issue only */
2698 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2956 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2699 { 2957 {
2700 char path [4096]; 2958 char path [4096];
2716 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2717 } 2975 }
2718 } 2976 }
2719 2977
2720 if (w->wd >= 0) 2978 if (w->wd >= 0)
2721 {
2722 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);
2723 2980
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 2981 /* now re-arm timer, if required */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 2982 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2726 /* also do poll on <2.6.25, but with normal frequency */
2727 struct statfs sfs;
2728
2729 if (fs_2625 && !statfs (w->path, &sfs))
2730 if (sfs.f_type == 0x1373 /* devfs */
2731 || sfs.f_type == 0xEF53 /* ext2/3 */
2732 || sfs.f_type == 0x3153464a /* jfs */
2733 || sfs.f_type == 0x52654973 /* reiser3 */
2734 || sfs.f_type == 0x01021994 /* tempfs */
2735 || sfs.f_type == 0x58465342 /* xfs */)
2736 return;
2737
2738 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2739 ev_timer_again (EV_A_ &w->timer); 2983 ev_timer_again (EV_A_ &w->timer);
2740 } 2984 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2741} 2985}
2742 2986
2743static void noinline 2987static void noinline
2744infy_del (EV_P_ ev_stat *w) 2988infy_del (EV_P_ ev_stat *w)
2745{ 2989{
2790 3034
2791static void 3035static void
2792infy_cb (EV_P_ ev_io *w, int revents) 3036infy_cb (EV_P_ ev_io *w, int revents)
2793{ 3037{
2794 char buf [EV_INOTIFY_BUFSIZE]; 3038 char buf [EV_INOTIFY_BUFSIZE];
2795 struct inotify_event *ev = (struct inotify_event *)buf;
2796 int ofs; 3039 int ofs;
2797 int len = read (fs_fd, buf, sizeof (buf)); 3040 int len = read (fs_fd, buf, sizeof (buf));
2798 3041
2799 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);
2800 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;
2801} 3080}
2802 3081
2803inline_size void 3082inline_size void
2804check_2625 (EV_P) 3083ev_check_2625 (EV_P)
2805{ 3084{
2806 /* kernels < 2.6.25 are borked 3085 /* kernels < 2.6.25 are borked
2807 * 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
2808 */ 3087 */
2809 struct utsname buf; 3088 if (ev_linux_version () < 0x020619)
2810 int major, minor, micro;
2811
2812 if (uname (&buf))
2813 return; 3089 return;
2814 3090
2815 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2816 return;
2817
2818 if (major < 2
2819 || (major == 2 && minor < 6)
2820 || (major == 2 && minor == 6 && micro < 25))
2821 return;
2822
2823 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 ();
2824} 3103}
2825 3104
2826inline_size void 3105inline_size void
2827infy_init (EV_P) 3106infy_init (EV_P)
2828{ 3107{
2829 if (fs_fd != -2) 3108 if (fs_fd != -2)
2830 return; 3109 return;
2831 3110
2832 fs_fd = -1; 3111 fs_fd = -1;
2833 3112
2834 check_2625 (EV_A); 3113 ev_check_2625 (EV_A);
2835 3114
2836 fs_fd = inotify_init (); 3115 fs_fd = infy_newfd ();
2837 3116
2838 if (fs_fd >= 0) 3117 if (fs_fd >= 0)
2839 { 3118 {
3119 fd_intern (fs_fd);
2840 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3120 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2841 ev_set_priority (&fs_w, EV_MAXPRI); 3121 ev_set_priority (&fs_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &fs_w); 3122 ev_io_start (EV_A_ &fs_w);
3123 ev_unref (EV_A);
2843 } 3124 }
2844} 3125}
2845 3126
2846inline_size void 3127inline_size void
2847infy_fork (EV_P) 3128infy_fork (EV_P)
2849 int slot; 3130 int slot;
2850 3131
2851 if (fs_fd < 0) 3132 if (fs_fd < 0)
2852 return; 3133 return;
2853 3134
3135 ev_ref (EV_A);
3136 ev_io_stop (EV_A_ &fs_w);
2854 close (fs_fd); 3137 close (fs_fd);
2855 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 }
2856 3147
2857 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2858 { 3149 {
2859 WL w_ = fs_hash [slot].head; 3150 WL w_ = fs_hash [slot].head;
2860 fs_hash [slot].head = 0; 3151 fs_hash [slot].head = 0;
2867 w->wd = -1; 3158 w->wd = -1;
2868 3159
2869 if (fs_fd >= 0) 3160 if (fs_fd >= 0)
2870 infy_add (EV_A_ w); /* re-add, no matter what */ 3161 infy_add (EV_A_ w); /* re-add, no matter what */
2871 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);
2872 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 }
2873 } 3169 }
2874 } 3170 }
2875} 3171}
2876 3172
2877#endif 3173#endif
2894static void noinline 3190static void noinline
2895stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3191stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2896{ 3192{
2897 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3193 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2898 3194
2899 /* we copy this here each the time so that */ 3195 ev_statdata prev = w->attr;
2900 /* prev has the old value when the callback gets invoked */
2901 w->prev = w->attr;
2902 ev_stat_stat (EV_A_ w); 3196 ev_stat_stat (EV_A_ w);
2903 3197
2904 /* 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 */
2905 if ( 3199 if (
2906 w->prev.st_dev != w->attr.st_dev 3200 prev.st_dev != w->attr.st_dev
2907 || w->prev.st_ino != w->attr.st_ino 3201 || prev.st_ino != w->attr.st_ino
2908 || w->prev.st_mode != w->attr.st_mode 3202 || prev.st_mode != w->attr.st_mode
2909 || w->prev.st_nlink != w->attr.st_nlink 3203 || prev.st_nlink != w->attr.st_nlink
2910 || w->prev.st_uid != w->attr.st_uid 3204 || prev.st_uid != w->attr.st_uid
2911 || w->prev.st_gid != w->attr.st_gid 3205 || prev.st_gid != w->attr.st_gid
2912 || w->prev.st_rdev != w->attr.st_rdev 3206 || prev.st_rdev != w->attr.st_rdev
2913 || w->prev.st_size != w->attr.st_size 3207 || prev.st_size != w->attr.st_size
2914 || w->prev.st_atime != w->attr.st_atime 3208 || prev.st_atime != w->attr.st_atime
2915 || w->prev.st_mtime != w->attr.st_mtime 3209 || prev.st_mtime != w->attr.st_mtime
2916 || w->prev.st_ctime != w->attr.st_ctime 3210 || prev.st_ctime != w->attr.st_ctime
2917 ) { 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
2918 #if EV_USE_INOTIFY 3217 #if EV_USE_INOTIFY
2919 if (fs_fd >= 0) 3218 if (fs_fd >= 0)
2920 { 3219 {
2921 infy_del (EV_A_ w); 3220 infy_del (EV_A_ w);
2922 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
2947 3246
2948 if (fs_fd >= 0) 3247 if (fs_fd >= 0)
2949 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
2950 else 3249 else
2951#endif 3250#endif
3251 {
2952 ev_timer_again (EV_A_ &w->timer); 3252 ev_timer_again (EV_A_ &w->timer);
3253 ev_unref (EV_A);
3254 }
2953 3255
2954 ev_start (EV_A_ (W)w, 1); 3256 ev_start (EV_A_ (W)w, 1);
2955 3257
2956 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
2957} 3259}
2966 EV_FREQUENT_CHECK; 3268 EV_FREQUENT_CHECK;
2967 3269
2968#if EV_USE_INOTIFY 3270#if EV_USE_INOTIFY
2969 infy_del (EV_A_ w); 3271 infy_del (EV_A_ w);
2970#endif 3272#endif
3273
3274 if (ev_is_active (&w->timer))
3275 {
3276 ev_ref (EV_A);
2971 ev_timer_stop (EV_A_ &w->timer); 3277 ev_timer_stop (EV_A_ &w->timer);
3278 }
2972 3279
2973 ev_stop (EV_A_ (W)w); 3280 ev_stop (EV_A_ (W)w);
2974 3281
2975 EV_FREQUENT_CHECK; 3282 EV_FREQUENT_CHECK;
2976} 3283}
3021 3328
3022 EV_FREQUENT_CHECK; 3329 EV_FREQUENT_CHECK;
3023} 3330}
3024#endif 3331#endif
3025 3332
3333#if EV_PREPARE_ENABLE
3026void 3334void
3027ev_prepare_start (EV_P_ ev_prepare *w) 3335ev_prepare_start (EV_P_ ev_prepare *w)
3028{ 3336{
3029 if (expect_false (ev_is_active (w))) 3337 if (expect_false (ev_is_active (w)))
3030 return; 3338 return;
3056 3364
3057 ev_stop (EV_A_ (W)w); 3365 ev_stop (EV_A_ (W)w);
3058 3366
3059 EV_FREQUENT_CHECK; 3367 EV_FREQUENT_CHECK;
3060} 3368}
3369#endif
3061 3370
3371#if EV_CHECK_ENABLE
3062void 3372void
3063ev_check_start (EV_P_ ev_check *w) 3373ev_check_start (EV_P_ ev_check *w)
3064{ 3374{
3065 if (expect_false (ev_is_active (w))) 3375 if (expect_false (ev_is_active (w)))
3066 return; 3376 return;
3092 3402
3093 ev_stop (EV_A_ (W)w); 3403 ev_stop (EV_A_ (W)w);
3094 3404
3095 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
3096} 3406}
3407#endif
3097 3408
3098#if EV_EMBED_ENABLE 3409#if EV_EMBED_ENABLE
3099void noinline 3410void noinline
3100ev_embed_sweep (EV_P_ ev_embed *w) 3411ev_embed_sweep (EV_P_ ev_embed *w)
3101{ 3412{
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3428embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3429{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3430 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3431
3121 { 3432 {
3122 struct ev_loop *loop = w->other; 3433 EV_P = w->other;
3123 3434
3124 while (fdchangecnt) 3435 while (fdchangecnt)
3125 { 3436 {
3126 fd_reify (EV_A); 3437 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3438 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3135 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));
3136 3447
3137 ev_embed_stop (EV_A_ w); 3448 ev_embed_stop (EV_A_ w);
3138 3449
3139 { 3450 {
3140 struct ev_loop *loop = w->other; 3451 EV_P = w->other;
3141 3452
3142 ev_loop_fork (EV_A); 3453 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3454 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3144 } 3455 }
3145 3456
3159{ 3470{
3160 if (expect_false (ev_is_active (w))) 3471 if (expect_false (ev_is_active (w)))
3161 return; 3472 return;
3162 3473
3163 { 3474 {
3164 struct ev_loop *loop = w->other; 3475 EV_P = w->other;
3165 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 ()));
3166 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);
3167 } 3478 }
3168 3479
3169 EV_FREQUENT_CHECK; 3480 EV_FREQUENT_CHECK;
3196 3507
3197 ev_io_stop (EV_A_ &w->io); 3508 ev_io_stop (EV_A_ &w->io);
3198 ev_prepare_stop (EV_A_ &w->prepare); 3509 ev_prepare_stop (EV_A_ &w->prepare);
3199 ev_fork_stop (EV_A_ &w->fork); 3510 ev_fork_stop (EV_A_ &w->fork);
3200 3511
3512 ev_stop (EV_A_ (W)w);
3513
3201 EV_FREQUENT_CHECK; 3514 EV_FREQUENT_CHECK;
3202} 3515}
3203#endif 3516#endif
3204 3517
3205#if EV_FORK_ENABLE 3518#if EV_FORK_ENABLE
3281 3594
3282void 3595void
3283ev_async_send (EV_P_ ev_async *w) 3596ev_async_send (EV_P_ ev_async *w)
3284{ 3597{
3285 w->sent = 1; 3598 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3599 evpipe_write (EV_A_ &async_pending);
3287} 3600}
3288#endif 3601#endif
3289 3602
3290/*****************************************************************************/ 3603/*****************************************************************************/
3291 3604
3428 if (types & EV_ASYNC) 3741 if (types & EV_ASYNC)
3429 for (i = asynccnt; i--; ) 3742 for (i = asynccnt; i--; )
3430 cb (EV_A_ EV_ASYNC, asyncs [i]); 3743 cb (EV_A_ EV_ASYNC, asyncs [i]);
3431#endif 3744#endif
3432 3745
3746#if EV_PREPARE_ENABLE
3433 if (types & EV_PREPARE) 3747 if (types & EV_PREPARE)
3434 for (i = preparecnt; i--; ) 3748 for (i = preparecnt; i--; )
3435#if EV_EMBED_ENABLE 3749# if EV_EMBED_ENABLE
3436 if (ev_cb (prepares [i]) != embed_prepare_cb) 3750 if (ev_cb (prepares [i]) != embed_prepare_cb)
3437#endif 3751# endif
3438 cb (EV_A_ EV_PREPARE, prepares [i]); 3752 cb (EV_A_ EV_PREPARE, prepares [i]);
3753#endif
3439 3754
3755#if EV_CHECK_ENABLE
3440 if (types & EV_CHECK) 3756 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3757 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3758 cb (EV_A_ EV_CHECK, checks [i]);
3759#endif
3443 3760
3761#if EV_SIGNAL_ENABLE
3444 if (types & EV_SIGNAL) 3762 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3763 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3764 for (wl = signals [i].head; wl; )
3447 { 3765 {
3448 wn = wl->next; 3766 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3767 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3768 wl = wn;
3451 } 3769 }
3770#endif
3452 3771
3772#if EV_CHILD_ENABLE
3453 if (types & EV_CHILD) 3773 if (types & EV_CHILD)
3454 for (i = EV_PID_HASHSIZE; i--; ) 3774 for (i = EV_PID_HASHSIZE; i--; )
3455 for (wl = childs [i]; wl; ) 3775 for (wl = childs [i]; wl; )
3456 { 3776 {
3457 wn = wl->next; 3777 wn = wl->next;
3458 cb (EV_A_ EV_CHILD, wl); 3778 cb (EV_A_ EV_CHILD, wl);
3459 wl = wn; 3779 wl = wn;
3460 } 3780 }
3781#endif
3461/* EV_STAT 0x00001000 /* stat data changed */ 3782/* EV_STAT 0x00001000 /* stat data changed */
3462/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3783/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3463} 3784}
3464#endif 3785#endif
3465 3786

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines