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

Comparing libev/ev.c (file contents):
Revision 1.295 by root, Wed Jul 8 04:29:31 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 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
178# endif 188# endif
179#endif 189#endif
180 190
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
182 192
193/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG)
195/* use what's provided */
196#elif defined (NSIG)
197# define EV_NSIG (NSIG)
198#elif defined(_NSIG)
199# define EV_NSIG (_NSIG)
200#elif defined (SIGMAX)
201# define EV_NSIG (SIGMAX+1)
202#elif defined (SIG_MAX)
203# define EV_NSIG (SIG_MAX+1)
204#elif defined (_SIG_MAX)
205# define EV_NSIG (_SIG_MAX+1)
206#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else
215# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */
217# define EV_NSIG 65
218#endif
219
183#ifndef EV_USE_CLOCK_SYSCALL 220#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 221# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 222# define EV_USE_CLOCK_SYSCALL 1
186# else 223# else
187# define EV_USE_CLOCK_SYSCALL 0 224# define EV_USE_CLOCK_SYSCALL 0
263#ifndef EV_USE_EVENTFD 300#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 301# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 302# define EV_USE_EVENTFD 1
266# else 303# else
267# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
305# endif
306#endif
307
308#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1
311# else
312# define EV_USE_SIGNALFD 0
268# endif 313# endif
269#endif 314#endif
270 315
271#if 0 /* debugging */ 316#if 0 /* debugging */
272# define EV_VERIFY 3 317# define EV_VERIFY 3
300# endif 345# endif
301#endif 346#endif
302 347
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
305#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
308#endif 359#endif
309 360
339#endif 390#endif
340 391
341#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 393/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 394# include <stdint.h>
395# ifndef EFD_NONBLOCK
396# define EFD_NONBLOCK O_NONBLOCK
397# endif
398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
404# endif
344# ifdef __cplusplus 405# ifdef __cplusplus
345extern "C" { 406extern "C" {
346# endif 407# endif
347int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 409# ifdef __cplusplus
349} 410}
350# endif 411# endif
351#endif 412#endif
413
414#if EV_USE_SIGNALFD
415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
352 442
353/**/ 443/**/
354 444
355#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 458 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 460
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#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) */ 462#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 463
375#if __GNUC__ >= 4 464#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
378#else 467#else
419 508
420#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 511#endif
423 512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
521#endif
522
424#ifdef _WIN32 523#ifdef _WIN32
425# include "ev_win32.c" 524# include "ev_win32.c"
426#endif 525#endif
427 526
428/*****************************************************************************/ 527/*****************************************************************************/
443 542
444 if (syserr_cb) 543 if (syserr_cb)
445 syserr_cb (msg); 544 syserr_cb (msg);
446 else 545 else
447 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
448 perror (msg); 554 perror (msg);
555#endif
449 abort (); 556 abort ();
450 } 557 }
451} 558}
452 559
453static void * 560static void *
478{ 585{
479 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
480 587
481 if (!ptr && size) 588 if (!ptr && size)
482 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
484 abort (); 596 abort ();
485 } 597 }
486 598
487 return ptr; 599 return ptr;
488} 600}
490#define ev_malloc(size) ev_realloc (0, (size)) 602#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 603#define ev_free(ptr) ev_realloc ((ptr), 0)
492 604
493/*****************************************************************************/ 605/*****************************************************************************/
494 606
607/* set in reify when reification needed */
608#define EV_ANFD_REIFY 1
609
495/* file descriptor info structure */ 610/* file descriptor info structure */
496typedef struct 611typedef struct
497{ 612{
498 WL head; 613 WL head;
499 unsigned char events; /* the events watched for */ 614 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 615 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 616 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 617 unsigned char unused;
503#if EV_USE_EPOLL 618#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 619 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 620#endif
567 682
568 static int ev_default_loop_ptr; 683 static int ev_default_loop_ptr;
569 684
570#endif 685#endif
571 686
687#if EV_MINIMAL < 2
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else
692# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif
696
697#define EVUNLOOP_RECURSE 0x80
698
572/*****************************************************************************/ 699/*****************************************************************************/
573 700
574#ifndef EV_HAVE_EV_TIME 701#ifndef EV_HAVE_EV_TIME
575ev_tstamp 702ev_tstamp
576ev_time (void) 703ev_time (void)
632 759
633 tv.tv_sec = (time_t)delay; 760 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 762
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 764 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 765 /* by older ones */
639 select (0, 0, 0, 0, &tv); 766 select (0, 0, 0, 0, &tv);
640#endif 767#endif
641 } 768 }
642} 769}
750} 877}
751 878
752/*****************************************************************************/ 879/*****************************************************************************/
753 880
754inline_speed void 881inline_speed void
755fd_event (EV_P_ int fd, int revents) 882fd_event_nc (EV_P_ int fd, int revents)
756{ 883{
757 ANFD *anfd = anfds + fd; 884 ANFD *anfd = anfds + fd;
758 ev_io *w; 885 ev_io *w;
759 886
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
764 if (ev) 891 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 892 ev_feed_event (EV_A_ (W)w, ev);
766 } 893 }
767} 894}
768 895
896/* do not submit kernel events for fds that have reify set */
897/* because that means they changed while we were polling for new events */
898inline_speed void
899fd_event (EV_P_ int fd, int revents)
900{
901 ANFD *anfd = anfds + fd;
902
903 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents);
905}
906
769void 907void
770ev_feed_fd_event (EV_P_ int fd, int revents) 908ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 909{
772 if (fd >= 0 && fd < anfdmax) 910 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 911 fd_event_nc (EV_A_ fd, revents);
774} 912}
775 913
776/* make sure the external fd watch events are in-sync */ 914/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 915/* with the kernel/libev internal state */
778inline_size void 916inline_size void
793 931
794#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
795 if (events) 933 if (events)
796 { 934 {
797 unsigned long arg; 935 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
804 } 938 }
805#endif 939#endif
806 940
807 { 941 {
850/* check whether the given fd is atcually valid, for error recovery */ 984/* check whether the given fd is atcually valid, for error recovery */
851inline_size int 985inline_size int
852fd_valid (int fd) 986fd_valid (int fd)
853{ 987{
854#ifdef _WIN32 988#ifdef _WIN32
855 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
856#else 990#else
857 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
858#endif 992#endif
859} 993}
860 994
878 1012
879 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 1014 if (anfds [fd].events)
881 { 1015 {
882 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
883 return; 1017 break;
884 } 1018 }
885} 1019}
886 1020
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 1021/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 1022static void noinline
893 for (fd = 0; fd < anfdmax; ++fd) 1027 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1028 if (anfds [fd].events)
895 { 1029 {
896 anfds [fd].events = 0; 1030 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1031 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1033 }
900} 1034}
901 1035
902/*****************************************************************************/ 1036/*****************************************************************************/
903 1037
978 1112
979 for (;;) 1113 for (;;)
980 { 1114 {
981 int c = k << 1; 1115 int c = k << 1;
982 1116
983 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
984 break; 1118 break;
985 1119
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1120 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1121 ? 1 : 0;
988 1122
1024 1158
1025/* move an element suitably so it is in a correct place */ 1159/* move an element suitably so it is in a correct place */
1026inline_size void 1160inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
1028{ 1162{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1163 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1164 upheap (heap, k);
1031 else 1165 else
1032 downheap (heap, N, k); 1166 downheap (heap, N, k);
1033} 1167}
1034 1168
1047/*****************************************************************************/ 1181/*****************************************************************************/
1048 1182
1049/* associate signal watchers to a signal signal */ 1183/* associate signal watchers to a signal signal */
1050typedef struct 1184typedef struct
1051{ 1185{
1186 EV_ATOMIC_T pending;
1187#if EV_MULTIPLICITY
1188 EV_P;
1189#endif
1052 WL head; 1190 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1191} ANSIG;
1055 1192
1056static ANSIG *signals; 1193static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1194
1061/*****************************************************************************/ 1195/*****************************************************************************/
1062 1196
1063/* used to prepare libev internal fd's */ 1197/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1198/* this is not fork-safe */
1065inline_speed void 1199inline_speed void
1066fd_intern (int fd) 1200fd_intern (int fd)
1067{ 1201{
1068#ifdef _WIN32 1202#ifdef _WIN32
1069 unsigned long arg = 1; 1203 unsigned long arg = 1;
1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1071#else 1205#else
1072 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1073 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1074#endif 1208#endif
1075} 1209}
1078evpipe_init (EV_P) 1212evpipe_init (EV_P)
1079{ 1213{
1080 if (!ev_is_active (&pipe_w)) 1214 if (!ev_is_active (&pipe_w))
1081 { 1215 {
1082#if EV_USE_EVENTFD 1216#if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1219 evfd = eventfd (0, 0);
1220
1221 if (evfd >= 0)
1084 { 1222 {
1085 evpipe [0] = -1; 1223 evpipe [0] = -1;
1086 fd_intern (evfd); 1224 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1225 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1226 }
1089 else 1227 else
1090#endif 1228#endif
1091 { 1229 {
1128/* called whenever the libev signal pipe */ 1266/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1267/* got some events (signal, async) */
1130static void 1268static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1270{
1271 int i;
1272
1133#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1274 if (evfd >= 0)
1135 { 1275 {
1136 uint64_t counter; 1276 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
1141 { 1281 {
1142 char dummy; 1282 char dummy;
1143 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1144 } 1284 }
1145 1285
1146 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1147 { 1287 {
1148 int signum; 1288 sig_pending = 0;
1149 gotsig = 0;
1150 1289
1151 for (signum = signalmax; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1293 }
1155 1294
1156#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1157 if (gotasync) 1296 if (async_pending)
1158 { 1297 {
1159 int i; 1298 async_pending = 0;
1160 gotasync = 0;
1161 1299
1162 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1164 { 1302 {
1165 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
1173 1311
1174static void 1312static void
1175ev_sighandler (int signum) 1313ev_sighandler (int signum)
1176{ 1314{
1177#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1316 EV_P = signals [signum - 1].loop;
1179#endif 1317#endif
1180 1318
1181#if _WIN32 1319#ifdef _WIN32
1182 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1183#endif 1321#endif
1184 1322
1185 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1187} 1325}
1188 1326
1189void noinline 1327void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1191{ 1329{
1192 WL w; 1330 WL w;
1193 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1194#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1338 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1340
1198 --signum; 1341 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1342 return;
1343#endif
1202 1344
1203 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1204 1346
1205 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1349}
1350
1351#if EV_USE_SIGNALFD
1352static void
1353sigfdcb (EV_P_ ev_io *iow, int revents)
1354{
1355 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1356
1357 for (;;)
1358 {
1359 ssize_t res = read (sigfd, si, sizeof (si));
1360
1361 /* not ISO-C, as res might be -1, but works with SuS */
1362 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1363 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1364
1365 if (res < (ssize_t)sizeof (si))
1366 break;
1367 }
1368}
1369#endif
1208 1370
1209/*****************************************************************************/ 1371/*****************************************************************************/
1210 1372
1211static WL childs [EV_PID_HASHSIZE]; 1373static WL childs [EV_PID_HASHSIZE];
1212 1374
1357ev_backend (EV_P) 1519ev_backend (EV_P)
1358{ 1520{
1359 return backend; 1521 return backend;
1360} 1522}
1361 1523
1524#if EV_MINIMAL < 2
1362unsigned int 1525unsigned int
1363ev_loop_count (EV_P) 1526ev_loop_count (EV_P)
1364{ 1527{
1365 return loop_count; 1528 return loop_count;
1366} 1529}
1380void 1543void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1544ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1545{
1383 timeout_blocktime = interval; 1546 timeout_blocktime = interval;
1384} 1547}
1548
1549void
1550ev_set_userdata (EV_P_ void *data)
1551{
1552 userdata = data;
1553}
1554
1555void *
1556ev_userdata (EV_P)
1557{
1558 return userdata;
1559}
1560
1561void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1562{
1563 invoke_cb = invoke_pending_cb;
1564}
1565
1566void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1567{
1568 release_cb = release;
1569 acquire_cb = acquire;
1570}
1571#endif
1385 1572
1386/* initialise a loop structure, must be zero-initialised */ 1573/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1574static void noinline
1388loop_init (EV_P_ unsigned int flags) 1575loop_init (EV_P_ unsigned int flags)
1389{ 1576{
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1594 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1595 have_monotonic = 1;
1409 } 1596 }
1410#endif 1597#endif
1411 1598
1599 /* pid check not overridable via env */
1600#ifndef _WIN32
1601 if (flags & EVFLAG_FORKCHECK)
1602 curpid = getpid ();
1603#endif
1604
1605 if (!(flags & EVFLAG_NOENV)
1606 && !enable_secure ()
1607 && getenv ("LIBEV_FLAGS"))
1608 flags = atoi (getenv ("LIBEV_FLAGS"));
1609
1412 ev_rt_now = ev_time (); 1610 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1611 mn_now = get_clock ();
1414 now_floor = mn_now; 1612 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1613 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2
1615 invoke_cb = ev_invoke_pending;
1616#endif
1416 1617
1417 io_blocktime = 0.; 1618 io_blocktime = 0.;
1418 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1419 backend = 0; 1620 backend = 0;
1420 backend_fd = -1; 1621 backend_fd = -1;
1421 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1422#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1423 fs_fd = -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1424#endif 1628#endif
1425 1629#if EV_USE_SIGNALFD
1426 /* pid check not overridable via env */ 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1427#ifndef _WIN32
1428 if (flags & EVFLAG_FORKCHECK)
1429 curpid = getpid ();
1430#endif 1631#endif
1431
1432 if (!(flags & EVFLAG_NOENV)
1433 && !enable_secure ()
1434 && getenv ("LIBEV_FLAGS"))
1435 flags = atoi (getenv ("LIBEV_FLAGS"));
1436 1632
1437 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1438 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1439 1635
1440#if EV_USE_PORT 1636#if EV_USE_PORT
1466{ 1662{
1467 int i; 1663 int i;
1468 1664
1469 if (ev_is_active (&pipe_w)) 1665 if (ev_is_active (&pipe_w))
1470 { 1666 {
1471 ev_ref (EV_A); /* signal watcher */ 1667 /*ev_ref (EV_A);*/
1472 ev_io_stop (EV_A_ &pipe_w); 1668 /*ev_io_stop (EV_A_ &pipe_w);*/
1473 1669
1474#if EV_USE_EVENTFD 1670#if EV_USE_EVENTFD
1475 if (evfd >= 0) 1671 if (evfd >= 0)
1476 close (evfd); 1672 close (evfd);
1477#endif 1673#endif
1478 1674
1479 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1480 { 1676 {
1481 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1482 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1483 } 1679 }
1484 } 1680 }
1681
1682#if EV_USE_SIGNALFD
1683 if (ev_is_active (&sigfd_w))
1684 close (sigfd);
1685#endif
1485 1686
1486#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1487 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1488 close (fs_fd); 1689 close (fs_fd);
1489#endif 1690#endif
1513#if EV_IDLE_ENABLE 1714#if EV_IDLE_ENABLE
1514 array_free (idle, [i]); 1715 array_free (idle, [i]);
1515#endif 1716#endif
1516 } 1717 }
1517 1718
1518 ev_free (anfds); anfdmax = 0; 1719 ev_free (anfds); anfds = 0; anfdmax = 0;
1519 1720
1520 /* have to use the microsoft-never-gets-it-right macro */ 1721 /* have to use the microsoft-never-gets-it-right macro */
1521 array_free (rfeed, EMPTY); 1722 array_free (rfeed, EMPTY);
1522 array_free (fdchange, EMPTY); 1723 array_free (fdchange, EMPTY);
1523 array_free (timer, EMPTY); 1724 array_free (timer, EMPTY);
1558 1759
1559 if (ev_is_active (&pipe_w)) 1760 if (ev_is_active (&pipe_w))
1560 { 1761 {
1561 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1562 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1563 gotsig = 1; 1764 sig_pending = 1;
1564#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1565 gotasync = 1; 1766 async_pending = 1;
1566#endif 1767#endif
1567 1768
1568 ev_ref (EV_A); 1769 ev_ref (EV_A);
1569 ev_io_stop (EV_A_ &pipe_w); 1770 ev_io_stop (EV_A_ &pipe_w);
1570 1771
1573 close (evfd); 1774 close (evfd);
1574#endif 1775#endif
1575 1776
1576 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1577 { 1778 {
1578 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1579 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1580 } 1781 }
1581 1782
1582 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1583 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1584 pipecb (EV_A_ &pipe_w, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
1590#if EV_MULTIPLICITY 1791#if EV_MULTIPLICITY
1591 1792
1592struct ev_loop * 1793struct ev_loop *
1593ev_loop_new (unsigned int flags) 1794ev_loop_new (unsigned int flags)
1594{ 1795{
1595 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1796 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1596 1797
1597 memset (loop, 0, sizeof (struct ev_loop)); 1798 memset (EV_A, 0, sizeof (struct ev_loop));
1598
1599 loop_init (EV_A_ flags); 1799 loop_init (EV_A_ flags);
1600 1800
1601 if (ev_backend (EV_A)) 1801 if (ev_backend (EV_A))
1602 return loop; 1802 return EV_A;
1603 1803
1604 return 0; 1804 return 0;
1605} 1805}
1606 1806
1607void 1807void
1614void 1814void
1615ev_loop_fork (EV_P) 1815ev_loop_fork (EV_P)
1616{ 1816{
1617 postfork = 1; /* must be in line with ev_default_fork */ 1817 postfork = 1; /* must be in line with ev_default_fork */
1618} 1818}
1819#endif /* multiplicity */
1619 1820
1620#if EV_VERIFY 1821#if EV_VERIFY
1621static void noinline 1822static void noinline
1622verify_watcher (EV_P_ W w) 1823verify_watcher (EV_P_ W w)
1623{ 1824{
1651 verify_watcher (EV_A_ ws [cnt]); 1852 verify_watcher (EV_A_ ws [cnt]);
1652 } 1853 }
1653} 1854}
1654#endif 1855#endif
1655 1856
1857#if EV_MINIMAL < 2
1656void 1858void
1657ev_loop_verify (EV_P) 1859ev_loop_verify (EV_P)
1658{ 1860{
1659#if EV_VERIFY 1861#if EV_VERIFY
1660 int i; 1862 int i;
1709 assert (checkmax >= checkcnt); 1911 assert (checkmax >= checkcnt);
1710 array_verify (EV_A_ (W *)checks, checkcnt); 1912 array_verify (EV_A_ (W *)checks, checkcnt);
1711 1913
1712# if 0 1914# if 0
1713 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1714 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1715# endif
1716#endif 1917# endif
1918#endif
1717} 1919}
1718 1920#endif
1719#endif /* multiplicity */
1720 1921
1721#if EV_MULTIPLICITY 1922#if EV_MULTIPLICITY
1722struct ev_loop * 1923struct ev_loop *
1723ev_default_loop_init (unsigned int flags) 1924ev_default_loop_init (unsigned int flags)
1724#else 1925#else
1727#endif 1928#endif
1728{ 1929{
1729 if (!ev_default_loop_ptr) 1930 if (!ev_default_loop_ptr)
1730 { 1931 {
1731#if EV_MULTIPLICITY 1932#if EV_MULTIPLICITY
1732 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1933 EV_P = ev_default_loop_ptr = &default_loop_struct;
1733#else 1934#else
1734 ev_default_loop_ptr = 1; 1935 ev_default_loop_ptr = 1;
1735#endif 1936#endif
1736 1937
1737 loop_init (EV_A_ flags); 1938 loop_init (EV_A_ flags);
1754 1955
1755void 1956void
1756ev_default_destroy (void) 1957ev_default_destroy (void)
1757{ 1958{
1758#if EV_MULTIPLICITY 1959#if EV_MULTIPLICITY
1759 struct ev_loop *loop = ev_default_loop_ptr; 1960 EV_P = ev_default_loop_ptr;
1760#endif 1961#endif
1761 1962
1762 ev_default_loop_ptr = 0; 1963 ev_default_loop_ptr = 0;
1763 1964
1764#ifndef _WIN32 1965#ifndef _WIN32
1771 1972
1772void 1973void
1773ev_default_fork (void) 1974ev_default_fork (void)
1774{ 1975{
1775#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1776 struct ev_loop *loop = ev_default_loop_ptr; 1977 EV_P = ev_default_loop_ptr;
1777#endif 1978#endif
1778 1979
1779 postfork = 1; /* must be in line with ev_loop_fork */ 1980 postfork = 1; /* must be in line with ev_loop_fork */
1780} 1981}
1781 1982
1785ev_invoke (EV_P_ void *w, int revents) 1986ev_invoke (EV_P_ void *w, int revents)
1786{ 1987{
1787 EV_CB_INVOKE ((W)w, revents); 1988 EV_CB_INVOKE ((W)w, revents);
1788} 1989}
1789 1990
1790inline_speed void 1991unsigned int
1791call_pending (EV_P) 1992ev_pending_count (EV_P)
1993{
1994 int pri;
1995 unsigned int count = 0;
1996
1997 for (pri = NUMPRI; pri--; )
1998 count += pendingcnt [pri];
1999
2000 return count;
2001}
2002
2003void noinline
2004ev_invoke_pending (EV_P)
1792{ 2005{
1793 int pri; 2006 int pri;
1794 2007
1795 for (pri = NUMPRI; pri--; ) 2008 for (pri = NUMPRI; pri--; )
1796 while (pendingcnt [pri]) 2009 while (pendingcnt [pri])
1964 ANHE_at_cache (*he); 2177 ANHE_at_cache (*he);
1965 } 2178 }
1966} 2179}
1967 2180
1968/* fetch new monotonic and realtime times from the kernel */ 2181/* fetch new monotonic and realtime times from the kernel */
1969/* also detetc if there was a timejump, and act accordingly */ 2182/* also detect if there was a timejump, and act accordingly */
1970inline_speed void 2183inline_speed void
1971time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
1972{ 2185{
1973#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
1974 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
2034} 2247}
2035 2248
2036void 2249void
2037ev_loop (EV_P_ int flags) 2250ev_loop (EV_P_ int flags)
2038{ 2251{
2252#if EV_MINIMAL < 2
2039 ++loop_depth; 2253 ++loop_depth;
2254#endif
2255
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2040 2257
2041 loop_done = EVUNLOOP_CANCEL; 2258 loop_done = EVUNLOOP_CANCEL;
2042 2259
2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2044 2261
2045 do 2262 do
2046 { 2263 {
2047#if EV_VERIFY >= 2 2264#if EV_VERIFY >= 2
2048 ev_loop_verify (EV_A); 2265 ev_loop_verify (EV_A);
2061 /* we might have forked, so queue fork handlers */ 2278 /* we might have forked, so queue fork handlers */
2062 if (expect_false (postfork)) 2279 if (expect_false (postfork))
2063 if (forkcnt) 2280 if (forkcnt)
2064 { 2281 {
2065 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2066 call_pending (EV_A); 2283 EV_INVOKE_PENDING;
2067 } 2284 }
2068#endif 2285#endif
2069 2286
2070 /* queue prepare watchers (and execute them) */ 2287 /* queue prepare watchers (and execute them) */
2071 if (expect_false (preparecnt)) 2288 if (expect_false (preparecnt))
2072 { 2289 {
2073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2074 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
2075 } 2292 }
2293
2294 if (expect_false (loop_done))
2295 break;
2076 2296
2077 /* we might have forked, so reify kernel state if necessary */ 2297 /* we might have forked, so reify kernel state if necessary */
2078 if (expect_false (postfork)) 2298 if (expect_false (postfork))
2079 loop_fork (EV_A); 2299 loop_fork (EV_A);
2080 2300
2128 waittime -= sleeptime; 2348 waittime -= sleeptime;
2129 } 2349 }
2130 } 2350 }
2131 } 2351 }
2132 2352
2353#if EV_MINIMAL < 2
2133 ++loop_count; 2354 ++loop_count;
2355#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2134 backend_poll (EV_A_ waittime); 2357 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2135 2359
2136 /* update ev_rt_now, do magic */ 2360 /* update ev_rt_now, do magic */
2137 time_update (EV_A_ waittime + sleeptime); 2361 time_update (EV_A_ waittime + sleeptime);
2138 } 2362 }
2139 2363
2150 2374
2151 /* queue check watchers, to be executed first */ 2375 /* queue check watchers, to be executed first */
2152 if (expect_false (checkcnt)) 2376 if (expect_false (checkcnt))
2153 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2154 2378
2155 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
2156 } 2380 }
2157 while (expect_true ( 2381 while (expect_true (
2158 activecnt 2382 activecnt
2159 && !loop_done 2383 && !loop_done
2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2161 )); 2385 ));
2162 2386
2163 if (loop_done == EVUNLOOP_ONE) 2387 if (loop_done == EVUNLOOP_ONE)
2164 loop_done = EVUNLOOP_CANCEL; 2388 loop_done = EVUNLOOP_CANCEL;
2165 2389
2390#if EV_MINIMAL < 2
2166 --loop_depth; 2391 --loop_depth;
2392#endif
2167} 2393}
2168 2394
2169void 2395void
2170ev_unloop (EV_P_ int how) 2396ev_unloop (EV_P_ int how)
2171{ 2397{
2222inline_size void 2448inline_size void
2223wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
2224{ 2450{
2225 while (*head) 2451 while (*head)
2226 { 2452 {
2227 if (*head == elem) 2453 if (expect_true (*head == elem))
2228 { 2454 {
2229 *head = elem->next; 2455 *head = elem->next;
2230 return; 2456 break;
2231 } 2457 }
2232 2458
2233 head = &(*head)->next; 2459 head = &(*head)->next;
2234 } 2460 }
2235} 2461}
2295 2521
2296 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2297 return; 2523 return;
2298 2524
2299 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2300 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2301 2527
2302 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2303 2529
2304 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2305 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2306 wlist_add (&anfds[fd].head, (WL)w); 2532 wlist_add (&anfds[fd].head, (WL)w);
2307 2533
2308 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2534 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2309 w->events &= ~EV__IOFDSET; 2535 w->events &= ~EV__IOFDSET;
2310 2536
2311 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2312} 2538}
2313 2539
2375 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2376 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2377 } 2603 }
2378 } 2604 }
2379 2605
2380 EV_FREQUENT_CHECK;
2381
2382 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2383 2607
2384 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2385} 2611}
2386 2612
2387void noinline 2613void noinline
2388ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2389{ 2615{
2407 } 2633 }
2408 2634
2409 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
2410} 2636}
2411 2637
2638ev_tstamp
2639ev_timer_remaining (EV_P_ ev_timer *w)
2640{
2641 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2642}
2643
2412#if EV_PERIODIC_ENABLE 2644#if EV_PERIODIC_ENABLE
2413void noinline 2645void noinline
2414ev_periodic_start (EV_P_ ev_periodic *w) 2646ev_periodic_start (EV_P_ ev_periodic *w)
2415{ 2647{
2416 if (expect_false (ev_is_active (w))) 2648 if (expect_false (ev_is_active (w)))
2462 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2463 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2464 } 2696 }
2465 } 2697 }
2466 2698
2467 EV_FREQUENT_CHECK;
2468
2469 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2470} 2702}
2471 2703
2472void noinline 2704void noinline
2473ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2474{ 2706{
2483#endif 2715#endif
2484 2716
2485void noinline 2717void noinline
2486ev_signal_start (EV_P_ ev_signal *w) 2718ev_signal_start (EV_P_ ev_signal *w)
2487{ 2719{
2488#if EV_MULTIPLICITY
2489 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2490#endif
2491 if (expect_false (ev_is_active (w))) 2720 if (expect_false (ev_is_active (w)))
2492 return; 2721 return;
2493 2722
2494 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2723 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2495 2724
2496 evpipe_init (EV_A); 2725#if EV_MULTIPLICITY
2726 assert (("libev: a signal must not be attached to two different loops",
2727 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2497 2728
2498 EV_FREQUENT_CHECK; 2729 signals [w->signum - 1].loop = EV_A;
2730#endif
2499 2731
2732 EV_FREQUENT_CHECK;
2733
2734#if EV_USE_SIGNALFD
2735 if (sigfd == -2)
2500 { 2736 {
2501#ifndef _WIN32 2737 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2502 sigset_t full, prev; 2738 if (sigfd < 0 && errno == EINVAL)
2503 sigfillset (&full); 2739 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2504 sigprocmask (SIG_SETMASK, &full, &prev);
2505#endif
2506 2740
2507 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2741 if (sigfd >= 0)
2742 {
2743 fd_intern (sigfd); /* doing it twice will not hurt */
2508 2744
2509#ifndef _WIN32 2745 sigemptyset (&sigfd_set);
2510 sigprocmask (SIG_SETMASK, &prev, 0); 2746
2511#endif 2747 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2748 ev_set_priority (&sigfd_w, EV_MAXPRI);
2749 ev_io_start (EV_A_ &sigfd_w);
2750 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2751 }
2512 } 2752 }
2753
2754 if (sigfd >= 0)
2755 {
2756 /* TODO: check .head */
2757 sigaddset (&sigfd_set, w->signum);
2758 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2759
2760 signalfd (sigfd, &sigfd_set, 0);
2761 }
2762#endif
2513 2763
2514 ev_start (EV_A_ (W)w, 1); 2764 ev_start (EV_A_ (W)w, 1);
2515 wlist_add (&signals [w->signum - 1].head, (WL)w); 2765 wlist_add (&signals [w->signum - 1].head, (WL)w);
2516 2766
2517 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2768# if EV_USE_SIGNALFD
2769 if (sigfd < 0) /*TODO*/
2770# endif
2518 { 2771 {
2519#if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2520 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2521#else 2776# else
2522 struct sigaction sa; 2777 struct sigaction sa;
2778
2779 evpipe_init (EV_A);
2780
2523 sa.sa_handler = ev_sighandler; 2781 sa.sa_handler = ev_sighandler;
2524 sigfillset (&sa.sa_mask); 2782 sigfillset (&sa.sa_mask);
2525 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2526 sigaction (w->signum, &sa, 0); 2784 sigaction (w->signum, &sa, 0);
2785
2786 sigemptyset (&sa.sa_mask);
2787 sigaddset (&sa.sa_mask, w->signum);
2788 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2527#endif 2789#endif
2528 } 2790 }
2529 2791
2530 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
2531} 2793}
2532 2794
2533void noinline 2795void noinline
2541 2803
2542 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2543 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2544 2806
2545 if (!signals [w->signum - 1].head) 2807 if (!signals [w->signum - 1].head)
2808 {
2809#if EV_MULTIPLICITY
2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2811#endif
2812#if EV_USE_SIGNALFD
2813 if (sigfd >= 0)
2814 {
2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2819 sigdelset (&sigfd_set, w->signum);
2820
2821 signalfd (sigfd, &sigfd_set, 0);
2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2823 }
2824 else
2825#endif
2546 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2827 }
2547 2828
2548 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2549} 2830}
2550 2831
2551void 2832void
2592#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2593 2874
2594static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2595 2876
2596#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2597# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2598 2881
2599static void noinline 2882static void noinline
2600infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2601{ 2884{
2602 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); 2885 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);
2603 2886
2604 if (w->wd < 0) 2887 if (w->wd >= 0)
2888 {
2889 struct statfs sfs;
2890
2891 /* now local changes will be tracked by inotify, but remote changes won't */
2892 /* unless the filesystem is known to be local, we therefore still poll */
2893 /* also do poll on <2.6.25, but with normal frequency */
2894
2895 if (!fs_2625)
2896 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2897 else if (!statfs (w->path, &sfs)
2898 && (sfs.f_type == 0x1373 /* devfs */
2899 || sfs.f_type == 0xEF53 /* ext2/3 */
2900 || sfs.f_type == 0x3153464a /* jfs */
2901 || sfs.f_type == 0x52654973 /* reiser3 */
2902 || sfs.f_type == 0x01021994 /* tempfs */
2903 || sfs.f_type == 0x58465342 /* xfs */))
2904 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2905 else
2906 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2605 { 2907 }
2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2606 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2911 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2607 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2608 2912
2609 /* monitor some parent directory for speedup hints */ 2913 /* if path is not there, monitor some parent directory for speedup hints */
2610 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2611 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2612 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2613 { 2917 {
2614 char path [4096]; 2918 char path [4096];
2630 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2631 } 2935 }
2632 } 2936 }
2633 2937
2634 if (w->wd >= 0) 2938 if (w->wd >= 0)
2635 {
2636 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2637 2940
2638 /* now local changes will be tracked by inotify, but remote changes won't */ 2941 /* now re-arm timer, if required */
2639 /* unless the filesystem it known to be local, we therefore still poll */ 2942 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2640 /* also do poll on <2.6.25, but with normal frequency */
2641 struct statfs sfs;
2642
2643 if (fs_2625 && !statfs (w->path, &sfs))
2644 if (sfs.f_type == 0x1373 /* devfs */
2645 || sfs.f_type == 0xEF53 /* ext2/3 */
2646 || sfs.f_type == 0x3153464a /* jfs */
2647 || sfs.f_type == 0x52654973 /* reiser3 */
2648 || sfs.f_type == 0x01021994 /* tempfs */
2649 || sfs.f_type == 0x58465342 /* xfs */)
2650 return;
2651
2652 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2653 ev_timer_again (EV_A_ &w->timer); 2943 ev_timer_again (EV_A_ &w->timer);
2654 } 2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2655} 2945}
2656 2946
2657static void noinline 2947static void noinline
2658infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2659{ 2949{
2704 2994
2705static void 2995static void
2706infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2707{ 2997{
2708 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2709 struct inotify_event *ev = (struct inotify_event *)buf;
2710 int ofs; 2999 int ofs;
2711 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2712 3001
2713 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2714 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
2715} 3040}
2716 3041
2717inline_size void 3042inline_size void
2718check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2719{ 3044{
2720 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2721 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2722 */ 3047 */
2723 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2724 int major, minor, micro;
2725
2726 if (uname (&buf))
2727 return; 3049 return;
2728 3050
2729 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2730 return;
2731
2732 if (major < 2
2733 || (major == 2 && minor < 6)
2734 || (major == 2 && minor == 6 && micro < 25))
2735 return;
2736
2737 fs_2625 = 1; 3051 fs_2625 = 1;
3052}
3053
3054inline_size int
3055infy_newfd (void)
3056{
3057#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3058 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3059 if (fd >= 0)
3060 return fd;
3061#endif
3062 return inotify_init ();
2738} 3063}
2739 3064
2740inline_size void 3065inline_size void
2741infy_init (EV_P) 3066infy_init (EV_P)
2742{ 3067{
2743 if (fs_fd != -2) 3068 if (fs_fd != -2)
2744 return; 3069 return;
2745 3070
2746 fs_fd = -1; 3071 fs_fd = -1;
2747 3072
2748 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
2749 3074
2750 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2751 3076
2752 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2753 { 3078 {
3079 fd_intern (fs_fd);
2754 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2755 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2756 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2757 } 3084 }
2758} 3085}
2759 3086
2760inline_size void 3087inline_size void
2761infy_fork (EV_P) 3088infy_fork (EV_P)
2763 int slot; 3090 int slot;
2764 3091
2765 if (fs_fd < 0) 3092 if (fs_fd < 0)
2766 return; 3093 return;
2767 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2768 close (fs_fd); 3097 close (fs_fd);
2769 fs_fd = inotify_init (); 3098 fs_fd = infy_newfd ();
3099
3100 if (fs_fd >= 0)
3101 {
3102 fd_intern (fs_fd);
3103 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A);
3106 }
2770 3107
2771 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2772 { 3109 {
2773 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2774 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
2781 w->wd = -1; 3118 w->wd = -1;
2782 3119
2783 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
2784 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2785 else 3122 else
3123 {
3124 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3125 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2786 ev_timer_again (EV_A_ &w->timer); 3126 ev_timer_again (EV_A_ &w->timer);
3127 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3128 }
2787 } 3129 }
2788 } 3130 }
2789} 3131}
2790 3132
2791#endif 3133#endif
2808static void noinline 3150static void noinline
2809stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2810{ 3152{
2811 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2812 3154
2813 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
2814 /* prev has the old value when the callback gets invoked */
2815 w->prev = w->attr;
2816 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2817 3157
2818 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3158 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2819 if ( 3159 if (
2820 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
2821 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
2822 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
2823 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
2824 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
2825 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
2826 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
2827 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
2828 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
2829 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
2830 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
2831 ) { 3171 ) {
3172 /* we only update w->prev on actual differences */
3173 /* in case we test more often than invoke the callback, */
3174 /* to ensure that prev is always different to attr */
3175 w->prev = prev;
3176
2832 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
2833 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2834 { 3179 {
2835 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
2836 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
2861 3206
2862 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
2863 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
2864 else 3209 else
2865#endif 3210#endif
3211 {
2866 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
2867 3215
2868 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
2869 3217
2870 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
2871} 3219}
2880 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
2881 3229
2882#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
2883 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2884#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
2885 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
2886 3239
2887 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
2888 3241
2889 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
2890} 3243}
3031embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3032{ 3385{
3033 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3386 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3034 3387
3035 { 3388 {
3036 struct ev_loop *loop = w->other; 3389 EV_P = w->other;
3037 3390
3038 while (fdchangecnt) 3391 while (fdchangecnt)
3039 { 3392 {
3040 fd_reify (EV_A); 3393 fd_reify (EV_A);
3041 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3394 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3049 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3402 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3050 3403
3051 ev_embed_stop (EV_A_ w); 3404 ev_embed_stop (EV_A_ w);
3052 3405
3053 { 3406 {
3054 struct ev_loop *loop = w->other; 3407 EV_P = w->other;
3055 3408
3056 ev_loop_fork (EV_A); 3409 ev_loop_fork (EV_A);
3057 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3410 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3058 } 3411 }
3059 3412
3073{ 3426{
3074 if (expect_false (ev_is_active (w))) 3427 if (expect_false (ev_is_active (w)))
3075 return; 3428 return;
3076 3429
3077 { 3430 {
3078 struct ev_loop *loop = w->other; 3431 EV_P = w->other;
3079 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3432 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3080 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3433 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3081 } 3434 }
3082 3435
3083 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3110 3463
3111 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3112 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3113 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3114 3467
3468 ev_stop (EV_A_ (W)w);
3469
3115 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3116} 3471}
3117#endif 3472#endif
3118 3473
3119#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE
3195 3550
3196void 3551void
3197ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
3198{ 3553{
3199 w->sent = 1; 3554 w->sent = 1;
3200 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
3201} 3556}
3202#endif 3557#endif
3203 3558
3204/*****************************************************************************/ 3559/*****************************************************************************/
3205 3560
3354 if (types & EV_CHECK) 3709 if (types & EV_CHECK)
3355 for (i = checkcnt; i--; ) 3710 for (i = checkcnt; i--; )
3356 cb (EV_A_ EV_CHECK, checks [i]); 3711 cb (EV_A_ EV_CHECK, checks [i]);
3357 3712
3358 if (types & EV_SIGNAL) 3713 if (types & EV_SIGNAL)
3359 for (i = 0; i < signalmax; ++i) 3714 for (i = 0; i < EV_NSIG - 1; ++i)
3360 for (wl = signals [i].head; wl; ) 3715 for (wl = signals [i].head; wl; )
3361 { 3716 {
3362 wn = wl->next; 3717 wn = wl->next;
3363 cb (EV_A_ EV_SIGNAL, wl); 3718 cb (EV_A_ EV_SIGNAL, wl);
3364 wl = wn; 3719 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines