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.321 by root, Thu Dec 31 06:50:17 2009 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
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
280# define EV_USE_4HEAP !EV_MINIMAL 326# define EV_USE_4HEAP !EV_MINIMAL
281#endif 327#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
331#endif
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
285#endif 345#endif
286 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 */
288 348
289#ifndef CLOCK_MONOTONIC 349#ifndef CLOCK_MONOTONIC
320 380
321#if EV_SELECT_IS_WINSOCKET 381#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 382# include <winsock.h>
323#endif 383#endif
324 384
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 385#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
397# endif
337# ifdef __cplusplus 398# ifdef __cplusplus
338extern "C" { 399extern "C" {
339# endif 400# endif
340int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 402# ifdef __cplusplus
342} 403}
343# endif 404# endif
344#endif 405#endif
406
407#if EV_USE_SIGNALFD
408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
345 435
346/**/ 436/**/
347 437
348#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 451 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 453
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#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) */ 455#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 456
368#if __GNUC__ >= 4 457#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
371#else 460#else
384# define inline_speed static noinline 473# define inline_speed static noinline
385#else 474#else
386# define inline_speed static inline 475# define inline_speed static inline
387#endif 476#endif
388 477
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
391 485
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
394 488
395typedef ev_watcher *W; 489typedef ev_watcher *W;
407 501
408#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 504#endif
411 505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif
515
412#ifdef _WIN32 516#ifdef _WIN32
413# include "ev_win32.c" 517# include "ev_win32.c"
414#endif 518#endif
415 519
416/*****************************************************************************/ 520/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
480 584
481/*****************************************************************************/ 585/*****************************************************************************/
482 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
483/* file descriptor info structure */ 590/* file descriptor info structure */
484typedef struct 591typedef struct
485{ 592{
486 WL head; 593 WL head;
487 unsigned char events; /* the events watched for */ 594 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 595 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 */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 597 unsigned char unused;
491#if EV_USE_EPOLL 598#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 600#endif
555 662
556 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
557 664
558#endif 665#endif
559 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
560/*****************************************************************************/ 679/*****************************************************************************/
561 680
681#ifndef EV_HAVE_EV_TIME
562ev_tstamp 682ev_tstamp
563ev_time (void) 683ev_time (void)
564{ 684{
565#if EV_USE_REALTIME 685#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 686 if (expect_true (have_realtime))
573 693
574 struct timeval tv; 694 struct timeval tv;
575 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 697}
698#endif
578 699
579inline_size ev_tstamp 700inline_size ev_tstamp
580get_clock (void) 701get_clock (void)
581{ 702{
582#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
618 739
619 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 742
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 745 /* by older ones */
625 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
626#endif 747#endif
627 } 748 }
628} 749}
736} 857}
737 858
738/*****************************************************************************/ 859/*****************************************************************************/
739 860
740inline_speed void 861inline_speed void
741fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
742{ 863{
743 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
744 ev_io *w; 865 ev_io *w;
745 866
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
750 if (ev) 871 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
752 } 873 }
753} 874}
754 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
755void 887void
756ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 889{
758 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
760} 892}
761 893
762/* make sure the external fd watch events are in-sync */ 894/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 895/* with the kernel/libev internal state */
764inline_size void 896inline_size void
779 911
780#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
781 if (events) 913 if (events)
782 { 914 {
783 unsigned long arg; 915 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 918 }
791#endif 919#endif
792 920
793 { 921 {
864 992
865 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 994 if (anfds [fd].events)
867 { 995 {
868 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
869 return; 997 break;
870 } 998 }
871} 999}
872 1000
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 1002static void noinline
879 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1008 if (anfds [fd].events)
881 { 1009 {
882 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1013 }
886} 1014}
887 1015
888/*****************************************************************************/ 1016/*****************************************************************************/
889 1017
964 1092
965 for (;;) 1093 for (;;)
966 { 1094 {
967 int c = k << 1; 1095 int c = k << 1;
968 1096
969 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
970 break; 1098 break;
971 1099
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1101 ? 1 : 0;
974 1102
1010 1138
1011/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1012inline_size void 1140inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1014{ 1142{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1144 upheap (heap, k);
1017 else 1145 else
1018 downheap (heap, N, k); 1146 downheap (heap, N, k);
1019} 1147}
1020 1148
1033/*****************************************************************************/ 1161/*****************************************************************************/
1034 1162
1035/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1036typedef struct 1164typedef struct
1037{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1038 WL head; 1170 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1171} ANSIG;
1041 1172
1042static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1174
1047/*****************************************************************************/ 1175/*****************************************************************************/
1048 1176
1049/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1178/* this is not fork-safe */
1064evpipe_init (EV_P) 1192evpipe_init (EV_P)
1065{ 1193{
1066 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1067 { 1195 {
1068#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1070 { 1202 {
1071 evpipe [0] = -1; 1203 evpipe [0] = -1;
1072 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1206 }
1075 else 1207 else
1076#endif 1208#endif
1077 { 1209 {
1114/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1116static void 1248static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1250{
1251 int i;
1252
1119#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1254 if (evfd >= 0)
1121 { 1255 {
1122 uint64_t counter; 1256 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1127 { 1261 {
1128 char dummy; 1262 char dummy;
1129 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1130 } 1264 }
1131 1265
1132 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1133 { 1267 {
1134 int signum; 1268 sig_pending = 0;
1135 gotsig = 0;
1136 1269
1137 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1273 }
1141 1274
1142#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1143 if (gotasync) 1276 if (async_pending)
1144 { 1277 {
1145 int i; 1278 async_pending = 0;
1146 gotasync = 0;
1147 1279
1148 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1150 { 1282 {
1151 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1159 1291
1160static void 1292static void
1161ev_sighandler (int signum) 1293ev_sighandler (int signum)
1162{ 1294{
1163#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1165#endif 1297#endif
1166 1298
1167#if _WIN32 1299#if _WIN32
1168 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1169#endif 1301#endif
1170 1302
1171 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1173} 1305}
1174 1306
1175void noinline 1307void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1177{ 1309{
1178 WL w; 1310 WL w;
1179 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1180#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1320
1184 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1322 return;
1323#endif
1188 1324
1189 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1190 1326
1191 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1329}
1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1194 1350
1195/*****************************************************************************/ 1351/*****************************************************************************/
1196 1352
1197static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1198 1354
1343ev_backend (EV_P) 1499ev_backend (EV_P)
1344{ 1500{
1345 return backend; 1501 return backend;
1346} 1502}
1347 1503
1504#if EV_MINIMAL < 2
1348unsigned int 1505unsigned int
1349ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1350{ 1507{
1351 return loop_count; 1508 return loop_count;
1352} 1509}
1353 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1354void 1517void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1519{
1357 io_blocktime = interval; 1520 io_blocktime = interval;
1358} 1521}
1360void 1523void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1525{
1363 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1364} 1527}
1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1365 1552
1366/* initialise a loop structure, must be zero-initialised */ 1553/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1554static void noinline
1368loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1369{ 1556{
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1575 have_monotonic = 1;
1389 } 1576 }
1390#endif 1577#endif
1391 1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1589
1392 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1591 mn_now = get_clock ();
1394 now_floor = mn_now; 1592 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1396 1597
1397 io_blocktime = 0.; 1598 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1399 backend = 0; 1600 backend = 0;
1400 backend_fd = -1; 1601 backend_fd = -1;
1401 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1402#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1403 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1608#endif
1405 1609#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1611#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1612
1417 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1419 1615
1420#if EV_USE_PORT 1616#if EV_USE_PORT
1446{ 1642{
1447 int i; 1643 int i;
1448 1644
1449 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1450 { 1646 {
1451 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1649
1454#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1651 if (evfd >= 0)
1456 close (evfd); 1652 close (evfd);
1457#endif 1653#endif
1458 1654
1459 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1460 { 1656 {
1461 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1659 }
1464 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1465 1666
1466#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1468 close (fs_fd); 1669 close (fs_fd);
1469#endif 1670#endif
1493#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1695 array_free (idle, [i]);
1495#endif 1696#endif
1496 } 1697 }
1497 1698
1498 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1700
1500 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1702 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1538 1739
1539 if (ev_is_active (&pipe_w)) 1740 if (ev_is_active (&pipe_w))
1540 { 1741 {
1541 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1543 gotsig = 1; 1744 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1746 async_pending = 1;
1546#endif 1747#endif
1547 1748
1548 ev_ref (EV_A); 1749 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1750 ev_io_stop (EV_A_ &pipe_w);
1550 1751
1553 close (evfd); 1754 close (evfd);
1554#endif 1755#endif
1555 1756
1556 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1557 { 1758 {
1558 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1761 }
1561 1762
1562 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1570#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1571 1772
1572struct ev_loop * 1773struct ev_loop *
1573ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1574{ 1775{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1776 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1777
1577 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1580 1780
1581 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1582 return loop; 1782 return EV_A;
1583 1783
1584 return 0; 1784 return 0;
1585} 1785}
1586 1786
1587void 1787void
1594void 1794void
1595ev_loop_fork (EV_P) 1795ev_loop_fork (EV_P)
1596{ 1796{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1797 postfork = 1; /* must be in line with ev_default_fork */
1598} 1798}
1799#endif /* multiplicity */
1599 1800
1600#if EV_VERIFY 1801#if EV_VERIFY
1601static void noinline 1802static void noinline
1602verify_watcher (EV_P_ W w) 1803verify_watcher (EV_P_ W w)
1603{ 1804{
1631 verify_watcher (EV_A_ ws [cnt]); 1832 verify_watcher (EV_A_ ws [cnt]);
1632 } 1833 }
1633} 1834}
1634#endif 1835#endif
1635 1836
1837#if EV_MINIMAL < 2
1636void 1838void
1637ev_loop_verify (EV_P) 1839ev_loop_verify (EV_P)
1638{ 1840{
1639#if EV_VERIFY 1841#if EV_VERIFY
1640 int i; 1842 int i;
1689 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1893
1692# if 0 1894# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1895 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) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif
1696#endif 1897# endif
1898#endif
1697} 1899}
1698 1900#endif
1699#endif /* multiplicity */
1700 1901
1701#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1702struct ev_loop * 1903struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1904ev_default_loop_init (unsigned int flags)
1704#else 1905#else
1707#endif 1908#endif
1708{ 1909{
1709 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1710 { 1911 {
1711#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1914#else
1714 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1715#endif 1916#endif
1716 1917
1717 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
1734 1935
1735void 1936void
1736ev_default_destroy (void) 1937ev_default_destroy (void)
1737{ 1938{
1738#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1740#endif 1941#endif
1741 1942
1742 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1743 1944
1744#ifndef _WIN32 1945#ifndef _WIN32
1751 1952
1752void 1953void
1753ev_default_fork (void) 1954ev_default_fork (void)
1754{ 1955{
1755#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1757#endif 1958#endif
1758 1959
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1961}
1761 1962
1765ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1766{ 1967{
1767 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1768} 1969}
1769 1970
1770inline_speed void 1971unsigned int
1771call_pending (EV_P) 1972ev_pending_count (EV_P)
1973{
1974 int pri;
1975 unsigned int count = 0;
1976
1977 for (pri = NUMPRI; pri--; )
1978 count += pendingcnt [pri];
1979
1980 return count;
1981}
1982
1983void noinline
1984ev_invoke_pending (EV_P)
1772{ 1985{
1773 int pri; 1986 int pri;
1774 1987
1775 for (pri = NUMPRI; pri--; ) 1988 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 1989 while (pendingcnt [pri])
1948/* fetch new monotonic and realtime times from the kernel */ 2161/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2162/* also detetc if there was a timejump, and act accordingly */
1950inline_speed void 2163inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2164time_update (EV_P_ ev_tstamp max_block)
1952{ 2165{
1953 int i;
1954
1955#if EV_USE_MONOTONIC 2166#if EV_USE_MONOTONIC
1956 if (expect_true (have_monotonic)) 2167 if (expect_true (have_monotonic))
1957 { 2168 {
2169 int i;
1958 ev_tstamp odiff = rtmn_diff; 2170 ev_tstamp odiff = rtmn_diff;
1959 2171
1960 mn_now = get_clock (); 2172 mn_now = get_clock ();
1961 2173
1962 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2174 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
2012 2224
2013 mn_now = ev_rt_now; 2225 mn_now = ev_rt_now;
2014 } 2226 }
2015} 2227}
2016 2228
2017static int loop_done;
2018
2019void 2229void
2020ev_loop (EV_P_ int flags) 2230ev_loop (EV_P_ int flags)
2021{ 2231{
2232#if EV_MINIMAL < 2
2233 ++loop_depth;
2234#endif
2235
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237
2022 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
2023 2239
2024 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2240 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2025 2241
2026 do 2242 do
2027 { 2243 {
2028#if EV_VERIFY >= 2 2244#if EV_VERIFY >= 2
2029 ev_loop_verify (EV_A); 2245 ev_loop_verify (EV_A);
2042 /* we might have forked, so queue fork handlers */ 2258 /* we might have forked, so queue fork handlers */
2043 if (expect_false (postfork)) 2259 if (expect_false (postfork))
2044 if (forkcnt) 2260 if (forkcnt)
2045 { 2261 {
2046 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2047 call_pending (EV_A); 2263 EV_INVOKE_PENDING;
2048 } 2264 }
2049#endif 2265#endif
2050 2266
2051 /* queue prepare watchers (and execute them) */ 2267 /* queue prepare watchers (and execute them) */
2052 if (expect_false (preparecnt)) 2268 if (expect_false (preparecnt))
2053 { 2269 {
2054 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2055 call_pending (EV_A); 2271 EV_INVOKE_PENDING;
2056 } 2272 }
2273
2274 if (expect_false (loop_done))
2275 break;
2057 2276
2058 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
2059 if (expect_false (postfork)) 2278 if (expect_false (postfork))
2060 loop_fork (EV_A); 2279 loop_fork (EV_A);
2061 2280
2067 ev_tstamp waittime = 0.; 2286 ev_tstamp waittime = 0.;
2068 ev_tstamp sleeptime = 0.; 2287 ev_tstamp sleeptime = 0.;
2069 2288
2070 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2289 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2071 { 2290 {
2291 /* remember old timestamp for io_blocktime calculation */
2292 ev_tstamp prev_mn_now = mn_now;
2293
2072 /* update time to cancel out callback processing overhead */ 2294 /* update time to cancel out callback processing overhead */
2073 time_update (EV_A_ 1e100); 2295 time_update (EV_A_ 1e100);
2074 2296
2075 waittime = MAX_BLOCKTIME; 2297 waittime = MAX_BLOCKTIME;
2076 2298
2086 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2308 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2087 if (waittime > to) waittime = to; 2309 if (waittime > to) waittime = to;
2088 } 2310 }
2089#endif 2311#endif
2090 2312
2313 /* don't let timeouts decrease the waittime below timeout_blocktime */
2091 if (expect_false (waittime < timeout_blocktime)) 2314 if (expect_false (waittime < timeout_blocktime))
2092 waittime = timeout_blocktime; 2315 waittime = timeout_blocktime;
2093 2316
2094 sleeptime = waittime - backend_fudge; 2317 /* extra check because io_blocktime is commonly 0 */
2095
2096 if (expect_true (sleeptime > io_blocktime)) 2318 if (expect_false (io_blocktime))
2097 sleeptime = io_blocktime;
2098
2099 if (sleeptime)
2100 { 2319 {
2320 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2321
2322 if (sleeptime > waittime - backend_fudge)
2323 sleeptime = waittime - backend_fudge;
2324
2325 if (expect_true (sleeptime > 0.))
2326 {
2101 ev_sleep (sleeptime); 2327 ev_sleep (sleeptime);
2102 waittime -= sleeptime; 2328 waittime -= sleeptime;
2329 }
2103 } 2330 }
2104 } 2331 }
2105 2332
2333#if EV_MINIMAL < 2
2106 ++loop_count; 2334 ++loop_count;
2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2107 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2108 2339
2109 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2110 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2111 } 2342 }
2112 2343
2123 2354
2124 /* queue check watchers, to be executed first */ 2355 /* queue check watchers, to be executed first */
2125 if (expect_false (checkcnt)) 2356 if (expect_false (checkcnt))
2126 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2127 2358
2128 call_pending (EV_A); 2359 EV_INVOKE_PENDING;
2129 } 2360 }
2130 while (expect_true ( 2361 while (expect_true (
2131 activecnt 2362 activecnt
2132 && !loop_done 2363 && !loop_done
2133 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2364 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2134 )); 2365 ));
2135 2366
2136 if (loop_done == EVUNLOOP_ONE) 2367 if (loop_done == EVUNLOOP_ONE)
2137 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVUNLOOP_CANCEL;
2369
2370#if EV_MINIMAL < 2
2371 --loop_depth;
2372#endif
2138} 2373}
2139 2374
2140void 2375void
2141ev_unloop (EV_P_ int how) 2376ev_unloop (EV_P_ int how)
2142{ 2377{
2193inline_size void 2428inline_size void
2194wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2195{ 2430{
2196 while (*head) 2431 while (*head)
2197 { 2432 {
2198 if (*head == elem) 2433 if (expect_true (*head == elem))
2199 { 2434 {
2200 *head = elem->next; 2435 *head = elem->next;
2201 return; 2436 break;
2202 } 2437 }
2203 2438
2204 head = &(*head)->next; 2439 head = &(*head)->next;
2205 } 2440 }
2206} 2441}
2234} 2469}
2235 2470
2236inline_size void 2471inline_size void
2237pri_adjust (EV_P_ W w) 2472pri_adjust (EV_P_ W w)
2238{ 2473{
2239 int pri = w->priority; 2474 int pri = ev_priority (w);
2240 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2475 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2241 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2476 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2242 w->priority = pri; 2477 ev_set_priority (w, pri);
2243} 2478}
2244 2479
2245inline_speed void 2480inline_speed void
2246ev_start (EV_P_ W w, int active) 2481ev_start (EV_P_ W w, int active)
2247{ 2482{
2274 2509
2275 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2276 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2277 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2278 2513
2279 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2280 w->events &= ~EV__IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2281 2516
2282 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2283} 2518}
2284 2519
2378 } 2613 }
2379 2614
2380 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2381} 2616}
2382 2617
2618ev_tstamp
2619ev_timer_remaining (EV_P_ ev_timer *w)
2620{
2621 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2622}
2623
2383#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2384void noinline 2625void noinline
2385ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2386{ 2627{
2387 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
2454#endif 2695#endif
2455 2696
2456void noinline 2697void noinline
2457ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2458{ 2699{
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))) 2700 if (expect_false (ev_is_active (w)))
2463 return; 2701 return;
2464 2702
2465 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2703 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2466 2704
2467 evpipe_init (EV_A); 2705#if EV_MULTIPLICITY
2706 assert (("libev: a signal must not be attached to two different loops",
2707 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2468 2708
2469 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2470 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2471 { 2716 {
2472#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2473 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2474 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2475 sigprocmask (SIG_SETMASK, &full, &prev);
2476#endif
2477 2720
2478 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2721 if (sigfd >= 0)
2722 {
2723 fd_intern (sigfd); /* doing it twice will not hurt */
2479 2724
2480#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2481 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2482#endif 2727 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2728 ev_set_priority (&sigfd_w, EV_MAXPRI);
2729 ev_io_start (EV_A_ &sigfd_w);
2730 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2731 }
2483 } 2732 }
2733
2734 if (sigfd >= 0)
2735 {
2736 /* TODO: check .head */
2737 sigaddset (&sigfd_set, w->signum);
2738 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2739
2740 signalfd (sigfd, &sigfd_set, 0);
2741 }
2742#endif
2484 2743
2485 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2486 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2487 2746
2488 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2489 { 2751 {
2490#if _WIN32 2752# if _WIN32
2753 evpipe_init (EV_A);
2754
2491 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2492#else 2756# else
2493 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2494 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2495 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2496 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2763 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2497 sigaction (w->signum, &sa, 0); 2764 sigaction (w->signum, &sa, 0);
2765
2766 sigemptyset (&sa.sa_mask);
2767 sigaddset (&sa.sa_mask, w->signum);
2768 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2498#endif 2769#endif
2499 } 2770 }
2500 2771
2501 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2502} 2773}
2503 2774
2504void noinline 2775void noinline
2512 2783
2513 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2514 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2515 2786
2516 if (!signals [w->signum - 1].head) 2787 if (!signals [w->signum - 1].head)
2788 {
2789#if EV_MULTIPLICITY
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif
2792#if EV_USE_SIGNALFD
2793 if (sigfd >= 0)
2794 {
2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum);
2800
2801 signalfd (sigfd, &sigfd_set, 0);
2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2803 }
2804 else
2805#endif
2517 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2518 2808
2519 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2520} 2810}
2521 2811
2522void 2812void
2570static void noinline 2860static void noinline
2571infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2572{ 2862{
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); 2863 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 2864
2575 if (w->wd < 0) 2865 if (w->wd >= 0)
2866 {
2867 struct statfs sfs;
2868
2869 /* now local changes will be tracked by inotify, but remote changes won't */
2870 /* unless the filesystem is known to be local, we therefore still poll */
2871 /* also do poll on <2.6.25, but with normal frequency */
2872
2873 if (!fs_2625)
2874 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2875 else if (!statfs (w->path, &sfs)
2876 && (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */))
2882 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2883 else
2884 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2576 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2577 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 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 2890
2580 /* monitor some parent directory for speedup hints */ 2891 /* 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, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2582 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2583 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2584 { 2895 {
2585 char path [4096]; 2896 char path [4096];
2601 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2602 } 2913 }
2603 } 2914 }
2604 2915
2605 if (w->wd >= 0) 2916 if (w->wd >= 0)
2606 {
2607 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2608 2918
2609 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2610 /* unless the filesystem it known to be local, we therefore still poll */ 2920 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); 2921 ev_timer_again (EV_A_ &w->timer);
2625 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2626} 2923}
2627 2924
2628static void noinline 2925static void noinline
2629infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2630{ 2927{
2706 return; 3003 return;
2707 3004
2708 fs_2625 = 1; 3005 fs_2625 = 1;
2709} 3006}
2710 3007
3008inline_size int
3009infy_newfd (void)
3010{
3011#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3012 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3013 if (fd >= 0)
3014 return fd;
3015#endif
3016 return inotify_init ();
3017}
3018
2711inline_size void 3019inline_size void
2712infy_init (EV_P) 3020infy_init (EV_P)
2713{ 3021{
2714 if (fs_fd != -2) 3022 if (fs_fd != -2)
2715 return; 3023 return;
2716 3024
2717 fs_fd = -1; 3025 fs_fd = -1;
2718 3026
2719 check_2625 (EV_A); 3027 check_2625 (EV_A);
2720 3028
2721 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2722 3030
2723 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2724 { 3032 {
3033 fd_intern (fs_fd);
2725 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2726 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2727 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2728 } 3038 }
2729} 3039}
2730 3040
2731inline_size void 3041inline_size void
2732infy_fork (EV_P) 3042infy_fork (EV_P)
2734 int slot; 3044 int slot;
2735 3045
2736 if (fs_fd < 0) 3046 if (fs_fd < 0)
2737 return; 3047 return;
2738 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2739 close (fs_fd); 3051 close (fs_fd);
2740 fs_fd = inotify_init (); 3052 fs_fd = infy_newfd ();
3053
3054 if (fs_fd >= 0)
3055 {
3056 fd_intern (fs_fd);
3057 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A);
3060 }
2741 3061
2742 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2743 { 3063 {
2744 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
2745 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
2752 w->wd = -1; 3072 w->wd = -1;
2753 3073
2754 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
2755 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
2756 else 3076 else
3077 {
3078 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3079 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2757 ev_timer_again (EV_A_ &w->timer); 3080 ev_timer_again (EV_A_ &w->timer);
3081 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3082 }
2758 } 3083 }
2759 } 3084 }
2760} 3085}
2761 3086
2762#endif 3087#endif
2779static void noinline 3104static void noinline
2780stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2781{ 3106{
2782 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2783 3108
2784 /* we copy this here each the time so that */ 3109 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); 3110 ev_stat_stat (EV_A_ w);
2788 3111
2789 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3112 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2790 if ( 3113 if (
2791 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
2792 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
2793 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
2794 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
2795 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
2796 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
2797 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
2798 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
2799 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
2800 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
2801 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
2802 ) { 3125 ) {
3126 /* we only update w->prev on actual differences */
3127 /* in case we test more often than invoke the callback, */
3128 /* to ensure that prev is always different to attr */
3129 w->prev = prev;
3130
2803 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
2804 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
2805 { 3133 {
2806 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
2807 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
2832 3160
2833 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
2834 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
2835 else 3163 else
2836#endif 3164#endif
3165 {
2837 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
2838 3169
2839 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
2840 3171
2841 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
2842} 3173}
2851 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
2852 3183
2853#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
2854 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
2855#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
2856 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
2857 3193
2858 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
2859 3195
2860 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
2861} 3197}
3002embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3003{ 3339{
3004 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3005 3341
3006 { 3342 {
3007 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
3008 3344
3009 while (fdchangecnt) 3345 while (fdchangecnt)
3010 { 3346 {
3011 fd_reify (EV_A); 3347 fd_reify (EV_A);
3012 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3020 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3356 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3021 3357
3022 ev_embed_stop (EV_A_ w); 3358 ev_embed_stop (EV_A_ w);
3023 3359
3024 { 3360 {
3025 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
3026 3362
3027 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3029 } 3365 }
3030 3366
3044{ 3380{
3045 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
3046 return; 3382 return;
3047 3383
3048 { 3384 {
3049 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
3050 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3386 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); 3387 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3052 } 3388 }
3053 3389
3054 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
3166 3502
3167void 3503void
3168ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
3169{ 3505{
3170 w->sent = 1; 3506 w->sent = 1;
3171 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
3172} 3508}
3173#endif 3509#endif
3174 3510
3175/*****************************************************************************/ 3511/*****************************************************************************/
3176 3512
3325 if (types & EV_CHECK) 3661 if (types & EV_CHECK)
3326 for (i = checkcnt; i--; ) 3662 for (i = checkcnt; i--; )
3327 cb (EV_A_ EV_CHECK, checks [i]); 3663 cb (EV_A_ EV_CHECK, checks [i]);
3328 3664
3329 if (types & EV_SIGNAL) 3665 if (types & EV_SIGNAL)
3330 for (i = 0; i < signalmax; ++i) 3666 for (i = 0; i < EV_NSIG - 1; ++i)
3331 for (wl = signals [i].head; wl; ) 3667 for (wl = signals [i].head; wl; )
3332 { 3668 {
3333 wn = wl->next; 3669 wn = wl->next;
3334 cb (EV_A_ EV_SIGNAL, wl); 3670 cb (EV_A_ EV_SIGNAL, wl);
3335 wl = wn; 3671 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines