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

Comparing libev/ev.c (file contents):
Revision 1.288 by root, Sat Apr 25 14:12:48 2009 UTC vs.
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC

57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 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
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
176# endif 187# endif
177#endif 188#endif
178 189
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
180 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
181#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
184# else 222# else
185# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
264# else 302# else
265# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
266# endif 304# endif
267#endif 305#endif
268 306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
312# endif
313#endif
314
269#if 0 /* debugging */ 315#if 0 /* debugging */
270# define EV_VERIFY 3 316# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 317# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 318# define EV_HEAP_CACHE_AT 1
273#endif 319#endif
282 328
283#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 331#endif
286 332
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL
336# include <syscall.h>
337# ifdef SYS_clock_gettime
338# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
339# undef EV_USE_MONOTONIC
340# define EV_USE_MONOTONIC 1
341# else
342# undef EV_USE_CLOCK_SYSCALL
343# define EV_USE_CLOCK_SYSCALL 0
344# endif
345#endif
346
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348
349#ifdef _AIX
350/* AIX has a completely broken poll.h header */
351# undef EV_USE_POLL
352# define EV_USE_POLL 0
353#endif
288 354
289#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
292#endif 358#endif
320 386
321#if EV_SELECT_IS_WINSOCKET 387#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 388# include <winsock.h>
323#endif 389#endif
324 390
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
403# endif
337# ifdef __cplusplus 404# ifdef __cplusplus
338extern "C" { 405extern "C" {
339# endif 406# endif
340int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 408# ifdef __cplusplus
342} 409}
343# endif 410# endif
344#endif 411#endif
412
413#if EV_USE_SIGNALFD
414/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
415# include <stdint.h>
416# ifndef SFD_NONBLOCK
417# define SFD_NONBLOCK O_NONBLOCK
418# endif
419# ifndef SFD_CLOEXEC
420# ifdef O_CLOEXEC
421# define SFD_CLOEXEC O_CLOEXEC
422# else
423# define SFD_CLOEXEC 02000000
424# endif
425# endif
426# ifdef __cplusplus
427extern "C" {
428# endif
429int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
436# ifdef __cplusplus
437}
438# endif
439#endif
440
345 441
346/**/ 442/**/
347 443
348#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 457 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 459
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 460#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 461#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 462
368#if __GNUC__ >= 4 463#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
371#else 466#else
384# define inline_speed static noinline 479# define inline_speed static noinline
385#else 480#else
386# define inline_speed static inline 481# define inline_speed static inline
387#endif 482#endif
388 483
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
485
486#if EV_MINPRI == EV_MAXPRI
487# define ABSPRI(w) (((W)w), 0)
488#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 489# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
490#endif
391 491
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 492#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 493#define EMPTY2(a,b) /* used to suppress some warnings */
394 494
395typedef ev_watcher *W; 495typedef ev_watcher *W;
407 507
408#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 510#endif
411 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
412#ifdef _WIN32 522#ifdef _WIN32
413# include "ev_win32.c" 523# include "ev_win32.c"
414#endif 524#endif
415 525
416/*****************************************************************************/ 526/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 588#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 589#define ev_free(ptr) ev_realloc ((ptr), 0)
480 590
481/*****************************************************************************/ 591/*****************************************************************************/
482 592
593/* set in reify when reification needed */
594#define EV_ANFD_REIFY 1
595
483/* file descriptor info structure */ 596/* file descriptor info structure */
484typedef struct 597typedef struct
485{ 598{
486 WL head; 599 WL head;
487 unsigned char events; /* the events watched for */ 600 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 601 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 602 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 603 unsigned char unused;
491#if EV_USE_EPOLL 604#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 605 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 606#endif
555 668
556 static int ev_default_loop_ptr; 669 static int ev_default_loop_ptr;
557 670
558#endif 671#endif
559 672
673#if EV_MINIMAL < 2
674# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
675# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
676# define EV_INVOKE_PENDING invoke_cb (EV_A)
677#else
678# define EV_RELEASE_CB (void)0
679# define EV_ACQUIRE_CB (void)0
680# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
681#endif
682
683#define EVUNLOOP_RECURSE 0x80
684
560/*****************************************************************************/ 685/*****************************************************************************/
561 686
687#ifndef EV_HAVE_EV_TIME
562ev_tstamp 688ev_tstamp
563ev_time (void) 689ev_time (void)
564{ 690{
565#if EV_USE_REALTIME 691#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 692 if (expect_true (have_realtime))
573 699
574 struct timeval tv; 700 struct timeval tv;
575 gettimeofday (&tv, 0); 701 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 702 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 703}
704#endif
578 705
579inline_size ev_tstamp 706inline_size ev_tstamp
580get_clock (void) 707get_clock (void)
581{ 708{
582#if EV_USE_MONOTONIC 709#if EV_USE_MONOTONIC
618 745
619 tv.tv_sec = (time_t)delay; 746 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 747 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 748
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 749 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 750 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 751 /* by older ones */
625 select (0, 0, 0, 0, &tv); 752 select (0, 0, 0, 0, &tv);
626#endif 753#endif
627 } 754 }
628} 755}
736} 863}
737 864
738/*****************************************************************************/ 865/*****************************************************************************/
739 866
740inline_speed void 867inline_speed void
741fd_event (EV_P_ int fd, int revents) 868fd_event_nc (EV_P_ int fd, int revents)
742{ 869{
743 ANFD *anfd = anfds + fd; 870 ANFD *anfd = anfds + fd;
744 ev_io *w; 871 ev_io *w;
745 872
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 873 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
750 if (ev) 877 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 878 ev_feed_event (EV_A_ (W)w, ev);
752 } 879 }
753} 880}
754 881
882/* do not submit kernel events for fds that have reify set */
883/* because that means they changed while we were polling for new events */
884inline_speed void
885fd_event (EV_P_ int fd, int revents)
886{
887 ANFD *anfd = anfds + fd;
888
889 if (expect_true (!anfd->reify))
890 fd_event_nc (EV_A_ fd, revents);
891}
892
755void 893void
756ev_feed_fd_event (EV_P_ int fd, int revents) 894ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 895{
758 if (fd >= 0 && fd < anfdmax) 896 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 897 fd_event_nc (EV_A_ fd, revents);
760} 898}
761 899
762/* make sure the external fd watch events are in-sync */ 900/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 901/* with the kernel/libev internal state */
764inline_size void 902inline_size void
779 917
780#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
781 if (events) 919 if (events)
782 { 920 {
783 unsigned long arg; 921 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
786 #else
787 anfd->handle = _get_osfhandle (fd);
788 #endif
789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 924 }
791#endif 925#endif
792 926
793 { 927 {
836/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
837inline_size int 971inline_size int
838fd_valid (int fd) 972fd_valid (int fd)
839{ 973{
840#ifdef _WIN32 974#ifdef _WIN32
841 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
842#else 976#else
843 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
844#endif 978#endif
845} 979}
846 980
864 998
865 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 1000 if (anfds [fd].events)
867 { 1001 {
868 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
869 return; 1003 break;
870 } 1004 }
871} 1005}
872 1006
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 1007/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 1008static void noinline
879 for (fd = 0; fd < anfdmax; ++fd) 1013 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1014 if (anfds [fd].events)
881 { 1015 {
882 anfds [fd].events = 0; 1016 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1017 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1019 }
886} 1020}
887 1021
888/*****************************************************************************/ 1022/*****************************************************************************/
889 1023
964 1098
965 for (;;) 1099 for (;;)
966 { 1100 {
967 int c = k << 1; 1101 int c = k << 1;
968 1102
969 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
970 break; 1104 break;
971 1105
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1106 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1107 ? 1 : 0;
974 1108
1010 1144
1011/* move an element suitably so it is in a correct place */ 1145/* move an element suitably so it is in a correct place */
1012inline_size void 1146inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
1014{ 1148{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1149 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1150 upheap (heap, k);
1017 else 1151 else
1018 downheap (heap, N, k); 1152 downheap (heap, N, k);
1019} 1153}
1020 1154
1033/*****************************************************************************/ 1167/*****************************************************************************/
1034 1168
1035/* associate signal watchers to a signal signal */ 1169/* associate signal watchers to a signal signal */
1036typedef struct 1170typedef struct
1037{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
1038 WL head; 1176 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1177} ANSIG;
1041 1178
1042static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1180
1047/*****************************************************************************/ 1181/*****************************************************************************/
1048 1182
1049/* used to prepare libev internal fd's */ 1183/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1184/* this is not fork-safe */
1051inline_speed void 1185inline_speed void
1052fd_intern (int fd) 1186fd_intern (int fd)
1053{ 1187{
1054#ifdef _WIN32 1188#ifdef _WIN32
1055 unsigned long arg = 1; 1189 unsigned long arg = 1;
1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1057#else 1191#else
1058 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1059 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1060#endif 1194#endif
1061} 1195}
1064evpipe_init (EV_P) 1198evpipe_init (EV_P)
1065{ 1199{
1066 if (!ev_is_active (&pipe_w)) 1200 if (!ev_is_active (&pipe_w))
1067 { 1201 {
1068#if EV_USE_EVENTFD 1202#if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1205 evfd = eventfd (0, 0);
1206
1207 if (evfd >= 0)
1070 { 1208 {
1071 evpipe [0] = -1; 1209 evpipe [0] = -1;
1072 fd_intern (evfd); 1210 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1211 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1212 }
1075 else 1213 else
1076#endif 1214#endif
1077 { 1215 {
1114/* called whenever the libev signal pipe */ 1252/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1253/* got some events (signal, async) */
1116static void 1254static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1256{
1257 int i;
1258
1119#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1260 if (evfd >= 0)
1121 { 1261 {
1122 uint64_t counter; 1262 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
1127 { 1267 {
1128 char dummy; 1268 char dummy;
1129 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1130 } 1270 }
1131 1271
1132 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1133 { 1273 {
1134 int signum; 1274 sig_pending = 0;
1135 gotsig = 0;
1136 1275
1137 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1279 }
1141 1280
1142#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1143 if (gotasync) 1282 if (async_pending)
1144 { 1283 {
1145 int i; 1284 async_pending = 0;
1146 gotasync = 0;
1147 1285
1148 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1150 { 1288 {
1151 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
1159 1297
1160static void 1298static void
1161ev_sighandler (int signum) 1299ev_sighandler (int signum)
1162{ 1300{
1163#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1165#endif 1303#endif
1166 1304
1167#if _WIN32 1305#ifdef _WIN32
1168 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1169#endif 1307#endif
1170 1308
1171 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1173} 1311}
1174 1312
1175void noinline 1313void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1177{ 1315{
1178 WL w; 1316 WL w;
1179 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1180#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1324 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1326
1184 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1328 return;
1329#endif
1188 1330
1189 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1190 1332
1191 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1335}
1336
1337#if EV_USE_SIGNALFD
1338static void
1339sigfdcb (EV_P_ ev_io *iow, int revents)
1340{
1341 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1342
1343 for (;;)
1344 {
1345 ssize_t res = read (sigfd, si, sizeof (si));
1346
1347 /* not ISO-C, as res might be -1, but works with SuS */
1348 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1349 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1350
1351 if (res < (ssize_t)sizeof (si))
1352 break;
1353 }
1354}
1355#endif
1194 1356
1195/*****************************************************************************/ 1357/*****************************************************************************/
1196 1358
1197static WL childs [EV_PID_HASHSIZE]; 1359static WL childs [EV_PID_HASHSIZE];
1198 1360
1343ev_backend (EV_P) 1505ev_backend (EV_P)
1344{ 1506{
1345 return backend; 1507 return backend;
1346} 1508}
1347 1509
1510#if EV_MINIMAL < 2
1348unsigned int 1511unsigned int
1349ev_loop_count (EV_P) 1512ev_loop_count (EV_P)
1350{ 1513{
1351 return loop_count; 1514 return loop_count;
1352} 1515}
1353 1516
1517unsigned int
1518ev_loop_depth (EV_P)
1519{
1520 return loop_depth;
1521}
1522
1354void 1523void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1525{
1357 io_blocktime = interval; 1526 io_blocktime = interval;
1358} 1527}
1360void 1529void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1530ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1531{
1363 timeout_blocktime = interval; 1532 timeout_blocktime = interval;
1364} 1533}
1534
1535void
1536ev_set_userdata (EV_P_ void *data)
1537{
1538 userdata = data;
1539}
1540
1541void *
1542ev_userdata (EV_P)
1543{
1544 return userdata;
1545}
1546
1547void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1548{
1549 invoke_cb = invoke_pending_cb;
1550}
1551
1552void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1553{
1554 release_cb = release;
1555 acquire_cb = acquire;
1556}
1557#endif
1365 1558
1366/* initialise a loop structure, must be zero-initialised */ 1559/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1560static void noinline
1368loop_init (EV_P_ unsigned int flags) 1561loop_init (EV_P_ unsigned int flags)
1369{ 1562{
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1581 have_monotonic = 1;
1389 } 1582 }
1390#endif 1583#endif
1391 1584
1585 /* pid check not overridable via env */
1586#ifndef _WIN32
1587 if (flags & EVFLAG_FORKCHECK)
1588 curpid = getpid ();
1589#endif
1590
1591 if (!(flags & EVFLAG_NOENV)
1592 && !enable_secure ()
1593 && getenv ("LIBEV_FLAGS"))
1594 flags = atoi (getenv ("LIBEV_FLAGS"));
1595
1392 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1597 mn_now = get_clock ();
1394 now_floor = mn_now; 1598 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1599 rtmn_diff = ev_rt_now - mn_now;
1600#if EV_MINIMAL < 2
1601 invoke_cb = ev_invoke_pending;
1602#endif
1396 1603
1397 io_blocktime = 0.; 1604 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1399 backend = 0; 1606 backend = 0;
1400 backend_fd = -1; 1607 backend_fd = -1;
1401 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1402#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1403 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1614#endif
1405 1615#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1617#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1618
1417 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1419 1621
1420#if EV_USE_PORT 1622#if EV_USE_PORT
1446{ 1648{
1447 int i; 1649 int i;
1448 1650
1449 if (ev_is_active (&pipe_w)) 1651 if (ev_is_active (&pipe_w))
1450 { 1652 {
1451 ev_ref (EV_A); /* signal watcher */ 1653 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1654 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1655
1454#if EV_USE_EVENTFD 1656#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1657 if (evfd >= 0)
1456 close (evfd); 1658 close (evfd);
1457#endif 1659#endif
1458 1660
1459 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1460 { 1662 {
1461 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1665 }
1464 } 1666 }
1667
1668#if EV_USE_SIGNALFD
1669 if (ev_is_active (&sigfd_w))
1670 close (sigfd);
1671#endif
1465 1672
1466#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1468 close (fs_fd); 1675 close (fs_fd);
1469#endif 1676#endif
1493#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1701 array_free (idle, [i]);
1495#endif 1702#endif
1496 } 1703 }
1497 1704
1498 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1706
1500 /* have to use the microsoft-never-gets-it-right macro */ 1707 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1708 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
1538 1745
1539 if (ev_is_active (&pipe_w)) 1746 if (ev_is_active (&pipe_w))
1540 { 1747 {
1541 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1543 gotsig = 1; 1750 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1752 async_pending = 1;
1546#endif 1753#endif
1547 1754
1548 ev_ref (EV_A); 1755 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1756 ev_io_stop (EV_A_ &pipe_w);
1550 1757
1553 close (evfd); 1760 close (evfd);
1554#endif 1761#endif
1555 1762
1556 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1557 { 1764 {
1558 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1767 }
1561 1768
1562 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
1570#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1571 1778
1572struct ev_loop * 1779struct ev_loop *
1573ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1574{ 1781{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1782 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1783
1577 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1580 1786
1581 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1582 return loop; 1788 return EV_A;
1583 1789
1584 return 0; 1790 return 0;
1585} 1791}
1586 1792
1587void 1793void
1594void 1800void
1595ev_loop_fork (EV_P) 1801ev_loop_fork (EV_P)
1596{ 1802{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1803 postfork = 1; /* must be in line with ev_default_fork */
1598} 1804}
1805#endif /* multiplicity */
1599 1806
1600#if EV_VERIFY 1807#if EV_VERIFY
1601static void noinline 1808static void noinline
1602verify_watcher (EV_P_ W w) 1809verify_watcher (EV_P_ W w)
1603{ 1810{
1631 verify_watcher (EV_A_ ws [cnt]); 1838 verify_watcher (EV_A_ ws [cnt]);
1632 } 1839 }
1633} 1840}
1634#endif 1841#endif
1635 1842
1843#if EV_MINIMAL < 2
1636void 1844void
1637ev_loop_verify (EV_P) 1845ev_loop_verify (EV_P)
1638{ 1846{
1639#if EV_VERIFY 1847#if EV_VERIFY
1640 int i; 1848 int i;
1689 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1899
1692# if 0 1900# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1901 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif
1696#endif 1903# endif
1904#endif
1697} 1905}
1698 1906#endif
1699#endif /* multiplicity */
1700 1907
1701#if EV_MULTIPLICITY 1908#if EV_MULTIPLICITY
1702struct ev_loop * 1909struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1910ev_default_loop_init (unsigned int flags)
1704#else 1911#else
1707#endif 1914#endif
1708{ 1915{
1709 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1710 { 1917 {
1711#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1920#else
1714 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1715#endif 1922#endif
1716 1923
1717 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1734 1941
1735void 1942void
1736ev_default_destroy (void) 1943ev_default_destroy (void)
1737{ 1944{
1738#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1740#endif 1947#endif
1741 1948
1742 ev_default_loop_ptr = 0; 1949 ev_default_loop_ptr = 0;
1743 1950
1744#ifndef _WIN32 1951#ifndef _WIN32
1751 1958
1752void 1959void
1753ev_default_fork (void) 1960ev_default_fork (void)
1754{ 1961{
1755#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1757#endif 1964#endif
1758 1965
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1967}
1761 1968
1765ev_invoke (EV_P_ void *w, int revents) 1972ev_invoke (EV_P_ void *w, int revents)
1766{ 1973{
1767 EV_CB_INVOKE ((W)w, revents); 1974 EV_CB_INVOKE ((W)w, revents);
1768} 1975}
1769 1976
1770inline_speed void 1977unsigned int
1771call_pending (EV_P) 1978ev_pending_count (EV_P)
1979{
1980 int pri;
1981 unsigned int count = 0;
1982
1983 for (pri = NUMPRI; pri--; )
1984 count += pendingcnt [pri];
1985
1986 return count;
1987}
1988
1989void noinline
1990ev_invoke_pending (EV_P)
1772{ 1991{
1773 int pri; 1992 int pri;
1774 1993
1775 for (pri = NUMPRI; pri--; ) 1994 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 1995 while (pendingcnt [pri])
1944 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
1945 } 2164 }
1946} 2165}
1947 2166
1948/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
1950inline_speed void 2169inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
1952{ 2171{
1953 int i;
1954
1955#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
1956 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
1957 { 2174 {
2175 int i;
1958 ev_tstamp odiff = rtmn_diff; 2176 ev_tstamp odiff = rtmn_diff;
1959 2177
1960 mn_now = get_clock (); 2178 mn_now = get_clock ();
1961 2179
1962 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2180 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
2012 2230
2013 mn_now = ev_rt_now; 2231 mn_now = ev_rt_now;
2014 } 2232 }
2015} 2233}
2016 2234
2017static int loop_done;
2018
2019void 2235void
2020ev_loop (EV_P_ int flags) 2236ev_loop (EV_P_ int flags)
2021{ 2237{
2238#if EV_MINIMAL < 2
2239 ++loop_depth;
2240#endif
2241
2242 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2243
2022 loop_done = EVUNLOOP_CANCEL; 2244 loop_done = EVUNLOOP_CANCEL;
2023 2245
2024 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2246 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2025 2247
2026 do 2248 do
2027 { 2249 {
2028#if EV_VERIFY >= 2 2250#if EV_VERIFY >= 2
2029 ev_loop_verify (EV_A); 2251 ev_loop_verify (EV_A);
2042 /* we might have forked, so queue fork handlers */ 2264 /* we might have forked, so queue fork handlers */
2043 if (expect_false (postfork)) 2265 if (expect_false (postfork))
2044 if (forkcnt) 2266 if (forkcnt)
2045 { 2267 {
2046 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2268 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2047 call_pending (EV_A); 2269 EV_INVOKE_PENDING;
2048 } 2270 }
2049#endif 2271#endif
2050 2272
2051 /* queue prepare watchers (and execute them) */ 2273 /* queue prepare watchers (and execute them) */
2052 if (expect_false (preparecnt)) 2274 if (expect_false (preparecnt))
2053 { 2275 {
2054 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2055 call_pending (EV_A); 2277 EV_INVOKE_PENDING;
2056 } 2278 }
2279
2280 if (expect_false (loop_done))
2281 break;
2057 2282
2058 /* we might have forked, so reify kernel state if necessary */ 2283 /* we might have forked, so reify kernel state if necessary */
2059 if (expect_false (postfork)) 2284 if (expect_false (postfork))
2060 loop_fork (EV_A); 2285 loop_fork (EV_A);
2061 2286
2067 ev_tstamp waittime = 0.; 2292 ev_tstamp waittime = 0.;
2068 ev_tstamp sleeptime = 0.; 2293 ev_tstamp sleeptime = 0.;
2069 2294
2070 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2295 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2071 { 2296 {
2297 /* remember old timestamp for io_blocktime calculation */
2298 ev_tstamp prev_mn_now = mn_now;
2299
2072 /* update time to cancel out callback processing overhead */ 2300 /* update time to cancel out callback processing overhead */
2073 time_update (EV_A_ 1e100); 2301 time_update (EV_A_ 1e100);
2074 2302
2075 waittime = MAX_BLOCKTIME; 2303 waittime = MAX_BLOCKTIME;
2076 2304
2086 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2314 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2087 if (waittime > to) waittime = to; 2315 if (waittime > to) waittime = to;
2088 } 2316 }
2089#endif 2317#endif
2090 2318
2319 /* don't let timeouts decrease the waittime below timeout_blocktime */
2091 if (expect_false (waittime < timeout_blocktime)) 2320 if (expect_false (waittime < timeout_blocktime))
2092 waittime = timeout_blocktime; 2321 waittime = timeout_blocktime;
2093 2322
2094 sleeptime = waittime - backend_fudge; 2323 /* extra check because io_blocktime is commonly 0 */
2095
2096 if (expect_true (sleeptime > io_blocktime)) 2324 if (expect_false (io_blocktime))
2097 sleeptime = io_blocktime;
2098
2099 if (sleeptime)
2100 { 2325 {
2326 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2327
2328 if (sleeptime > waittime - backend_fudge)
2329 sleeptime = waittime - backend_fudge;
2330
2331 if (expect_true (sleeptime > 0.))
2332 {
2101 ev_sleep (sleeptime); 2333 ev_sleep (sleeptime);
2102 waittime -= sleeptime; 2334 waittime -= sleeptime;
2335 }
2103 } 2336 }
2104 } 2337 }
2105 2338
2339#if EV_MINIMAL < 2
2106 ++loop_count; 2340 ++loop_count;
2341#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2107 backend_poll (EV_A_ waittime); 2343 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2108 2345
2109 /* update ev_rt_now, do magic */ 2346 /* update ev_rt_now, do magic */
2110 time_update (EV_A_ waittime + sleeptime); 2347 time_update (EV_A_ waittime + sleeptime);
2111 } 2348 }
2112 2349
2123 2360
2124 /* queue check watchers, to be executed first */ 2361 /* queue check watchers, to be executed first */
2125 if (expect_false (checkcnt)) 2362 if (expect_false (checkcnt))
2126 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2363 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2127 2364
2128 call_pending (EV_A); 2365 EV_INVOKE_PENDING;
2129 } 2366 }
2130 while (expect_true ( 2367 while (expect_true (
2131 activecnt 2368 activecnt
2132 && !loop_done 2369 && !loop_done
2133 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2370 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2134 )); 2371 ));
2135 2372
2136 if (loop_done == EVUNLOOP_ONE) 2373 if (loop_done == EVUNLOOP_ONE)
2137 loop_done = EVUNLOOP_CANCEL; 2374 loop_done = EVUNLOOP_CANCEL;
2375
2376#if EV_MINIMAL < 2
2377 --loop_depth;
2378#endif
2138} 2379}
2139 2380
2140void 2381void
2141ev_unloop (EV_P_ int how) 2382ev_unloop (EV_P_ int how)
2142{ 2383{
2193inline_size void 2434inline_size void
2194wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2195{ 2436{
2196 while (*head) 2437 while (*head)
2197 { 2438 {
2198 if (*head == elem) 2439 if (expect_true (*head == elem))
2199 { 2440 {
2200 *head = elem->next; 2441 *head = elem->next;
2201 return; 2442 break;
2202 } 2443 }
2203 2444
2204 head = &(*head)->next; 2445 head = &(*head)->next;
2205 } 2446 }
2206} 2447}
2234} 2475}
2235 2476
2236inline_size void 2477inline_size void
2237pri_adjust (EV_P_ W w) 2478pri_adjust (EV_P_ W w)
2238{ 2479{
2239 int pri = w->priority; 2480 int pri = ev_priority (w);
2240 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2481 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2241 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2482 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2242 w->priority = pri; 2483 ev_set_priority (w, pri);
2243} 2484}
2244 2485
2245inline_speed void 2486inline_speed void
2246ev_start (EV_P_ W w, int active) 2487ev_start (EV_P_ W w, int active)
2247{ 2488{
2274 2515
2275 ev_start (EV_A_ (W)w, 1); 2516 ev_start (EV_A_ (W)w, 1);
2276 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2277 wlist_add (&anfds[fd].head, (WL)w); 2518 wlist_add (&anfds[fd].head, (WL)w);
2278 2519
2279 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2520 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2280 w->events &= ~EV__IOFDSET; 2521 w->events &= ~EV__IOFDSET;
2281 2522
2282 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2283} 2524}
2284 2525
2378 } 2619 }
2379 2620
2380 EV_FREQUENT_CHECK; 2621 EV_FREQUENT_CHECK;
2381} 2622}
2382 2623
2624ev_tstamp
2625ev_timer_remaining (EV_P_ ev_timer *w)
2626{
2627 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2628}
2629
2383#if EV_PERIODIC_ENABLE 2630#if EV_PERIODIC_ENABLE
2384void noinline 2631void noinline
2385ev_periodic_start (EV_P_ ev_periodic *w) 2632ev_periodic_start (EV_P_ ev_periodic *w)
2386{ 2633{
2387 if (expect_false (ev_is_active (w))) 2634 if (expect_false (ev_is_active (w)))
2454#endif 2701#endif
2455 2702
2456void noinline 2703void noinline
2457ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2458{ 2705{
2459#if EV_MULTIPLICITY
2460 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2461#endif
2462 if (expect_false (ev_is_active (w))) 2706 if (expect_false (ev_is_active (w)))
2463 return; 2707 return;
2464 2708
2465 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2709 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2466 2710
2467 evpipe_init (EV_A); 2711#if EV_MULTIPLICITY
2712 assert (("libev: a signal must not be attached to two different loops",
2713 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2468 2714
2469 EV_FREQUENT_CHECK; 2715 signals [w->signum - 1].loop = EV_A;
2716#endif
2470 2717
2718 EV_FREQUENT_CHECK;
2719
2720#if EV_USE_SIGNALFD
2721 if (sigfd == -2)
2471 { 2722 {
2472#ifndef _WIN32 2723 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2473 sigset_t full, prev; 2724 if (sigfd < 0 && errno == EINVAL)
2474 sigfillset (&full); 2725 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2475 sigprocmask (SIG_SETMASK, &full, &prev);
2476#endif
2477 2726
2478 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2727 if (sigfd >= 0)
2728 {
2729 fd_intern (sigfd); /* doing it twice will not hurt */
2479 2730
2480#ifndef _WIN32 2731 sigemptyset (&sigfd_set);
2481 sigprocmask (SIG_SETMASK, &prev, 0); 2732
2482#endif 2733 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2734 ev_set_priority (&sigfd_w, EV_MAXPRI);
2735 ev_io_start (EV_A_ &sigfd_w);
2736 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2737 }
2483 } 2738 }
2739
2740 if (sigfd >= 0)
2741 {
2742 /* TODO: check .head */
2743 sigaddset (&sigfd_set, w->signum);
2744 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2745
2746 signalfd (sigfd, &sigfd_set, 0);
2747 }
2748#endif
2484 2749
2485 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2486 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2487 2752
2488 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2489 { 2757 {
2490#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2491 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2492#else 2762# else
2493 struct sigaction sa; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2494 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2495 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2496 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2769 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2497 sigaction (w->signum, &sa, 0); 2770 sigaction (w->signum, &sa, 0);
2771
2772 sigemptyset (&sa.sa_mask);
2773 sigaddset (&sa.sa_mask, w->signum);
2774 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2498#endif 2775#endif
2499 } 2776 }
2500 2777
2501 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2502} 2779}
2503 2780
2504void noinline 2781void noinline
2512 2789
2513 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2514 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2515 2792
2516 if (!signals [w->signum - 1].head) 2793 if (!signals [w->signum - 1].head)
2794 {
2795#if EV_MULTIPLICITY
2796 signals [w->signum - 1].loop = 0; /* unattach from signal */
2797#endif
2798#if EV_USE_SIGNALFD
2799 if (sigfd >= 0)
2800 {
2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2805 sigdelset (&sigfd_set, w->signum);
2806
2807 signalfd (sigfd, &sigfd_set, 0);
2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2809 }
2810 else
2811#endif
2517 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2518 2814
2519 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2520} 2816}
2521 2817
2522void 2818void
2570static void noinline 2866static void noinline
2571infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2572{ 2868{
2573 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); 2869 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);
2574 2870
2575 if (w->wd < 0) 2871 if (w->wd >= 0)
2872 {
2873 struct statfs sfs;
2874
2875 /* now local changes will be tracked by inotify, but remote changes won't */
2876 /* unless the filesystem is known to be local, we therefore still poll */
2877 /* also do poll on <2.6.25, but with normal frequency */
2878
2879 if (!fs_2625)
2880 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2881 else if (!statfs (w->path, &sfs)
2882 && (sfs.f_type == 0x1373 /* devfs */
2883 || sfs.f_type == 0xEF53 /* ext2/3 */
2884 || sfs.f_type == 0x3153464a /* jfs */
2885 || sfs.f_type == 0x52654973 /* reiser3 */
2886 || sfs.f_type == 0x01021994 /* tempfs */
2887 || sfs.f_type == 0x58465342 /* xfs */))
2888 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2889 else
2890 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2576 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2577 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2578 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2579 2896
2580 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2581 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2582 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2583 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2584 { 2901 {
2585 char path [4096]; 2902 char path [4096];
2601 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2602 } 2919 }
2603 } 2920 }
2604 2921
2605 if (w->wd >= 0) 2922 if (w->wd >= 0)
2606 {
2607 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2923 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2608 2924
2609 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2610 /* unless the filesystem it known to be local, we therefore still poll */ 2926 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2611 /* also do poll on <2.6.25, but with normal frequency */
2612 struct statfs sfs;
2613
2614 if (fs_2625 && !statfs (w->path, &sfs))
2615 if (sfs.f_type == 0x1373 /* devfs */
2616 || sfs.f_type == 0xEF53 /* ext2/3 */
2617 || sfs.f_type == 0x3153464a /* jfs */
2618 || sfs.f_type == 0x52654973 /* reiser3 */
2619 || sfs.f_type == 0x01021994 /* tempfs */
2620 || sfs.f_type == 0x58465342 /* xfs */)
2621 return;
2622
2623 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2624 ev_timer_again (EV_A_ &w->timer); 2927 ev_timer_again (EV_A_ &w->timer);
2625 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2626} 2929}
2627 2930
2628static void noinline 2931static void noinline
2629infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2630{ 2933{
2706 return; 3009 return;
2707 3010
2708 fs_2625 = 1; 3011 fs_2625 = 1;
2709} 3012}
2710 3013
3014inline_size int
3015infy_newfd (void)
3016{
3017#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3018 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3019 if (fd >= 0)
3020 return fd;
3021#endif
3022 return inotify_init ();
3023}
3024
2711inline_size void 3025inline_size void
2712infy_init (EV_P) 3026infy_init (EV_P)
2713{ 3027{
2714 if (fs_fd != -2) 3028 if (fs_fd != -2)
2715 return; 3029 return;
2716 3030
2717 fs_fd = -1; 3031 fs_fd = -1;
2718 3032
2719 check_2625 (EV_A); 3033 check_2625 (EV_A);
2720 3034
2721 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2722 3036
2723 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2724 { 3038 {
3039 fd_intern (fs_fd);
2725 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2726 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2727 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2728 } 3044 }
2729} 3045}
2730 3046
2731inline_size void 3047inline_size void
2732infy_fork (EV_P) 3048infy_fork (EV_P)
2734 int slot; 3050 int slot;
2735 3051
2736 if (fs_fd < 0) 3052 if (fs_fd < 0)
2737 return; 3053 return;
2738 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2739 close (fs_fd); 3057 close (fs_fd);
2740 fs_fd = inotify_init (); 3058 fs_fd = infy_newfd ();
3059
3060 if (fs_fd >= 0)
3061 {
3062 fd_intern (fs_fd);
3063 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A);
3066 }
2741 3067
2742 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2743 { 3069 {
2744 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2745 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
2752 w->wd = -1; 3078 w->wd = -1;
2753 3079
2754 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2755 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2756 else 3082 else
3083 {
3084 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3085 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2757 ev_timer_again (EV_A_ &w->timer); 3086 ev_timer_again (EV_A_ &w->timer);
3087 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3088 }
2758 } 3089 }
2759 } 3090 }
2760} 3091}
2761 3092
2762#endif 3093#endif
2779static void noinline 3110static void noinline
2780stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2781{ 3112{
2782 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2783 3114
2784 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
2785 /* prev has the old value when the callback gets invoked */
2786 w->prev = w->attr;
2787 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
2788 3117
2789 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3118 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2790 if ( 3119 if (
2791 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
2792 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
2793 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
2794 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
2795 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
2796 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
2797 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
2798 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
2799 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
2800 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
2801 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
2802 ) { 3131 ) {
3132 /* we only update w->prev on actual differences */
3133 /* in case we test more often than invoke the callback, */
3134 /* to ensure that prev is always different to attr */
3135 w->prev = prev;
3136
2803 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
2804 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
2805 { 3139 {
2806 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
2807 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
2832 3166
2833 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
2834 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
2835 else 3169 else
2836#endif 3170#endif
3171 {
2837 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
2838 3175
2839 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
2840 3177
2841 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
2842} 3179}
2851 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
2852 3189
2853#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
2854 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
2855#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
2856 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
2857 3199
2858 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
2859 3201
2860 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
2861} 3203}
3002embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3003{ 3345{
3004 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3005 3347
3006 { 3348 {
3007 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
3008 3350
3009 while (fdchangecnt) 3351 while (fdchangecnt)
3010 { 3352 {
3011 fd_reify (EV_A); 3353 fd_reify (EV_A);
3012 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3020 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3362 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3021 3363
3022 ev_embed_stop (EV_A_ w); 3364 ev_embed_stop (EV_A_ w);
3023 3365
3024 { 3366 {
3025 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
3026 3368
3027 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3029 } 3371 }
3030 3372
3044{ 3386{
3045 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3046 return; 3388 return;
3047 3389
3048 { 3390 {
3049 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
3050 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3392 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3051 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3393 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3052 } 3394 }
3053 3395
3054 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
3166 3508
3167void 3509void
3168ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3169{ 3511{
3170 w->sent = 1; 3512 w->sent = 1;
3171 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3172} 3514}
3173#endif 3515#endif
3174 3516
3175/*****************************************************************************/ 3517/*****************************************************************************/
3176 3518
3325 if (types & EV_CHECK) 3667 if (types & EV_CHECK)
3326 for (i = checkcnt; i--; ) 3668 for (i = checkcnt; i--; )
3327 cb (EV_A_ EV_CHECK, checks [i]); 3669 cb (EV_A_ EV_CHECK, checks [i]);
3328 3670
3329 if (types & EV_SIGNAL) 3671 if (types & EV_SIGNAL)
3330 for (i = 0; i < signalmax; ++i) 3672 for (i = 0; i < EV_NSIG - 1; ++i)
3331 for (wl = signals [i].head; wl; ) 3673 for (wl = signals [i].head; wl; )
3332 { 3674 {
3333 wn = wl->next; 3675 wn = wl->next;
3334 cb (EV_A_ EV_SIGNAL, wl); 3676 cb (EV_A_ EV_SIGNAL, wl);
3335 wl = wn; 3677 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines