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.332 by root, Tue Mar 9 08:58:17 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines