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

Comparing libev/ev.c (file contents):
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines