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

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC vs.
Revision 1.331 by root, Tue Mar 9 08:55:03 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
155#include <assert.h> 164#include <assert.h>
156#include <errno.h> 165#include <errno.h>
157#include <sys/types.h> 166#include <sys/types.h>
158#include <time.h> 167#include <time.h>
168#include <limits.h>
159 169
160#include <signal.h> 170#include <signal.h>
161 171
162#ifdef EV_H 172#ifdef EV_H
163# include EV_H 173# include EV_H
174# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 185# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
178# endif 188# endif
189# undef EV_AVOID_STDIO
179#endif 190#endif
180 191
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */
218# define EV_NSIG 65
219#endif
182 220
183#ifndef EV_USE_CLOCK_SYSCALL 221#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 222# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 223# define EV_USE_CLOCK_SYSCALL 1
186# else 224# else
263#ifndef EV_USE_EVENTFD 301#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 302# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 303# define EV_USE_EVENTFD 1
266# else 304# else
267# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
306# endif
307#endif
308
309#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1
312# else
313# define EV_USE_SIGNALFD 0
268# endif 314# endif
269#endif 315#endif
270 316
271#if 0 /* debugging */ 317#if 0 /* debugging */
272# define EV_VERIFY 3 318# define EV_VERIFY 3
300# endif 346# endif
301#endif 347#endif
302 348
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
305#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
308#endif 360#endif
309 361
339#endif 391#endif
340 392
341#if EV_USE_EVENTFD 393#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 394/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 395# include <stdint.h>
396# ifndef EFD_NONBLOCK
397# define EFD_NONBLOCK O_NONBLOCK
398# endif
399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
405# endif
344# ifdef __cplusplus 406# ifdef __cplusplus
345extern "C" { 407extern "C" {
346# endif 408# endif
347int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 410# ifdef __cplusplus
349} 411}
350# endif 412# endif
351#endif 413#endif
414
415#if EV_USE_SIGNALFD
416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
352 443
353/**/ 444/**/
354 445
355#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 459 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 461
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#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) */ 463#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 464
375#if __GNUC__ >= 4 465#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
378#else 468#else
419 509
420#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 512#endif
423 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
424#ifdef _WIN32 524#ifdef _WIN32
425# include "ev_win32.c" 525# include "ev_win32.c"
426#endif 526#endif
427 527
428/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
429 537
430static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
431 539
432void 540void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
443 551
444 if (syserr_cb) 552 if (syserr_cb)
445 syserr_cb (msg); 553 syserr_cb (msg);
446 else 554 else
447 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
448 perror (msg); 564 perror (msg);
565#endif
449 abort (); 566 abort ();
450 } 567 }
451} 568}
452 569
453static void * 570static void *
478{ 595{
479 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
480 597
481 if (!ptr && size) 598 if (!ptr && size)
482 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
484 abort (); 605 abort ();
485 } 606 }
486 607
487 return ptr; 608 return ptr;
488} 609}
490#define ev_malloc(size) ev_realloc (0, (size)) 611#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 612#define ev_free(ptr) ev_realloc ((ptr), 0)
492 613
493/*****************************************************************************/ 614/*****************************************************************************/
494 615
616/* set in reify when reification needed */
617#define EV_ANFD_REIFY 1
618
495/* file descriptor info structure */ 619/* file descriptor info structure */
496typedef struct 620typedef struct
497{ 621{
498 WL head; 622 WL head;
499 unsigned char events; /* the events watched for */ 623 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 624 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 */ 625 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 626 unsigned char unused;
503#if EV_USE_EPOLL 627#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 628 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 629#endif
568 static int ev_default_loop_ptr; 692 static int ev_default_loop_ptr;
569 693
570#endif 694#endif
571 695
572#if EV_MINIMAL < 2 696#if EV_MINIMAL < 2
573# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
574# define EV_RESUME_CB if (expect_false (resume_cb )) resume_cb (EV_A) 697# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
698# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
575# define EV_INVOKE_PENDING invoke_cb (EV_A) 699# define EV_INVOKE_PENDING invoke_cb (EV_A)
576#else 700#else
577# define EV_SUSPEND_CB (void)0
578# define EV_RESUME_CB (void)0 701# define EV_RELEASE_CB (void)0
702# define EV_ACQUIRE_CB (void)0
579# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 703# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580#endif 704#endif
705
706#define EVUNLOOP_RECURSE 0x80
581 707
582/*****************************************************************************/ 708/*****************************************************************************/
583 709
584#ifndef EV_HAVE_EV_TIME 710#ifndef EV_HAVE_EV_TIME
585ev_tstamp 711ev_tstamp
642 768
643 tv.tv_sec = (time_t)delay; 769 tv.tv_sec = (time_t)delay;
644 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 770 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645 771
646 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 772 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
647 /* somehting not guaranteed by newer posix versions, but guaranteed */ 773 /* something not guaranteed by newer posix versions, but guaranteed */
648 /* by older ones */ 774 /* by older ones */
649 select (0, 0, 0, 0, &tv); 775 select (0, 0, 0, 0, &tv);
650#endif 776#endif
651 } 777 }
652} 778}
760} 886}
761 887
762/*****************************************************************************/ 888/*****************************************************************************/
763 889
764inline_speed void 890inline_speed void
765fd_event (EV_P_ int fd, int revents) 891fd_event_nc (EV_P_ int fd, int revents)
766{ 892{
767 ANFD *anfd = anfds + fd; 893 ANFD *anfd = anfds + fd;
768 ev_io *w; 894 ev_io *w;
769 895
770 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 896 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
774 if (ev) 900 if (ev)
775 ev_feed_event (EV_A_ (W)w, ev); 901 ev_feed_event (EV_A_ (W)w, ev);
776 } 902 }
777} 903}
778 904
905/* do not submit kernel events for fds that have reify set */
906/* because that means they changed while we were polling for new events */
907inline_speed void
908fd_event (EV_P_ int fd, int revents)
909{
910 ANFD *anfd = anfds + fd;
911
912 if (expect_true (!anfd->reify))
913 fd_event_nc (EV_A_ fd, revents);
914}
915
779void 916void
780ev_feed_fd_event (EV_P_ int fd, int revents) 917ev_feed_fd_event (EV_P_ int fd, int revents)
781{ 918{
782 if (fd >= 0 && fd < anfdmax) 919 if (fd >= 0 && fd < anfdmax)
783 fd_event (EV_A_ fd, revents); 920 fd_event_nc (EV_A_ fd, revents);
784} 921}
785 922
786/* make sure the external fd watch events are in-sync */ 923/* make sure the external fd watch events are in-sync */
787/* with the kernel/libev internal state */ 924/* with the kernel/libev internal state */
788inline_size void 925inline_size void
803 940
804#if EV_SELECT_IS_WINSOCKET 941#if EV_SELECT_IS_WINSOCKET
805 if (events) 942 if (events)
806 { 943 {
807 unsigned long arg; 944 unsigned long arg;
808 #ifdef EV_FD_TO_WIN32_HANDLE
809 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 945 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
810 #else
811 anfd->handle = _get_osfhandle (fd);
812 #endif
813 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
814 } 947 }
815#endif 948#endif
816 949
817 { 950 {
860/* check whether the given fd is atcually valid, for error recovery */ 993/* check whether the given fd is atcually valid, for error recovery */
861inline_size int 994inline_size int
862fd_valid (int fd) 995fd_valid (int fd)
863{ 996{
864#ifdef _WIN32 997#ifdef _WIN32
865 return _get_osfhandle (fd) != -1; 998 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
866#else 999#else
867 return fcntl (fd, F_GETFD) != -1; 1000 return fcntl (fd, F_GETFD) != -1;
868#endif 1001#endif
869} 1002}
870 1003
888 1021
889 for (fd = anfdmax; fd--; ) 1022 for (fd = anfdmax; fd--; )
890 if (anfds [fd].events) 1023 if (anfds [fd].events)
891 { 1024 {
892 fd_kill (EV_A_ fd); 1025 fd_kill (EV_A_ fd);
893 return; 1026 break;
894 } 1027 }
895} 1028}
896 1029
897/* usually called after fork if backend needs to re-arm all fds from scratch */ 1030/* usually called after fork if backend needs to re-arm all fds from scratch */
898static void noinline 1031static void noinline
903 for (fd = 0; fd < anfdmax; ++fd) 1036 for (fd = 0; fd < anfdmax; ++fd)
904 if (anfds [fd].events) 1037 if (anfds [fd].events)
905 { 1038 {
906 anfds [fd].events = 0; 1039 anfds [fd].events = 0;
907 anfds [fd].emask = 0; 1040 anfds [fd].emask = 0;
908 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1041 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
909 } 1042 }
910} 1043}
911 1044
912/*****************************************************************************/ 1045/*****************************************************************************/
913 1046
988 1121
989 for (;;) 1122 for (;;)
990 { 1123 {
991 int c = k << 1; 1124 int c = k << 1;
992 1125
993 if (c > N + HEAP0 - 1) 1126 if (c >= N + HEAP0)
994 break; 1127 break;
995 1128
996 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1129 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
997 ? 1 : 0; 1130 ? 1 : 0;
998 1131
1034 1167
1035/* move an element suitably so it is in a correct place */ 1168/* move an element suitably so it is in a correct place */
1036inline_size void 1169inline_size void
1037adjustheap (ANHE *heap, int N, int k) 1170adjustheap (ANHE *heap, int N, int k)
1038{ 1171{
1039 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1172 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1040 upheap (heap, k); 1173 upheap (heap, k);
1041 else 1174 else
1042 downheap (heap, N, k); 1175 downheap (heap, N, k);
1043} 1176}
1044 1177
1057/*****************************************************************************/ 1190/*****************************************************************************/
1058 1191
1059/* associate signal watchers to a signal signal */ 1192/* associate signal watchers to a signal signal */
1060typedef struct 1193typedef struct
1061{ 1194{
1195 EV_ATOMIC_T pending;
1196#if EV_MULTIPLICITY
1197 EV_P;
1198#endif
1062 WL head; 1199 WL head;
1063 EV_ATOMIC_T gotsig;
1064} ANSIG; 1200} ANSIG;
1065 1201
1066static ANSIG *signals; 1202static ANSIG signals [EV_NSIG - 1];
1067static int signalmax;
1068
1069static EV_ATOMIC_T gotsig;
1070 1203
1071/*****************************************************************************/ 1204/*****************************************************************************/
1072 1205
1073/* used to prepare libev internal fd's */ 1206/* used to prepare libev internal fd's */
1074/* this is not fork-safe */ 1207/* this is not fork-safe */
1075inline_speed void 1208inline_speed void
1076fd_intern (int fd) 1209fd_intern (int fd)
1077{ 1210{
1078#ifdef _WIN32 1211#ifdef _WIN32
1079 unsigned long arg = 1; 1212 unsigned long arg = 1;
1080 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1081#else 1214#else
1082 fcntl (fd, F_SETFD, FD_CLOEXEC); 1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1083 fcntl (fd, F_SETFL, O_NONBLOCK); 1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1084#endif 1217#endif
1085} 1218}
1088evpipe_init (EV_P) 1221evpipe_init (EV_P)
1089{ 1222{
1090 if (!ev_is_active (&pipe_w)) 1223 if (!ev_is_active (&pipe_w))
1091 { 1224 {
1092#if EV_USE_EVENTFD 1225#if EV_USE_EVENTFD
1226 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1227 if (evfd < 0 && errno == EINVAL)
1093 if ((evfd = eventfd (0, 0)) >= 0) 1228 evfd = eventfd (0, 0);
1229
1230 if (evfd >= 0)
1094 { 1231 {
1095 evpipe [0] = -1; 1232 evpipe [0] = -1;
1096 fd_intern (evfd); 1233 fd_intern (evfd); /* doing it twice doesn't hurt */
1097 ev_io_set (&pipe_w, evfd, EV_READ); 1234 ev_io_set (&pipe_w, evfd, EV_READ);
1098 } 1235 }
1099 else 1236 else
1100#endif 1237#endif
1101 { 1238 {
1138/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1139/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1140static void 1277static void
1141pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1142{ 1279{
1280 int i;
1281
1143#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1144 if (evfd >= 0) 1283 if (evfd >= 0)
1145 { 1284 {
1146 uint64_t counter; 1285 uint64_t counter;
1147 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
1151 { 1290 {
1152 char dummy; 1291 char dummy;
1153 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1154 } 1293 }
1155 1294
1156 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1157 { 1296 {
1158 int signum; 1297 sig_pending = 0;
1159 gotsig = 0;
1160 1298
1161 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1162 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1163 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1164 } 1302 }
1165 1303
1166#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1167 if (gotasync) 1305 if (async_pending)
1168 { 1306 {
1169 int i; 1307 async_pending = 0;
1170 gotasync = 0;
1171 1308
1172 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1173 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1174 { 1311 {
1175 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
1183 1320
1184static void 1321static void
1185ev_sighandler (int signum) 1322ev_sighandler (int signum)
1186{ 1323{
1187#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1188 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1189#endif 1326#endif
1190 1327
1191#if _WIN32 1328#ifdef _WIN32
1192 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1193#endif 1330#endif
1194 1331
1195 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1196 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1197} 1334}
1198 1335
1199void noinline 1336void noinline
1200ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1201{ 1338{
1202 WL w; 1339 WL w;
1203 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1204#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1205 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1206#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1207 1349
1208 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1209
1210 if (signum < 0 || signum >= signalmax)
1211 return; 1351 return;
1352#endif
1212 1353
1213 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1214 1355
1215 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1216 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217} 1358}
1359
1360#if EV_USE_SIGNALFD
1361static void
1362sigfdcb (EV_P_ ev_io *iow, int revents)
1363{
1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1365
1366 for (;;)
1367 {
1368 ssize_t res = read (sigfd, si, sizeof (si));
1369
1370 /* not ISO-C, as res might be -1, but works with SuS */
1371 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1372 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1373
1374 if (res < (ssize_t)sizeof (si))
1375 break;
1376 }
1377}
1378#endif
1218 1379
1219/*****************************************************************************/ 1380/*****************************************************************************/
1220 1381
1221static WL childs [EV_PID_HASHSIZE]; 1382static WL childs [EV_PID_HASHSIZE];
1222 1383
1409void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1570void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410{ 1571{
1411 invoke_cb = invoke_pending_cb; 1572 invoke_cb = invoke_pending_cb;
1412} 1573}
1413 1574
1414void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P)) 1575void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1415{ 1576{
1416 suspend_cb = suspend_cb_; 1577 release_cb = release;
1417 resume_cb = resume_cb_; 1578 acquire_cb = acquire;
1418} 1579}
1419#endif 1580#endif
1420 1581
1421/* initialise a loop structure, must be zero-initialised */ 1582/* initialise a loop structure, must be zero-initialised */
1422static void noinline 1583static void noinline
1441 1602
1442 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1603 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1443 have_monotonic = 1; 1604 have_monotonic = 1;
1444 } 1605 }
1445#endif 1606#endif
1607
1608 /* pid check not overridable via env */
1609#ifndef _WIN32
1610 if (flags & EVFLAG_FORKCHECK)
1611 curpid = getpid ();
1612#endif
1613
1614 if (!(flags & EVFLAG_NOENV)
1615 && !enable_secure ()
1616 && getenv ("LIBEV_FLAGS"))
1617 flags = atoi (getenv ("LIBEV_FLAGS"));
1446 1618
1447 ev_rt_now = ev_time (); 1619 ev_rt_now = ev_time ();
1448 mn_now = get_clock (); 1620 mn_now = get_clock ();
1449 now_floor = mn_now; 1621 now_floor = mn_now;
1450 rtmn_diff = ev_rt_now - mn_now; 1622 rtmn_diff = ev_rt_now - mn_now;
1454 1626
1455 io_blocktime = 0.; 1627 io_blocktime = 0.;
1456 timeout_blocktime = 0.; 1628 timeout_blocktime = 0.;
1457 backend = 0; 1629 backend = 0;
1458 backend_fd = -1; 1630 backend_fd = -1;
1459 gotasync = 0; 1631 sig_pending = 0;
1632#if EV_ASYNC_ENABLE
1633 async_pending = 0;
1634#endif
1460#if EV_USE_INOTIFY 1635#if EV_USE_INOTIFY
1461 fs_fd = -2; 1636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1462#endif 1637#endif
1463 1638#if EV_USE_SIGNALFD
1464 /* pid check not overridable via env */ 1639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1465#ifndef _WIN32
1466 if (flags & EVFLAG_FORKCHECK)
1467 curpid = getpid ();
1468#endif 1640#endif
1469
1470 if (!(flags & EVFLAG_NOENV)
1471 && !enable_secure ()
1472 && getenv ("LIBEV_FLAGS"))
1473 flags = atoi (getenv ("LIBEV_FLAGS"));
1474 1641
1475 if (!(flags & 0x0000ffffU)) 1642 if (!(flags & 0x0000ffffU))
1476 flags |= ev_recommended_backends (); 1643 flags |= ev_recommended_backends ();
1477 1644
1478#if EV_USE_PORT 1645#if EV_USE_PORT
1504{ 1671{
1505 int i; 1672 int i;
1506 1673
1507 if (ev_is_active (&pipe_w)) 1674 if (ev_is_active (&pipe_w))
1508 { 1675 {
1509 ev_ref (EV_A); /* signal watcher */ 1676 /*ev_ref (EV_A);*/
1510 ev_io_stop (EV_A_ &pipe_w); 1677 /*ev_io_stop (EV_A_ &pipe_w);*/
1511 1678
1512#if EV_USE_EVENTFD 1679#if EV_USE_EVENTFD
1513 if (evfd >= 0) 1680 if (evfd >= 0)
1514 close (evfd); 1681 close (evfd);
1515#endif 1682#endif
1516 1683
1517 if (evpipe [0] >= 0) 1684 if (evpipe [0] >= 0)
1518 { 1685 {
1519 close (evpipe [0]); 1686 EV_WIN32_CLOSE_FD (evpipe [0]);
1520 close (evpipe [1]); 1687 EV_WIN32_CLOSE_FD (evpipe [1]);
1521 } 1688 }
1522 } 1689 }
1690
1691#if EV_USE_SIGNALFD
1692 if (ev_is_active (&sigfd_w))
1693 close (sigfd);
1694#endif
1523 1695
1524#if EV_USE_INOTIFY 1696#if EV_USE_INOTIFY
1525 if (fs_fd >= 0) 1697 if (fs_fd >= 0)
1526 close (fs_fd); 1698 close (fs_fd);
1527#endif 1699#endif
1551#if EV_IDLE_ENABLE 1723#if EV_IDLE_ENABLE
1552 array_free (idle, [i]); 1724 array_free (idle, [i]);
1553#endif 1725#endif
1554 } 1726 }
1555 1727
1556 ev_free (anfds); anfdmax = 0; 1728 ev_free (anfds); anfds = 0; anfdmax = 0;
1557 1729
1558 /* have to use the microsoft-never-gets-it-right macro */ 1730 /* have to use the microsoft-never-gets-it-right macro */
1559 array_free (rfeed, EMPTY); 1731 array_free (rfeed, EMPTY);
1560 array_free (fdchange, EMPTY); 1732 array_free (fdchange, EMPTY);
1561 array_free (timer, EMPTY); 1733 array_free (timer, EMPTY);
1596 1768
1597 if (ev_is_active (&pipe_w)) 1769 if (ev_is_active (&pipe_w))
1598 { 1770 {
1599 /* this "locks" the handlers against writing to the pipe */ 1771 /* this "locks" the handlers against writing to the pipe */
1600 /* while we modify the fd vars */ 1772 /* while we modify the fd vars */
1601 gotsig = 1; 1773 sig_pending = 1;
1602#if EV_ASYNC_ENABLE 1774#if EV_ASYNC_ENABLE
1603 gotasync = 1; 1775 async_pending = 1;
1604#endif 1776#endif
1605 1777
1606 ev_ref (EV_A); 1778 ev_ref (EV_A);
1607 ev_io_stop (EV_A_ &pipe_w); 1779 ev_io_stop (EV_A_ &pipe_w);
1608 1780
1611 close (evfd); 1783 close (evfd);
1612#endif 1784#endif
1613 1785
1614 if (evpipe [0] >= 0) 1786 if (evpipe [0] >= 0)
1615 { 1787 {
1616 close (evpipe [0]); 1788 EV_WIN32_CLOSE_FD (evpipe [0]);
1617 close (evpipe [1]); 1789 EV_WIN32_CLOSE_FD (evpipe [1]);
1618 } 1790 }
1619 1791
1620 evpipe_init (EV_A); 1792 evpipe_init (EV_A);
1621 /* now iterate over everything, in case we missed something */ 1793 /* now iterate over everything, in case we missed something */
1622 pipecb (EV_A_ &pipe_w, EV_READ); 1794 pipecb (EV_A_ &pipe_w, EV_READ);
1628#if EV_MULTIPLICITY 1800#if EV_MULTIPLICITY
1629 1801
1630struct ev_loop * 1802struct ev_loop *
1631ev_loop_new (unsigned int flags) 1803ev_loop_new (unsigned int flags)
1632{ 1804{
1633 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1805 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1634 1806
1635 memset (loop, 0, sizeof (struct ev_loop)); 1807 memset (EV_A, 0, sizeof (struct ev_loop));
1636
1637 loop_init (EV_A_ flags); 1808 loop_init (EV_A_ flags);
1638 1809
1639 if (ev_backend (EV_A)) 1810 if (ev_backend (EV_A))
1640 return loop; 1811 return EV_A;
1641 1812
1642 return 0; 1813 return 0;
1643} 1814}
1644 1815
1645void 1816void
1749 assert (checkmax >= checkcnt); 1920 assert (checkmax >= checkcnt);
1750 array_verify (EV_A_ (W *)checks, checkcnt); 1921 array_verify (EV_A_ (W *)checks, checkcnt);
1751 1922
1752# if 0 1923# if 0
1753 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1754 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1755# endif 1926# endif
1756#endif 1927#endif
1757} 1928}
1758#endif 1929#endif
1759 1930
1766#endif 1937#endif
1767{ 1938{
1768 if (!ev_default_loop_ptr) 1939 if (!ev_default_loop_ptr)
1769 { 1940 {
1770#if EV_MULTIPLICITY 1941#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1942 EV_P = ev_default_loop_ptr = &default_loop_struct;
1772#else 1943#else
1773 ev_default_loop_ptr = 1; 1944 ev_default_loop_ptr = 1;
1774#endif 1945#endif
1775 1946
1776 loop_init (EV_A_ flags); 1947 loop_init (EV_A_ flags);
1793 1964
1794void 1965void
1795ev_default_destroy (void) 1966ev_default_destroy (void)
1796{ 1967{
1797#if EV_MULTIPLICITY 1968#if EV_MULTIPLICITY
1798 struct ev_loop *loop = ev_default_loop_ptr; 1969 EV_P = ev_default_loop_ptr;
1799#endif 1970#endif
1800 1971
1801 ev_default_loop_ptr = 0; 1972 ev_default_loop_ptr = 0;
1802 1973
1803#ifndef _WIN32 1974#ifndef _WIN32
1810 1981
1811void 1982void
1812ev_default_fork (void) 1983ev_default_fork (void)
1813{ 1984{
1814#if EV_MULTIPLICITY 1985#if EV_MULTIPLICITY
1815 struct ev_loop *loop = ev_default_loop_ptr; 1986 EV_P = ev_default_loop_ptr;
1816#endif 1987#endif
1817 1988
1818 postfork = 1; /* must be in line with ev_loop_fork */ 1989 postfork = 1; /* must be in line with ev_loop_fork */
1819} 1990}
1820 1991
1822 1993
1823void 1994void
1824ev_invoke (EV_P_ void *w, int revents) 1995ev_invoke (EV_P_ void *w, int revents)
1825{ 1996{
1826 EV_CB_INVOKE ((W)w, revents); 1997 EV_CB_INVOKE ((W)w, revents);
1998}
1999
2000unsigned int
2001ev_pending_count (EV_P)
2002{
2003 int pri;
2004 unsigned int count = 0;
2005
2006 for (pri = NUMPRI; pri--; )
2007 count += pendingcnt [pri];
2008
2009 return count;
1827} 2010}
1828 2011
1829void noinline 2012void noinline
1830ev_invoke_pending (EV_P) 2013ev_invoke_pending (EV_P)
1831{ 2014{
2003 ANHE_at_cache (*he); 2186 ANHE_at_cache (*he);
2004 } 2187 }
2005} 2188}
2006 2189
2007/* fetch new monotonic and realtime times from the kernel */ 2190/* fetch new monotonic and realtime times from the kernel */
2008/* also detetc if there was a timejump, and act accordingly */ 2191/* also detect if there was a timejump, and act accordingly */
2009inline_speed void 2192inline_speed void
2010time_update (EV_P_ ev_tstamp max_block) 2193time_update (EV_P_ ev_tstamp max_block)
2011{ 2194{
2012#if EV_USE_MONOTONIC 2195#if EV_USE_MONOTONIC
2013 if (expect_true (have_monotonic)) 2196 if (expect_true (have_monotonic))
2077{ 2260{
2078#if EV_MINIMAL < 2 2261#if EV_MINIMAL < 2
2079 ++loop_depth; 2262 ++loop_depth;
2080#endif 2263#endif
2081 2264
2265 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2266
2082 loop_done = EVUNLOOP_CANCEL; 2267 loop_done = EVUNLOOP_CANCEL;
2083 2268
2084 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2269 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085 2270
2086 do 2271 do
2113 { 2298 {
2114 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2299 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115 EV_INVOKE_PENDING; 2300 EV_INVOKE_PENDING;
2116 } 2301 }
2117 2302
2303 if (expect_false (loop_done))
2304 break;
2305
2118 /* we might have forked, so reify kernel state if necessary */ 2306 /* we might have forked, so reify kernel state if necessary */
2119 if (expect_false (postfork)) 2307 if (expect_false (postfork))
2120 loop_fork (EV_A); 2308 loop_fork (EV_A);
2121 2309
2122 /* update fd-related kernel structures */ 2310 /* update fd-related kernel structures */
2172 } 2360 }
2173 2361
2174#if EV_MINIMAL < 2 2362#if EV_MINIMAL < 2
2175 ++loop_count; 2363 ++loop_count;
2176#endif 2364#endif
2365 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2177 backend_poll (EV_A_ waittime); 2366 backend_poll (EV_A_ waittime);
2367 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2178 2368
2179 /* update ev_rt_now, do magic */ 2369 /* update ev_rt_now, do magic */
2180 time_update (EV_A_ waittime + sleeptime); 2370 time_update (EV_A_ waittime + sleeptime);
2181 } 2371 }
2182 2372
2267inline_size void 2457inline_size void
2268wlist_del (WL *head, WL elem) 2458wlist_del (WL *head, WL elem)
2269{ 2459{
2270 while (*head) 2460 while (*head)
2271 { 2461 {
2272 if (*head == elem) 2462 if (expect_true (*head == elem))
2273 { 2463 {
2274 *head = elem->next; 2464 *head = elem->next;
2275 return; 2465 break;
2276 } 2466 }
2277 2467
2278 head = &(*head)->next; 2468 head = &(*head)->next;
2279 } 2469 }
2280} 2470}
2340 2530
2341 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2342 return; 2532 return;
2343 2533
2344 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2534 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2345 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2535 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2346 2536
2347 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2348 2538
2349 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2350 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351 wlist_add (&anfds[fd].head, (WL)w); 2541 wlist_add (&anfds[fd].head, (WL)w);
2352 2542
2353 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2543 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2354 w->events &= ~EV__IOFDSET; 2544 w->events &= ~EV__IOFDSET;
2355 2545
2356 EV_FREQUENT_CHECK; 2546 EV_FREQUENT_CHECK;
2357} 2547}
2358 2548
2420 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2421 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2422 } 2612 }
2423 } 2613 }
2424 2614
2425 EV_FREQUENT_CHECK;
2426
2427 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2428 2616
2429 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2430} 2620}
2431 2621
2432void noinline 2622void noinline
2433ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2434{ 2624{
2452 } 2642 }
2453 2643
2454 EV_FREQUENT_CHECK; 2644 EV_FREQUENT_CHECK;
2455} 2645}
2456 2646
2647ev_tstamp
2648ev_timer_remaining (EV_P_ ev_timer *w)
2649{
2650 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2651}
2652
2457#if EV_PERIODIC_ENABLE 2653#if EV_PERIODIC_ENABLE
2458void noinline 2654void noinline
2459ev_periodic_start (EV_P_ ev_periodic *w) 2655ev_periodic_start (EV_P_ ev_periodic *w)
2460{ 2656{
2461 if (expect_false (ev_is_active (w))) 2657 if (expect_false (ev_is_active (w)))
2507 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2508 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2509 } 2705 }
2510 } 2706 }
2511 2707
2512 EV_FREQUENT_CHECK;
2513
2514 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2515} 2711}
2516 2712
2517void noinline 2713void noinline
2518ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2519{ 2715{
2528#endif 2724#endif
2529 2725
2530void noinline 2726void noinline
2531ev_signal_start (EV_P_ ev_signal *w) 2727ev_signal_start (EV_P_ ev_signal *w)
2532{ 2728{
2533#if EV_MULTIPLICITY
2534 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2535#endif
2536 if (expect_false (ev_is_active (w))) 2729 if (expect_false (ev_is_active (w)))
2537 return; 2730 return;
2538 2731
2539 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2732 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2540 2733
2541 evpipe_init (EV_A); 2734#if EV_MULTIPLICITY
2735 assert (("libev: a signal must not be attached to two different loops",
2736 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2542 2737
2543 EV_FREQUENT_CHECK; 2738 signals [w->signum - 1].loop = EV_A;
2739#endif
2544 2740
2741 EV_FREQUENT_CHECK;
2742
2743#if EV_USE_SIGNALFD
2744 if (sigfd == -2)
2545 { 2745 {
2546#ifndef _WIN32 2746 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2547 sigset_t full, prev; 2747 if (sigfd < 0 && errno == EINVAL)
2548 sigfillset (&full); 2748 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2549 sigprocmask (SIG_SETMASK, &full, &prev);
2550#endif
2551 2749
2552 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2750 if (sigfd >= 0)
2751 {
2752 fd_intern (sigfd); /* doing it twice will not hurt */
2553 2753
2554#ifndef _WIN32 2754 sigemptyset (&sigfd_set);
2555 sigprocmask (SIG_SETMASK, &prev, 0); 2755
2556#endif 2756 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2757 ev_set_priority (&sigfd_w, EV_MAXPRI);
2758 ev_io_start (EV_A_ &sigfd_w);
2759 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2760 }
2557 } 2761 }
2762
2763 if (sigfd >= 0)
2764 {
2765 /* TODO: check .head */
2766 sigaddset (&sigfd_set, w->signum);
2767 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2768
2769 signalfd (sigfd, &sigfd_set, 0);
2770 }
2771#endif
2558 2772
2559 ev_start (EV_A_ (W)w, 1); 2773 ev_start (EV_A_ (W)w, 1);
2560 wlist_add (&signals [w->signum - 1].head, (WL)w); 2774 wlist_add (&signals [w->signum - 1].head, (WL)w);
2561 2775
2562 if (!((WL)w)->next) 2776 if (!((WL)w)->next)
2777# if EV_USE_SIGNALFD
2778 if (sigfd < 0) /*TODO*/
2779# endif
2563 { 2780 {
2564#if _WIN32 2781# ifdef _WIN32
2782 evpipe_init (EV_A);
2783
2565 signal (w->signum, ev_sighandler); 2784 signal (w->signum, ev_sighandler);
2566#else 2785# else
2567 struct sigaction sa; 2786 struct sigaction sa;
2787
2788 evpipe_init (EV_A);
2789
2568 sa.sa_handler = ev_sighandler; 2790 sa.sa_handler = ev_sighandler;
2569 sigfillset (&sa.sa_mask); 2791 sigfillset (&sa.sa_mask);
2570 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2792 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2571 sigaction (w->signum, &sa, 0); 2793 sigaction (w->signum, &sa, 0);
2794
2795 sigemptyset (&sa.sa_mask);
2796 sigaddset (&sa.sa_mask, w->signum);
2797 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2572#endif 2798#endif
2573 } 2799 }
2574 2800
2575 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
2576} 2802}
2577 2803
2578void noinline 2804void noinline
2586 2812
2587 wlist_del (&signals [w->signum - 1].head, (WL)w); 2813 wlist_del (&signals [w->signum - 1].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2814 ev_stop (EV_A_ (W)w);
2589 2815
2590 if (!signals [w->signum - 1].head) 2816 if (!signals [w->signum - 1].head)
2817 {
2818#if EV_MULTIPLICITY
2819 signals [w->signum - 1].loop = 0; /* unattach from signal */
2820#endif
2821#if EV_USE_SIGNALFD
2822 if (sigfd >= 0)
2823 {
2824 sigset_t ss;
2825
2826 sigemptyset (&ss);
2827 sigaddset (&ss, w->signum);
2828 sigdelset (&sigfd_set, w->signum);
2829
2830 signalfd (sigfd, &sigfd_set, 0);
2831 sigprocmask (SIG_UNBLOCK, &ss, 0);
2832 }
2833 else
2834#endif
2591 signal (w->signum, SIG_DFL); 2835 signal (w->signum, SIG_DFL);
2836 }
2592 2837
2593 EV_FREQUENT_CHECK; 2838 EV_FREQUENT_CHECK;
2594} 2839}
2595 2840
2596void 2841void
2637#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2638 2883
2639static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2884static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2640 2885
2641#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2642# define EV_INOTIFY_BUFSIZE 8192 2887
2888/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2889# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2643 2890
2644static void noinline 2891static void noinline
2645infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2646{ 2893{
2647 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); 2894 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);
2648 2895
2649 if (w->wd < 0) 2896 if (w->wd >= 0)
2897 {
2898 struct statfs sfs;
2899
2900 /* now local changes will be tracked by inotify, but remote changes won't */
2901 /* unless the filesystem is known to be local, we therefore still poll */
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (!fs_2625)
2905 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2906 else if (!statfs (w->path, &sfs)
2907 && (sfs.f_type == 0x1373 /* devfs */
2908 || sfs.f_type == 0xEF53 /* ext2/3 */
2909 || sfs.f_type == 0x3153464a /* jfs */
2910 || sfs.f_type == 0x52654973 /* reiser3 */
2911 || sfs.f_type == 0x01021994 /* tempfs */
2912 || sfs.f_type == 0x58465342 /* xfs */))
2913 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2914 else
2915 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2650 { 2916 }
2917 else
2918 {
2919 /* can't use inotify, continue to stat */
2651 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2920 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2652 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2653 2921
2654 /* monitor some parent directory for speedup hints */ 2922 /* if path is not there, monitor some parent directory for speedup hints */
2655 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2923 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2656 /* but an efficiency issue only */ 2924 /* but an efficiency issue only */
2657 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2925 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2658 { 2926 {
2659 char path [4096]; 2927 char path [4096];
2675 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2676 } 2944 }
2677 } 2945 }
2678 2946
2679 if (w->wd >= 0) 2947 if (w->wd >= 0)
2680 {
2681 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2682 2949
2683 /* now local changes will be tracked by inotify, but remote changes won't */ 2950 /* now re-arm timer, if required */
2684 /* unless the filesystem it known to be local, we therefore still poll */ 2951 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2685 /* also do poll on <2.6.25, but with normal frequency */
2686 struct statfs sfs;
2687
2688 if (fs_2625 && !statfs (w->path, &sfs))
2689 if (sfs.f_type == 0x1373 /* devfs */
2690 || sfs.f_type == 0xEF53 /* ext2/3 */
2691 || sfs.f_type == 0x3153464a /* jfs */
2692 || sfs.f_type == 0x52654973 /* reiser3 */
2693 || sfs.f_type == 0x01021994 /* tempfs */
2694 || sfs.f_type == 0x58465342 /* xfs */)
2695 return;
2696
2697 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2698 ev_timer_again (EV_A_ &w->timer); 2952 ev_timer_again (EV_A_ &w->timer);
2699 } 2953 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2700} 2954}
2701 2955
2702static void noinline 2956static void noinline
2703infy_del (EV_P_ ev_stat *w) 2957infy_del (EV_P_ ev_stat *w)
2704{ 2958{
2749 3003
2750static void 3004static void
2751infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2752{ 3006{
2753 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2754 struct inotify_event *ev = (struct inotify_event *)buf;
2755 int ofs; 3008 int ofs;
2756 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2757 3010
2758 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3011 for (ofs = 0; ofs < len; )
3012 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2759 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3014 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len;
3016 }
3017}
3018
3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
2760} 3049}
2761 3050
2762inline_size void 3051inline_size void
2763check_2625 (EV_P) 3052ev_check_2625 (EV_P)
2764{ 3053{
2765 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2766 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2767 */ 3056 */
2768 struct utsname buf; 3057 if (ev_linux_version () < 0x020619)
2769 int major, minor, micro;
2770
2771 if (uname (&buf))
2772 return; 3058 return;
2773 3059
2774 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2775 return;
2776
2777 if (major < 2
2778 || (major == 2 && minor < 6)
2779 || (major == 2 && minor == 6 && micro < 25))
2780 return;
2781
2782 fs_2625 = 1; 3060 fs_2625 = 1;
3061}
3062
3063inline_size int
3064infy_newfd (void)
3065{
3066#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3067 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3068 if (fd >= 0)
3069 return fd;
3070#endif
3071 return inotify_init ();
2783} 3072}
2784 3073
2785inline_size void 3074inline_size void
2786infy_init (EV_P) 3075infy_init (EV_P)
2787{ 3076{
2788 if (fs_fd != -2) 3077 if (fs_fd != -2)
2789 return; 3078 return;
2790 3079
2791 fs_fd = -1; 3080 fs_fd = -1;
2792 3081
2793 check_2625 (EV_A); 3082 ev_check_2625 (EV_A);
2794 3083
2795 fs_fd = inotify_init (); 3084 fs_fd = infy_newfd ();
2796 3085
2797 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2798 { 3087 {
3088 fd_intern (fs_fd);
2799 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3089 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2800 ev_set_priority (&fs_w, EV_MAXPRI); 3090 ev_set_priority (&fs_w, EV_MAXPRI);
2801 ev_io_start (EV_A_ &fs_w); 3091 ev_io_start (EV_A_ &fs_w);
3092 ev_unref (EV_A);
2802 } 3093 }
2803} 3094}
2804 3095
2805inline_size void 3096inline_size void
2806infy_fork (EV_P) 3097infy_fork (EV_P)
2808 int slot; 3099 int slot;
2809 3100
2810 if (fs_fd < 0) 3101 if (fs_fd < 0)
2811 return; 3102 return;
2812 3103
3104 ev_ref (EV_A);
3105 ev_io_stop (EV_A_ &fs_w);
2813 close (fs_fd); 3106 close (fs_fd);
2814 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
3108
3109 if (fs_fd >= 0)
3110 {
3111 fd_intern (fs_fd);
3112 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A);
3115 }
2815 3116
2816 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2817 { 3118 {
2818 WL w_ = fs_hash [slot].head; 3119 WL w_ = fs_hash [slot].head;
2819 fs_hash [slot].head = 0; 3120 fs_hash [slot].head = 0;
2826 w->wd = -1; 3127 w->wd = -1;
2827 3128
2828 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
2829 infy_add (EV_A_ w); /* re-add, no matter what */ 3130 infy_add (EV_A_ w); /* re-add, no matter what */
2830 else 3131 else
3132 {
3133 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3134 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2831 ev_timer_again (EV_A_ &w->timer); 3135 ev_timer_again (EV_A_ &w->timer);
3136 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3137 }
2832 } 3138 }
2833 } 3139 }
2834} 3140}
2835 3141
2836#endif 3142#endif
2853static void noinline 3159static void noinline
2854stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3160stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2855{ 3161{
2856 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3162 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2857 3163
2858 /* we copy this here each the time so that */ 3164 ev_statdata prev = w->attr;
2859 /* prev has the old value when the callback gets invoked */
2860 w->prev = w->attr;
2861 ev_stat_stat (EV_A_ w); 3165 ev_stat_stat (EV_A_ w);
2862 3166
2863 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3167 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2864 if ( 3168 if (
2865 w->prev.st_dev != w->attr.st_dev 3169 prev.st_dev != w->attr.st_dev
2866 || w->prev.st_ino != w->attr.st_ino 3170 || prev.st_ino != w->attr.st_ino
2867 || w->prev.st_mode != w->attr.st_mode 3171 || prev.st_mode != w->attr.st_mode
2868 || w->prev.st_nlink != w->attr.st_nlink 3172 || prev.st_nlink != w->attr.st_nlink
2869 || w->prev.st_uid != w->attr.st_uid 3173 || prev.st_uid != w->attr.st_uid
2870 || w->prev.st_gid != w->attr.st_gid 3174 || prev.st_gid != w->attr.st_gid
2871 || w->prev.st_rdev != w->attr.st_rdev 3175 || prev.st_rdev != w->attr.st_rdev
2872 || w->prev.st_size != w->attr.st_size 3176 || prev.st_size != w->attr.st_size
2873 || w->prev.st_atime != w->attr.st_atime 3177 || prev.st_atime != w->attr.st_atime
2874 || w->prev.st_mtime != w->attr.st_mtime 3178 || prev.st_mtime != w->attr.st_mtime
2875 || w->prev.st_ctime != w->attr.st_ctime 3179 || prev.st_ctime != w->attr.st_ctime
2876 ) { 3180 ) {
3181 /* we only update w->prev on actual differences */
3182 /* in case we test more often than invoke the callback, */
3183 /* to ensure that prev is always different to attr */
3184 w->prev = prev;
3185
2877 #if EV_USE_INOTIFY 3186 #if EV_USE_INOTIFY
2878 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
2879 { 3188 {
2880 infy_del (EV_A_ w); 3189 infy_del (EV_A_ w);
2881 infy_add (EV_A_ w); 3190 infy_add (EV_A_ w);
2906 3215
2907 if (fs_fd >= 0) 3216 if (fs_fd >= 0)
2908 infy_add (EV_A_ w); 3217 infy_add (EV_A_ w);
2909 else 3218 else
2910#endif 3219#endif
3220 {
2911 ev_timer_again (EV_A_ &w->timer); 3221 ev_timer_again (EV_A_ &w->timer);
3222 ev_unref (EV_A);
3223 }
2912 3224
2913 ev_start (EV_A_ (W)w, 1); 3225 ev_start (EV_A_ (W)w, 1);
2914 3226
2915 EV_FREQUENT_CHECK; 3227 EV_FREQUENT_CHECK;
2916} 3228}
2925 EV_FREQUENT_CHECK; 3237 EV_FREQUENT_CHECK;
2926 3238
2927#if EV_USE_INOTIFY 3239#if EV_USE_INOTIFY
2928 infy_del (EV_A_ w); 3240 infy_del (EV_A_ w);
2929#endif 3241#endif
3242
3243 if (ev_is_active (&w->timer))
3244 {
3245 ev_ref (EV_A);
2930 ev_timer_stop (EV_A_ &w->timer); 3246 ev_timer_stop (EV_A_ &w->timer);
3247 }
2931 3248
2932 ev_stop (EV_A_ (W)w); 3249 ev_stop (EV_A_ (W)w);
2933 3250
2934 EV_FREQUENT_CHECK; 3251 EV_FREQUENT_CHECK;
2935} 3252}
3076embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3393embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3077{ 3394{
3078 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3395 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3079 3396
3080 { 3397 {
3081 struct ev_loop *loop = w->other; 3398 EV_P = w->other;
3082 3399
3083 while (fdchangecnt) 3400 while (fdchangecnt)
3084 { 3401 {
3085 fd_reify (EV_A); 3402 fd_reify (EV_A);
3086 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3403 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3094 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3411 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3095 3412
3096 ev_embed_stop (EV_A_ w); 3413 ev_embed_stop (EV_A_ w);
3097 3414
3098 { 3415 {
3099 struct ev_loop *loop = w->other; 3416 EV_P = w->other;
3100 3417
3101 ev_loop_fork (EV_A); 3418 ev_loop_fork (EV_A);
3102 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3419 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3103 } 3420 }
3104 3421
3118{ 3435{
3119 if (expect_false (ev_is_active (w))) 3436 if (expect_false (ev_is_active (w)))
3120 return; 3437 return;
3121 3438
3122 { 3439 {
3123 struct ev_loop *loop = w->other; 3440 EV_P = w->other;
3124 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3441 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3125 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3442 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3126 } 3443 }
3127 3444
3128 EV_FREQUENT_CHECK; 3445 EV_FREQUENT_CHECK;
3155 3472
3156 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
3157 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
3158 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
3159 3476
3477 ev_stop (EV_A_ (W)w);
3478
3160 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
3161} 3480}
3162#endif 3481#endif
3163 3482
3164#if EV_FORK_ENABLE 3483#if EV_FORK_ENABLE
3240 3559
3241void 3560void
3242ev_async_send (EV_P_ ev_async *w) 3561ev_async_send (EV_P_ ev_async *w)
3243{ 3562{
3244 w->sent = 1; 3563 w->sent = 1;
3245 evpipe_write (EV_A_ &gotasync); 3564 evpipe_write (EV_A_ &async_pending);
3246} 3565}
3247#endif 3566#endif
3248 3567
3249/*****************************************************************************/ 3568/*****************************************************************************/
3250 3569
3399 if (types & EV_CHECK) 3718 if (types & EV_CHECK)
3400 for (i = checkcnt; i--; ) 3719 for (i = checkcnt; i--; )
3401 cb (EV_A_ EV_CHECK, checks [i]); 3720 cb (EV_A_ EV_CHECK, checks [i]);
3402 3721
3403 if (types & EV_SIGNAL) 3722 if (types & EV_SIGNAL)
3404 for (i = 0; i < signalmax; ++i) 3723 for (i = 0; i < EV_NSIG - 1; ++i)
3405 for (wl = signals [i].head; wl; ) 3724 for (wl = signals [i].head; wl; )
3406 { 3725 {
3407 wn = wl->next; 3726 wn = wl->next;
3408 cb (EV_A_ EV_SIGNAL, wl); 3727 cb (EV_A_ EV_SIGNAL, wl);
3409 wl = wn; 3728 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines