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

Comparing libev/ev.c (file contents):
Revision 1.296 by root, Thu Jul 9 09:11:20 2009 UTC vs.
Revision 1.336 by root, Wed Mar 10 08:19:38 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/* but consider reporting it, too! :) */
219# define EV_NSIG 65
220#endif
182 221
183#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL 1
186# else 225# else
263#ifndef EV_USE_EVENTFD 302#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 304# define EV_USE_EVENTFD 1
266# else 305# else
267# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
307# endif
308#endif
309
310#ifndef EV_USE_SIGNALFD
311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
312# define EV_USE_SIGNALFD 1
313# else
314# define EV_USE_SIGNALFD 0
268# endif 315# endif
269#endif 316#endif
270 317
271#if 0 /* debugging */ 318#if 0 /* debugging */
272# define EV_VERIFY 3 319# define EV_VERIFY 3
300# endif 347# endif
301#endif 348#endif
302 349
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 350/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 351
352#ifdef _AIX
353/* AIX has a completely broken poll.h header */
354# undef EV_USE_POLL
355# define EV_USE_POLL 0
356#endif
357
305#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
308#endif 361#endif
309 362
339#endif 392#endif
340 393
341#if EV_USE_EVENTFD 394#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 395/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 396# include <stdint.h>
397# ifndef EFD_NONBLOCK
398# define EFD_NONBLOCK O_NONBLOCK
399# endif
400# ifndef EFD_CLOEXEC
401# ifdef O_CLOEXEC
402# define EFD_CLOEXEC O_CLOEXEC
403# else
404# define EFD_CLOEXEC 02000000
405# endif
406# endif
344# ifdef __cplusplus 407# ifdef __cplusplus
345extern "C" { 408extern "C" {
346# endif 409# endif
347int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 411# ifdef __cplusplus
349} 412}
350# endif 413# endif
351#endif 414#endif
415
416#if EV_USE_SIGNALFD
417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags);
433
434struct signalfd_siginfo
435{
436 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)];
438};
439# ifdef __cplusplus
440}
441# endif
442#endif
443
352 444
353/**/ 445/**/
354 446
355#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 460 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 462
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#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) */ 464#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 465
375#if __GNUC__ >= 4 466#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
378#else 469#else
419 510
420#if EV_USE_MONOTONIC 511#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 513#endif
423 514
515#ifndef EV_FD_TO_WIN32_HANDLE
516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
517#endif
518#ifndef EV_WIN32_HANDLE_TO_FD
519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
520#endif
521#ifndef EV_WIN32_CLOSE_FD
522# define EV_WIN32_CLOSE_FD(fd) close (fd)
523#endif
524
424#ifdef _WIN32 525#ifdef _WIN32
425# include "ev_win32.c" 526# include "ev_win32.c"
426#endif 527#endif
427 528
428/*****************************************************************************/ 529/*****************************************************************************/
530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
429 538
430static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
431 540
432void 541void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
443 552
444 if (syserr_cb) 553 if (syserr_cb)
445 syserr_cb (msg); 554 syserr_cb (msg);
446 else 555 else
447 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
448 perror (msg); 565 perror (msg);
566#endif
449 abort (); 567 abort ();
450 } 568 }
451} 569}
452 570
453static void * 571static void *
454ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
455{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
456 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
457 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
458 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
459 */ 580 */
460 581
461 if (size) 582 if (size)
462 return realloc (ptr, size); 583 return realloc (ptr, size);
463 584
464 free (ptr); 585 free (ptr);
465 return 0; 586 return 0;
587#endif
466} 588}
467 589
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 591
470void 592void
478{ 600{
479 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
480 602
481 if (!ptr && size) 603 if (!ptr && size)
482 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
484 abort (); 610 abort ();
485 } 611 }
486 612
487 return ptr; 613 return ptr;
488} 614}
490#define ev_malloc(size) ev_realloc (0, (size)) 616#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 617#define ev_free(ptr) ev_realloc ((ptr), 0)
492 618
493/*****************************************************************************/ 619/*****************************************************************************/
494 620
621/* set in reify when reification needed */
622#define EV_ANFD_REIFY 1
623
495/* file descriptor info structure */ 624/* file descriptor info structure */
496typedef struct 625typedef struct
497{ 626{
498 WL head; 627 WL head;
499 unsigned char events; /* the events watched for */ 628 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 629 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 */ 630 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 631 unsigned char unused;
503#if EV_USE_EPOLL 632#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 633 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 634#endif
567 696
568 static int ev_default_loop_ptr; 697 static int ev_default_loop_ptr;
569 698
570#endif 699#endif
571 700
701#if EV_MINIMAL < 2
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
703# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else
706# define EV_RELEASE_CB (void)0
707# define EV_ACQUIRE_CB (void)0
708# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
709#endif
710
711#define EVUNLOOP_RECURSE 0x80
712
572/*****************************************************************************/ 713/*****************************************************************************/
573 714
574#ifndef EV_HAVE_EV_TIME 715#ifndef EV_HAVE_EV_TIME
575ev_tstamp 716ev_tstamp
576ev_time (void) 717ev_time (void)
632 773
633 tv.tv_sec = (time_t)delay; 774 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 775 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 776
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 777 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 778 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 779 /* by older ones */
639 select (0, 0, 0, 0, &tv); 780 select (0, 0, 0, 0, &tv);
640#endif 781#endif
641 } 782 }
642} 783}
750} 891}
751 892
752/*****************************************************************************/ 893/*****************************************************************************/
753 894
754inline_speed void 895inline_speed void
755fd_event (EV_P_ int fd, int revents) 896fd_event_nc (EV_P_ int fd, int revents)
756{ 897{
757 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
758 ev_io *w; 899 ev_io *w;
759 900
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
764 if (ev) 905 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 906 ev_feed_event (EV_A_ (W)w, ev);
766 } 907 }
767} 908}
768 909
910/* do not submit kernel events for fds that have reify set */
911/* because that means they changed while we were polling for new events */
912inline_speed void
913fd_event (EV_P_ int fd, int revents)
914{
915 ANFD *anfd = anfds + fd;
916
917 if (expect_true (!anfd->reify))
918 fd_event_nc (EV_A_ fd, revents);
919}
920
769void 921void
770ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 923{
772 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 925 fd_event_nc (EV_A_ fd, revents);
774} 926}
775 927
776/* make sure the external fd watch events are in-sync */ 928/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 929/* with the kernel/libev internal state */
778inline_size void 930inline_size void
793 945
794#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
795 if (events) 947 if (events)
796 { 948 {
797 unsigned long arg; 949 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
804 } 952 }
805#endif 953#endif
806 954
807 { 955 {
845 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
846 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
847 } 995 }
848} 996}
849 997
850/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
851inline_size int 999inline_size int
852fd_valid (int fd) 1000fd_valid (int fd)
853{ 1001{
854#ifdef _WIN32 1002#ifdef _WIN32
855 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
856#else 1004#else
857 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
858#endif 1006#endif
859} 1007}
860 1008
878 1026
879 for (fd = anfdmax; fd--; ) 1027 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 1028 if (anfds [fd].events)
881 { 1029 {
882 fd_kill (EV_A_ fd); 1030 fd_kill (EV_A_ fd);
883 return; 1031 break;
884 } 1032 }
885} 1033}
886 1034
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 1035/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 1036static void noinline
893 for (fd = 0; fd < anfdmax; ++fd) 1041 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1042 if (anfds [fd].events)
895 { 1043 {
896 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
900} 1062}
901 1063
902/*****************************************************************************/ 1064/*****************************************************************************/
903 1065
904/* 1066/*
978 1140
979 for (;;) 1141 for (;;)
980 { 1142 {
981 int c = k << 1; 1143 int c = k << 1;
982 1144
983 if (c > N + HEAP0 - 1) 1145 if (c >= N + HEAP0)
984 break; 1146 break;
985 1147
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1148 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1149 ? 1 : 0;
988 1150
1024 1186
1025/* move an element suitably so it is in a correct place */ 1187/* move an element suitably so it is in a correct place */
1026inline_size void 1188inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1189adjustheap (ANHE *heap, int N, int k)
1028{ 1190{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1191 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1192 upheap (heap, k);
1031 else 1193 else
1032 downheap (heap, N, k); 1194 downheap (heap, N, k);
1033} 1195}
1034 1196
1047/*****************************************************************************/ 1209/*****************************************************************************/
1048 1210
1049/* associate signal watchers to a signal signal */ 1211/* associate signal watchers to a signal signal */
1050typedef struct 1212typedef struct
1051{ 1213{
1214 EV_ATOMIC_T pending;
1215#if EV_MULTIPLICITY
1216 EV_P;
1217#endif
1052 WL head; 1218 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1219} ANSIG;
1055 1220
1056static ANSIG *signals; 1221static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1222
1061/*****************************************************************************/ 1223/*****************************************************************************/
1062 1224
1063/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1064/* this is not fork-safe */
1065inline_speed void
1066fd_intern (int fd)
1067{
1068#ifdef _WIN32
1069 unsigned long arg = 1;
1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1071#else
1072 fcntl (fd, F_SETFD, FD_CLOEXEC);
1073 fcntl (fd, F_SETFL, O_NONBLOCK);
1074#endif
1075}
1076 1226
1077static void noinline 1227static void noinline
1078evpipe_init (EV_P) 1228evpipe_init (EV_P)
1079{ 1229{
1080 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1081 { 1231 {
1082#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1234 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1235 evfd = eventfd (0, 0);
1236
1237 if (evfd >= 0)
1084 { 1238 {
1085 evpipe [0] = -1; 1239 evpipe [0] = -1;
1086 fd_intern (evfd); 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1242 }
1089 else 1243 else
1090#endif 1244# endif
1091 { 1245 {
1092 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1093 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1094 1248
1095 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
1106evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1107{ 1261{
1108 if (!*flag) 1262 if (!*flag)
1109 { 1263 {
1110 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1111 1266
1112 *flag = 1; 1267 *flag = 1;
1113 1268
1114#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1115 if (evfd >= 0) 1270 if (evfd >= 0)
1117 uint64_t counter = 1; 1272 uint64_t counter = 1;
1118 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1119 } 1274 }
1120 else 1275 else
1121#endif 1276#endif
1122 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1123 1278
1124 errno = old_errno; 1279 errno = old_errno;
1125 } 1280 }
1126} 1281}
1127 1282
1128/* called whenever the libev signal pipe */ 1283/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1284/* got some events (signal, async) */
1130static void 1285static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1286pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1287{
1288 int i;
1289
1133#if EV_USE_EVENTFD 1290#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1291 if (evfd >= 0)
1135 { 1292 {
1136 uint64_t counter; 1293 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1294 read (evfd, &counter, sizeof (uint64_t));
1141 { 1298 {
1142 char dummy; 1299 char dummy;
1143 read (evpipe [0], &dummy, 1); 1300 read (evpipe [0], &dummy, 1);
1144 } 1301 }
1145 1302
1146 if (gotsig && ev_is_default_loop (EV_A)) 1303 if (sig_pending)
1147 { 1304 {
1148 int signum; 1305 sig_pending = 0;
1149 gotsig = 0;
1150 1306
1151 for (signum = signalmax; signum--; ) 1307 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1308 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1309 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1310 }
1155 1311
1156#if EV_ASYNC_ENABLE 1312#if EV_ASYNC_ENABLE
1157 if (gotasync) 1313 if (async_pending)
1158 { 1314 {
1159 int i; 1315 async_pending = 0;
1160 gotasync = 0;
1161 1316
1162 for (i = asynccnt; i--; ) 1317 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1318 if (asyncs [i]->sent)
1164 { 1319 {
1165 asyncs [i]->sent = 0; 1320 asyncs [i]->sent = 0;
1173 1328
1174static void 1329static void
1175ev_sighandler (int signum) 1330ev_sighandler (int signum)
1176{ 1331{
1177#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1333 EV_P = signals [signum - 1].loop;
1179#endif 1334#endif
1180 1335
1181#if _WIN32 1336#ifdef _WIN32
1182 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1183#endif 1338#endif
1184 1339
1185 signals [signum - 1].gotsig = 1; 1340 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1341 evpipe_write (EV_A_ &sig_pending);
1187} 1342}
1188 1343
1189void noinline 1344void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1345ev_feed_signal_event (EV_P_ int signum)
1191{ 1346{
1192 WL w; 1347 WL w;
1193 1348
1349 if (expect_false (signum <= 0 || signum > EV_NSIG))
1350 return;
1351
1352 --signum;
1353
1194#if EV_MULTIPLICITY 1354#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1355 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1356 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1357
1198 --signum; 1358 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1359 return;
1360#endif
1202 1361
1203 signals [signum].gotsig = 0; 1362 signals [signum].pending = 0;
1204 1363
1205 for (w = signals [signum].head; w; w = w->next) 1364 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1365 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1366}
1208 1367
1368#if EV_USE_SIGNALFD
1369static void
1370sigfdcb (EV_P_ ev_io *iow, int revents)
1371{
1372 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1373
1374 for (;;)
1375 {
1376 ssize_t res = read (sigfd, si, sizeof (si));
1377
1378 /* not ISO-C, as res might be -1, but works with SuS */
1379 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1380 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1381
1382 if (res < (ssize_t)sizeof (si))
1383 break;
1384 }
1385}
1386#endif
1387
1388#endif
1389
1209/*****************************************************************************/ 1390/*****************************************************************************/
1210 1391
1392#if EV_CHILD_ENABLE
1211static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1212
1213#ifndef _WIN32
1214 1394
1215static ev_signal childev; 1395static ev_signal childev;
1216 1396
1217#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1218# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
1357ev_backend (EV_P) 1537ev_backend (EV_P)
1358{ 1538{
1359 return backend; 1539 return backend;
1360} 1540}
1361 1541
1542#if EV_MINIMAL < 2
1362unsigned int 1543unsigned int
1363ev_loop_count (EV_P) 1544ev_loop_count (EV_P)
1364{ 1545{
1365 return loop_count; 1546 return loop_count;
1366} 1547}
1380void 1561void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1562ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1563{
1383 timeout_blocktime = interval; 1564 timeout_blocktime = interval;
1384} 1565}
1566
1567void
1568ev_set_userdata (EV_P_ void *data)
1569{
1570 userdata = data;
1571}
1572
1573void *
1574ev_userdata (EV_P)
1575{
1576 return userdata;
1577}
1578
1579void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1580{
1581 invoke_cb = invoke_pending_cb;
1582}
1583
1584void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1585{
1586 release_cb = release;
1587 acquire_cb = acquire;
1588}
1589#endif
1385 1590
1386/* initialise a loop structure, must be zero-initialised */ 1591/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1592static void noinline
1388loop_init (EV_P_ unsigned int flags) 1593loop_init (EV_P_ unsigned int flags)
1389{ 1594{
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1612 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1613 have_monotonic = 1;
1409 } 1614 }
1410#endif 1615#endif
1411 1616
1617 /* pid check not overridable via env */
1618#ifndef _WIN32
1619 if (flags & EVFLAG_FORKCHECK)
1620 curpid = getpid ();
1621#endif
1622
1623 if (!(flags & EVFLAG_NOENV)
1624 && !enable_secure ()
1625 && getenv ("LIBEV_FLAGS"))
1626 flags = atoi (getenv ("LIBEV_FLAGS"));
1627
1412 ev_rt_now = ev_time (); 1628 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1629 mn_now = get_clock ();
1414 now_floor = mn_now; 1630 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1631 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2
1416 invoke_cb = ev_invoke_pending; 1633 invoke_cb = ev_invoke_pending;
1634#endif
1417 1635
1418 io_blocktime = 0.; 1636 io_blocktime = 0.;
1419 timeout_blocktime = 0.; 1637 timeout_blocktime = 0.;
1420 backend = 0; 1638 backend = 0;
1421 backend_fd = -1; 1639 backend_fd = -1;
1422 gotasync = 0; 1640 sig_pending = 0;
1641#if EV_ASYNC_ENABLE
1642 async_pending = 0;
1643#endif
1423#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1424 fs_fd = -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1425#endif 1646#endif
1426 1647#if EV_USE_SIGNALFD
1427 /* pid check not overridable via env */ 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1428#ifndef _WIN32
1429 if (flags & EVFLAG_FORKCHECK)
1430 curpid = getpid ();
1431#endif 1649#endif
1432
1433 if (!(flags & EVFLAG_NOENV)
1434 && !enable_secure ()
1435 && getenv ("LIBEV_FLAGS"))
1436 flags = atoi (getenv ("LIBEV_FLAGS"));
1437 1650
1438 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1439 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1440 1653
1441#if EV_USE_PORT 1654#if EV_USE_PORT
1454 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1455#endif 1668#endif
1456 1669
1457 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1458 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1459 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1460 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1461 } 1676 }
1462} 1677}
1463 1678
1464/* free up a loop structure */ 1679/* free up a loop structure */
1465static void noinline 1680static void noinline
1467{ 1682{
1468 int i; 1683 int i;
1469 1684
1470 if (ev_is_active (&pipe_w)) 1685 if (ev_is_active (&pipe_w))
1471 { 1686 {
1472 ev_ref (EV_A); /* signal watcher */ 1687 /*ev_ref (EV_A);*/
1473 ev_io_stop (EV_A_ &pipe_w); 1688 /*ev_io_stop (EV_A_ &pipe_w);*/
1474 1689
1475#if EV_USE_EVENTFD 1690#if EV_USE_EVENTFD
1476 if (evfd >= 0) 1691 if (evfd >= 0)
1477 close (evfd); 1692 close (evfd);
1478#endif 1693#endif
1479 1694
1480 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1481 { 1696 {
1482 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1483 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1484 } 1699 }
1485 } 1700 }
1701
1702#if EV_USE_SIGNALFD
1703 if (ev_is_active (&sigfd_w))
1704 close (sigfd);
1705#endif
1486 1706
1487#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1488 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1489 close (fs_fd); 1709 close (fs_fd);
1490#endif 1710#endif
1514#if EV_IDLE_ENABLE 1734#if EV_IDLE_ENABLE
1515 array_free (idle, [i]); 1735 array_free (idle, [i]);
1516#endif 1736#endif
1517 } 1737 }
1518 1738
1519 ev_free (anfds); anfdmax = 0; 1739 ev_free (anfds); anfds = 0; anfdmax = 0;
1520 1740
1521 /* have to use the microsoft-never-gets-it-right macro */ 1741 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY); 1742 array_free (rfeed, EMPTY);
1523 array_free (fdchange, EMPTY); 1743 array_free (fdchange, EMPTY);
1524 array_free (timer, EMPTY); 1744 array_free (timer, EMPTY);
1559 1779
1560 if (ev_is_active (&pipe_w)) 1780 if (ev_is_active (&pipe_w))
1561 { 1781 {
1562 /* this "locks" the handlers against writing to the pipe */ 1782 /* this "locks" the handlers against writing to the pipe */
1563 /* while we modify the fd vars */ 1783 /* while we modify the fd vars */
1564 gotsig = 1; 1784 sig_pending = 1;
1565#if EV_ASYNC_ENABLE 1785#if EV_ASYNC_ENABLE
1566 gotasync = 1; 1786 async_pending = 1;
1567#endif 1787#endif
1568 1788
1569 ev_ref (EV_A); 1789 ev_ref (EV_A);
1570 ev_io_stop (EV_A_ &pipe_w); 1790 ev_io_stop (EV_A_ &pipe_w);
1571 1791
1574 close (evfd); 1794 close (evfd);
1575#endif 1795#endif
1576 1796
1577 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1578 { 1798 {
1579 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1580 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1581 } 1801 }
1582 1802
1583 evpipe_init (EV_A); 1803 evpipe_init (EV_A);
1584 /* now iterate over everything, in case we missed something */ 1804 /* now iterate over everything, in case we missed something */
1585 pipecb (EV_A_ &pipe_w, EV_READ); 1805 pipecb (EV_A_ &pipe_w, EV_READ);
1591#if EV_MULTIPLICITY 1811#if EV_MULTIPLICITY
1592 1812
1593struct ev_loop * 1813struct ev_loop *
1594ev_loop_new (unsigned int flags) 1814ev_loop_new (unsigned int flags)
1595{ 1815{
1596 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1816 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1597 1817
1598 memset (loop, 0, sizeof (struct ev_loop)); 1818 memset (EV_A, 0, sizeof (struct ev_loop));
1599
1600 loop_init (EV_A_ flags); 1819 loop_init (EV_A_ flags);
1601 1820
1602 if (ev_backend (EV_A)) 1821 if (ev_backend (EV_A))
1603 return loop; 1822 return EV_A;
1604 1823
1605 return 0; 1824 return 0;
1606} 1825}
1607 1826
1608void 1827void
1615void 1834void
1616ev_loop_fork (EV_P) 1835ev_loop_fork (EV_P)
1617{ 1836{
1618 postfork = 1; /* must be in line with ev_default_fork */ 1837 postfork = 1; /* must be in line with ev_default_fork */
1619} 1838}
1839#endif /* multiplicity */
1620 1840
1621#if EV_VERIFY 1841#if EV_VERIFY
1622static void noinline 1842static void noinline
1623verify_watcher (EV_P_ W w) 1843verify_watcher (EV_P_ W w)
1624{ 1844{
1652 verify_watcher (EV_A_ ws [cnt]); 1872 verify_watcher (EV_A_ ws [cnt]);
1653 } 1873 }
1654} 1874}
1655#endif 1875#endif
1656 1876
1877#if EV_MINIMAL < 2
1657void 1878void
1658ev_loop_verify (EV_P) 1879ev_loop_verify (EV_P)
1659{ 1880{
1660#if EV_VERIFY 1881#if EV_VERIFY
1661 int i; 1882 int i;
1709 1930
1710 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1711 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1712 1933
1713# if 0 1934# if 0
1935#if EV_CHILD_ENABLE
1714 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1936 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1715 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1937 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1716# endif 1938#endif
1717#endif 1939# endif
1940#endif
1718} 1941}
1719 1942#endif
1720#endif /* multiplicity */
1721 1943
1722#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1723struct ev_loop * 1945struct ev_loop *
1724ev_default_loop_init (unsigned int flags) 1946ev_default_loop_init (unsigned int flags)
1725#else 1947#else
1728#endif 1950#endif
1729{ 1951{
1730 if (!ev_default_loop_ptr) 1952 if (!ev_default_loop_ptr)
1731 { 1953 {
1732#if EV_MULTIPLICITY 1954#if EV_MULTIPLICITY
1733 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1955 EV_P = ev_default_loop_ptr = &default_loop_struct;
1734#else 1956#else
1735 ev_default_loop_ptr = 1; 1957 ev_default_loop_ptr = 1;
1736#endif 1958#endif
1737 1959
1738 loop_init (EV_A_ flags); 1960 loop_init (EV_A_ flags);
1739 1961
1740 if (ev_backend (EV_A)) 1962 if (ev_backend (EV_A))
1741 { 1963 {
1742#ifndef _WIN32 1964#if EV_CHILD_ENABLE
1743 ev_signal_init (&childev, childcb, SIGCHLD); 1965 ev_signal_init (&childev, childcb, SIGCHLD);
1744 ev_set_priority (&childev, EV_MAXPRI); 1966 ev_set_priority (&childev, EV_MAXPRI);
1745 ev_signal_start (EV_A_ &childev); 1967 ev_signal_start (EV_A_ &childev);
1746 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1968 ev_unref (EV_A); /* child watcher should not keep loop alive */
1747#endif 1969#endif
1755 1977
1756void 1978void
1757ev_default_destroy (void) 1979ev_default_destroy (void)
1758{ 1980{
1759#if EV_MULTIPLICITY 1981#if EV_MULTIPLICITY
1760 struct ev_loop *loop = ev_default_loop_ptr; 1982 EV_P = ev_default_loop_ptr;
1761#endif 1983#endif
1762 1984
1763 ev_default_loop_ptr = 0; 1985 ev_default_loop_ptr = 0;
1764 1986
1765#ifndef _WIN32 1987#if EV_CHILD_ENABLE
1766 ev_ref (EV_A); /* child watcher */ 1988 ev_ref (EV_A); /* child watcher */
1767 ev_signal_stop (EV_A_ &childev); 1989 ev_signal_stop (EV_A_ &childev);
1768#endif 1990#endif
1769 1991
1770 loop_destroy (EV_A); 1992 loop_destroy (EV_A);
1772 1994
1773void 1995void
1774ev_default_fork (void) 1996ev_default_fork (void)
1775{ 1997{
1776#if EV_MULTIPLICITY 1998#if EV_MULTIPLICITY
1777 struct ev_loop *loop = ev_default_loop_ptr; 1999 EV_P = ev_default_loop_ptr;
1778#endif 2000#endif
1779 2001
1780 postfork = 1; /* must be in line with ev_loop_fork */ 2002 postfork = 1; /* must be in line with ev_loop_fork */
1781} 2003}
1782 2004
1786ev_invoke (EV_P_ void *w, int revents) 2008ev_invoke (EV_P_ void *w, int revents)
1787{ 2009{
1788 EV_CB_INVOKE ((W)w, revents); 2010 EV_CB_INVOKE ((W)w, revents);
1789} 2011}
1790 2012
1791void 2013unsigned int
2014ev_pending_count (EV_P)
2015{
2016 int pri;
2017 unsigned int count = 0;
2018
2019 for (pri = NUMPRI; pri--; )
2020 count += pendingcnt [pri];
2021
2022 return count;
2023}
2024
2025void noinline
1792ev_invoke_pending (EV_P) 2026ev_invoke_pending (EV_P)
1793{ 2027{
1794 int pri; 2028 int pri;
1795 2029
1796 for (pri = NUMPRI; pri--; ) 2030 for (pri = NUMPRI; pri--; )
1965 ANHE_at_cache (*he); 2199 ANHE_at_cache (*he);
1966 } 2200 }
1967} 2201}
1968 2202
1969/* fetch new monotonic and realtime times from the kernel */ 2203/* fetch new monotonic and realtime times from the kernel */
1970/* also detetc if there was a timejump, and act accordingly */ 2204/* also detect if there was a timejump, and act accordingly */
1971inline_speed void 2205inline_speed void
1972time_update (EV_P_ ev_tstamp max_block) 2206time_update (EV_P_ ev_tstamp max_block)
1973{ 2207{
1974#if EV_USE_MONOTONIC 2208#if EV_USE_MONOTONIC
1975 if (expect_true (have_monotonic)) 2209 if (expect_true (have_monotonic))
2035} 2269}
2036 2270
2037void 2271void
2038ev_loop (EV_P_ int flags) 2272ev_loop (EV_P_ int flags)
2039{ 2273{
2274#if EV_MINIMAL < 2
2040 ++loop_depth; 2275 ++loop_depth;
2276#endif
2277
2278 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2041 2279
2042 loop_done = EVUNLOOP_CANCEL; 2280 loop_done = EVUNLOOP_CANCEL;
2043 2281
2044 invoke_cb (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2282 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2045 2283
2046 do 2284 do
2047 { 2285 {
2048#if EV_VERIFY >= 2 2286#if EV_VERIFY >= 2
2049 ev_loop_verify (EV_A); 2287 ev_loop_verify (EV_A);
2062 /* we might have forked, so queue fork handlers */ 2300 /* we might have forked, so queue fork handlers */
2063 if (expect_false (postfork)) 2301 if (expect_false (postfork))
2064 if (forkcnt) 2302 if (forkcnt)
2065 { 2303 {
2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2304 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2067 invoke_cb (EV_A); 2305 EV_INVOKE_PENDING;
2068 } 2306 }
2069#endif 2307#endif
2070 2308
2071 /* queue prepare watchers (and execute them) */ 2309 /* queue prepare watchers (and execute them) */
2072 if (expect_false (preparecnt)) 2310 if (expect_false (preparecnt))
2073 { 2311 {
2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2312 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2075 invoke_cb (EV_A); 2313 EV_INVOKE_PENDING;
2076 } 2314 }
2315
2316 if (expect_false (loop_done))
2317 break;
2077 2318
2078 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2079 if (expect_false (postfork)) 2320 if (expect_false (postfork))
2080 loop_fork (EV_A); 2321 loop_fork (EV_A);
2081 2322
2129 waittime -= sleeptime; 2370 waittime -= sleeptime;
2130 } 2371 }
2131 } 2372 }
2132 } 2373 }
2133 2374
2375#if EV_MINIMAL < 2
2134 ++loop_count; 2376 ++loop_count;
2377#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2135 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2136 2381
2137 /* update ev_rt_now, do magic */ 2382 /* update ev_rt_now, do magic */
2138 time_update (EV_A_ waittime + sleeptime); 2383 time_update (EV_A_ waittime + sleeptime);
2139 } 2384 }
2140 2385
2151 2396
2152 /* queue check watchers, to be executed first */ 2397 /* queue check watchers, to be executed first */
2153 if (expect_false (checkcnt)) 2398 if (expect_false (checkcnt))
2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2399 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2155 2400
2156 invoke_cb (EV_A); 2401 EV_INVOKE_PENDING;
2157 } 2402 }
2158 while (expect_true ( 2403 while (expect_true (
2159 activecnt 2404 activecnt
2160 && !loop_done 2405 && !loop_done
2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2406 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2162 )); 2407 ));
2163 2408
2164 if (loop_done == EVUNLOOP_ONE) 2409 if (loop_done == EVUNLOOP_ONE)
2165 loop_done = EVUNLOOP_CANCEL; 2410 loop_done = EVUNLOOP_CANCEL;
2166 2411
2412#if EV_MINIMAL < 2
2167 --loop_depth; 2413 --loop_depth;
2414#endif
2168} 2415}
2169 2416
2170void 2417void
2171ev_unloop (EV_P_ int how) 2418ev_unloop (EV_P_ int how)
2172{ 2419{
2223inline_size void 2470inline_size void
2224wlist_del (WL *head, WL elem) 2471wlist_del (WL *head, WL elem)
2225{ 2472{
2226 while (*head) 2473 while (*head)
2227 { 2474 {
2228 if (*head == elem) 2475 if (expect_true (*head == elem))
2229 { 2476 {
2230 *head = elem->next; 2477 *head = elem->next;
2231 return; 2478 break;
2232 } 2479 }
2233 2480
2234 head = &(*head)->next; 2481 head = &(*head)->next;
2235 } 2482 }
2236} 2483}
2296 2543
2297 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2298 return; 2545 return;
2299 2546
2300 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2547 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2301 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2548 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2302 2549
2303 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2304 2551
2305 ev_start (EV_A_ (W)w, 1); 2552 ev_start (EV_A_ (W)w, 1);
2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2553 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2307 wlist_add (&anfds[fd].head, (WL)w); 2554 wlist_add (&anfds[fd].head, (WL)w);
2308 2555
2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2556 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2310 w->events &= ~EV__IOFDSET; 2557 w->events &= ~EV__IOFDSET;
2311 2558
2312 EV_FREQUENT_CHECK; 2559 EV_FREQUENT_CHECK;
2313} 2560}
2314 2561
2376 timers [active] = timers [timercnt + HEAP0]; 2623 timers [active] = timers [timercnt + HEAP0];
2377 adjustheap (timers, timercnt, active); 2624 adjustheap (timers, timercnt, active);
2378 } 2625 }
2379 } 2626 }
2380 2627
2381 EV_FREQUENT_CHECK;
2382
2383 ev_at (w) -= mn_now; 2628 ev_at (w) -= mn_now;
2384 2629
2385 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2631
2632 EV_FREQUENT_CHECK;
2386} 2633}
2387 2634
2388void noinline 2635void noinline
2389ev_timer_again (EV_P_ ev_timer *w) 2636ev_timer_again (EV_P_ ev_timer *w)
2390{ 2637{
2408 } 2655 }
2409 2656
2410 EV_FREQUENT_CHECK; 2657 EV_FREQUENT_CHECK;
2411} 2658}
2412 2659
2660ev_tstamp
2661ev_timer_remaining (EV_P_ ev_timer *w)
2662{
2663 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2664}
2665
2413#if EV_PERIODIC_ENABLE 2666#if EV_PERIODIC_ENABLE
2414void noinline 2667void noinline
2415ev_periodic_start (EV_P_ ev_periodic *w) 2668ev_periodic_start (EV_P_ ev_periodic *w)
2416{ 2669{
2417 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2463 periodics [active] = periodics [periodiccnt + HEAP0]; 2716 periodics [active] = periodics [periodiccnt + HEAP0];
2464 adjustheap (periodics, periodiccnt, active); 2717 adjustheap (periodics, periodiccnt, active);
2465 } 2718 }
2466 } 2719 }
2467 2720
2468 EV_FREQUENT_CHECK;
2469
2470 ev_stop (EV_A_ (W)w); 2721 ev_stop (EV_A_ (W)w);
2722
2723 EV_FREQUENT_CHECK;
2471} 2724}
2472 2725
2473void noinline 2726void noinline
2474ev_periodic_again (EV_P_ ev_periodic *w) 2727ev_periodic_again (EV_P_ ev_periodic *w)
2475{ 2728{
2481 2734
2482#ifndef SA_RESTART 2735#ifndef SA_RESTART
2483# define SA_RESTART 0 2736# define SA_RESTART 0
2484#endif 2737#endif
2485 2738
2739#if EV_SIGNAL_ENABLE
2740
2486void noinline 2741void noinline
2487ev_signal_start (EV_P_ ev_signal *w) 2742ev_signal_start (EV_P_ ev_signal *w)
2488{ 2743{
2489#if EV_MULTIPLICITY
2490 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2491#endif
2492 if (expect_false (ev_is_active (w))) 2744 if (expect_false (ev_is_active (w)))
2493 return; 2745 return;
2494 2746
2495 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2747 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2496 2748
2497 evpipe_init (EV_A); 2749#if EV_MULTIPLICITY
2750 assert (("libev: a signal must not be attached to two different loops",
2751 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2498 2752
2499 EV_FREQUENT_CHECK; 2753 signals [w->signum - 1].loop = EV_A;
2754#endif
2500 2755
2756 EV_FREQUENT_CHECK;
2757
2758#if EV_USE_SIGNALFD
2759 if (sigfd == -2)
2501 { 2760 {
2502#ifndef _WIN32 2761 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2503 sigset_t full, prev; 2762 if (sigfd < 0 && errno == EINVAL)
2504 sigfillset (&full); 2763 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2505 sigprocmask (SIG_SETMASK, &full, &prev);
2506#endif
2507 2764
2508 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2765 if (sigfd >= 0)
2766 {
2767 fd_intern (sigfd); /* doing it twice will not hurt */
2509 2768
2510#ifndef _WIN32 2769 sigemptyset (&sigfd_set);
2511 sigprocmask (SIG_SETMASK, &prev, 0); 2770
2512#endif 2771 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2772 ev_set_priority (&sigfd_w, EV_MAXPRI);
2773 ev_io_start (EV_A_ &sigfd_w);
2774 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2775 }
2513 } 2776 }
2777
2778 if (sigfd >= 0)
2779 {
2780 /* TODO: check .head */
2781 sigaddset (&sigfd_set, w->signum);
2782 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2783
2784 signalfd (sigfd, &sigfd_set, 0);
2785 }
2786#endif
2514 2787
2515 ev_start (EV_A_ (W)w, 1); 2788 ev_start (EV_A_ (W)w, 1);
2516 wlist_add (&signals [w->signum - 1].head, (WL)w); 2789 wlist_add (&signals [w->signum - 1].head, (WL)w);
2517 2790
2518 if (!((WL)w)->next) 2791 if (!((WL)w)->next)
2792# if EV_USE_SIGNALFD
2793 if (sigfd < 0) /*TODO*/
2794# endif
2519 { 2795 {
2520#if _WIN32 2796# ifdef _WIN32
2797 evpipe_init (EV_A);
2798
2521 signal (w->signum, ev_sighandler); 2799 signal (w->signum, ev_sighandler);
2522#else 2800# else
2523 struct sigaction sa; 2801 struct sigaction sa;
2802
2803 evpipe_init (EV_A);
2804
2524 sa.sa_handler = ev_sighandler; 2805 sa.sa_handler = ev_sighandler;
2525 sigfillset (&sa.sa_mask); 2806 sigfillset (&sa.sa_mask);
2526 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2807 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2527 sigaction (w->signum, &sa, 0); 2808 sigaction (w->signum, &sa, 0);
2809
2810 sigemptyset (&sa.sa_mask);
2811 sigaddset (&sa.sa_mask, w->signum);
2812 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2528#endif 2813#endif
2529 } 2814 }
2530 2815
2531 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2532} 2817}
2533 2818
2534void noinline 2819void noinline
2542 2827
2543 wlist_del (&signals [w->signum - 1].head, (WL)w); 2828 wlist_del (&signals [w->signum - 1].head, (WL)w);
2544 ev_stop (EV_A_ (W)w); 2829 ev_stop (EV_A_ (W)w);
2545 2830
2546 if (!signals [w->signum - 1].head) 2831 if (!signals [w->signum - 1].head)
2832 {
2833#if EV_MULTIPLICITY
2834 signals [w->signum - 1].loop = 0; /* unattach from signal */
2835#endif
2836#if EV_USE_SIGNALFD
2837 if (sigfd >= 0)
2838 {
2839 sigset_t ss;
2840
2841 sigemptyset (&ss);
2842 sigaddset (&ss, w->signum);
2843 sigdelset (&sigfd_set, w->signum);
2844
2845 signalfd (sigfd, &sigfd_set, 0);
2846 sigprocmask (SIG_UNBLOCK, &ss, 0);
2847 }
2848 else
2849#endif
2547 signal (w->signum, SIG_DFL); 2850 signal (w->signum, SIG_DFL);
2851 }
2548 2852
2549 EV_FREQUENT_CHECK; 2853 EV_FREQUENT_CHECK;
2550} 2854}
2855
2856#endif
2857
2858#if EV_CHILD_ENABLE
2551 2859
2552void 2860void
2553ev_child_start (EV_P_ ev_child *w) 2861ev_child_start (EV_P_ ev_child *w)
2554{ 2862{
2555#if EV_MULTIPLICITY 2863#if EV_MULTIPLICITY
2579 ev_stop (EV_A_ (W)w); 2887 ev_stop (EV_A_ (W)w);
2580 2888
2581 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2582} 2890}
2583 2891
2892#endif
2893
2584#if EV_STAT_ENABLE 2894#if EV_STAT_ENABLE
2585 2895
2586# ifdef _WIN32 2896# ifdef _WIN32
2587# undef lstat 2897# undef lstat
2588# define lstat(a,b) _stati64 (a,b) 2898# define lstat(a,b) _stati64 (a,b)
2593#define MIN_STAT_INTERVAL 0.1074891 2903#define MIN_STAT_INTERVAL 0.1074891
2594 2904
2595static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2905static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2596 2906
2597#if EV_USE_INOTIFY 2907#if EV_USE_INOTIFY
2598# define EV_INOTIFY_BUFSIZE 8192 2908
2909/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2910# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2599 2911
2600static void noinline 2912static void noinline
2601infy_add (EV_P_ ev_stat *w) 2913infy_add (EV_P_ ev_stat *w)
2602{ 2914{
2603 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); 2915 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);
2604 2916
2605 if (w->wd < 0) 2917 if (w->wd >= 0)
2918 {
2919 struct statfs sfs;
2920
2921 /* now local changes will be tracked by inotify, but remote changes won't */
2922 /* unless the filesystem is known to be local, we therefore still poll */
2923 /* also do poll on <2.6.25, but with normal frequency */
2924
2925 if (!fs_2625)
2926 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2927 else if (!statfs (w->path, &sfs)
2928 && (sfs.f_type == 0x1373 /* devfs */
2929 || sfs.f_type == 0xEF53 /* ext2/3 */
2930 || sfs.f_type == 0x3153464a /* jfs */
2931 || sfs.f_type == 0x52654973 /* reiser3 */
2932 || sfs.f_type == 0x01021994 /* tempfs */
2933 || sfs.f_type == 0x58465342 /* xfs */))
2934 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2935 else
2936 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2606 { 2937 }
2938 else
2939 {
2940 /* can't use inotify, continue to stat */
2607 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2941 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2608 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2609 2942
2610 /* monitor some parent directory for speedup hints */ 2943 /* if path is not there, monitor some parent directory for speedup hints */
2611 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2944 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2612 /* but an efficiency issue only */ 2945 /* but an efficiency issue only */
2613 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2946 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2614 { 2947 {
2615 char path [4096]; 2948 char path [4096];
2631 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2964 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2632 } 2965 }
2633 } 2966 }
2634 2967
2635 if (w->wd >= 0) 2968 if (w->wd >= 0)
2636 {
2637 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2969 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2638 2970
2639 /* now local changes will be tracked by inotify, but remote changes won't */ 2971 /* now re-arm timer, if required */
2640 /* unless the filesystem it known to be local, we therefore still poll */ 2972 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2641 /* also do poll on <2.6.25, but with normal frequency */
2642 struct statfs sfs;
2643
2644 if (fs_2625 && !statfs (w->path, &sfs))
2645 if (sfs.f_type == 0x1373 /* devfs */
2646 || sfs.f_type == 0xEF53 /* ext2/3 */
2647 || sfs.f_type == 0x3153464a /* jfs */
2648 || sfs.f_type == 0x52654973 /* reiser3 */
2649 || sfs.f_type == 0x01021994 /* tempfs */
2650 || sfs.f_type == 0x58465342 /* xfs */)
2651 return;
2652
2653 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2654 ev_timer_again (EV_A_ &w->timer); 2973 ev_timer_again (EV_A_ &w->timer);
2655 } 2974 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2656} 2975}
2657 2976
2658static void noinline 2977static void noinline
2659infy_del (EV_P_ ev_stat *w) 2978infy_del (EV_P_ ev_stat *w)
2660{ 2979{
2705 3024
2706static void 3025static void
2707infy_cb (EV_P_ ev_io *w, int revents) 3026infy_cb (EV_P_ ev_io *w, int revents)
2708{ 3027{
2709 char buf [EV_INOTIFY_BUFSIZE]; 3028 char buf [EV_INOTIFY_BUFSIZE];
2710 struct inotify_event *ev = (struct inotify_event *)buf;
2711 int ofs; 3029 int ofs;
2712 int len = read (fs_fd, buf, sizeof (buf)); 3030 int len = read (fs_fd, buf, sizeof (buf));
2713 3031
2714 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3032 for (ofs = 0; ofs < len; )
3033 {
3034 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2715 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3035 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3036 ofs += sizeof (struct inotify_event) + ev->len;
3037 }
3038}
3039
3040inline_size unsigned int
3041ev_linux_version (void)
3042{
3043 struct utsname buf;
3044 unsigned int v;
3045 int i;
3046 char *p = buf.release;
3047
3048 if (uname (&buf))
3049 return 0;
3050
3051 for (i = 3+1; --i; )
3052 {
3053 unsigned int c = 0;
3054
3055 for (;;)
3056 {
3057 if (*p >= '0' && *p <= '9')
3058 c = c * 10 + *p++ - '0';
3059 else
3060 {
3061 p += *p == '.';
3062 break;
3063 }
3064 }
3065
3066 v = (v << 8) | c;
3067 }
3068
3069 return v;
2716} 3070}
2717 3071
2718inline_size void 3072inline_size void
2719check_2625 (EV_P) 3073ev_check_2625 (EV_P)
2720{ 3074{
2721 /* kernels < 2.6.25 are borked 3075 /* kernels < 2.6.25 are borked
2722 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3076 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2723 */ 3077 */
2724 struct utsname buf; 3078 if (ev_linux_version () < 0x020619)
2725 int major, minor, micro;
2726
2727 if (uname (&buf))
2728 return; 3079 return;
2729 3080
2730 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2731 return;
2732
2733 if (major < 2
2734 || (major == 2 && minor < 6)
2735 || (major == 2 && minor == 6 && micro < 25))
2736 return;
2737
2738 fs_2625 = 1; 3081 fs_2625 = 1;
3082}
3083
3084inline_size int
3085infy_newfd (void)
3086{
3087#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3088 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3089 if (fd >= 0)
3090 return fd;
3091#endif
3092 return inotify_init ();
2739} 3093}
2740 3094
2741inline_size void 3095inline_size void
2742infy_init (EV_P) 3096infy_init (EV_P)
2743{ 3097{
2744 if (fs_fd != -2) 3098 if (fs_fd != -2)
2745 return; 3099 return;
2746 3100
2747 fs_fd = -1; 3101 fs_fd = -1;
2748 3102
2749 check_2625 (EV_A); 3103 ev_check_2625 (EV_A);
2750 3104
2751 fs_fd = inotify_init (); 3105 fs_fd = infy_newfd ();
2752 3106
2753 if (fs_fd >= 0) 3107 if (fs_fd >= 0)
2754 { 3108 {
3109 fd_intern (fs_fd);
2755 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3110 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2756 ev_set_priority (&fs_w, EV_MAXPRI); 3111 ev_set_priority (&fs_w, EV_MAXPRI);
2757 ev_io_start (EV_A_ &fs_w); 3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
2758 } 3114 }
2759} 3115}
2760 3116
2761inline_size void 3117inline_size void
2762infy_fork (EV_P) 3118infy_fork (EV_P)
2764 int slot; 3120 int slot;
2765 3121
2766 if (fs_fd < 0) 3122 if (fs_fd < 0)
2767 return; 3123 return;
2768 3124
3125 ev_ref (EV_A);
3126 ev_io_stop (EV_A_ &fs_w);
2769 close (fs_fd); 3127 close (fs_fd);
2770 fs_fd = inotify_init (); 3128 fs_fd = infy_newfd ();
3129
3130 if (fs_fd >= 0)
3131 {
3132 fd_intern (fs_fd);
3133 ev_io_set (&fs_w, fs_fd, EV_READ);
3134 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A);
3136 }
2771 3137
2772 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3138 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2773 { 3139 {
2774 WL w_ = fs_hash [slot].head; 3140 WL w_ = fs_hash [slot].head;
2775 fs_hash [slot].head = 0; 3141 fs_hash [slot].head = 0;
2782 w->wd = -1; 3148 w->wd = -1;
2783 3149
2784 if (fs_fd >= 0) 3150 if (fs_fd >= 0)
2785 infy_add (EV_A_ w); /* re-add, no matter what */ 3151 infy_add (EV_A_ w); /* re-add, no matter what */
2786 else 3152 else
3153 {
3154 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3155 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2787 ev_timer_again (EV_A_ &w->timer); 3156 ev_timer_again (EV_A_ &w->timer);
3157 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3158 }
2788 } 3159 }
2789 } 3160 }
2790} 3161}
2791 3162
2792#endif 3163#endif
2809static void noinline 3180static void noinline
2810stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3181stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2811{ 3182{
2812 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3183 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2813 3184
2814 /* we copy this here each the time so that */ 3185 ev_statdata prev = w->attr;
2815 /* prev has the old value when the callback gets invoked */
2816 w->prev = w->attr;
2817 ev_stat_stat (EV_A_ w); 3186 ev_stat_stat (EV_A_ w);
2818 3187
2819 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3188 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2820 if ( 3189 if (
2821 w->prev.st_dev != w->attr.st_dev 3190 prev.st_dev != w->attr.st_dev
2822 || w->prev.st_ino != w->attr.st_ino 3191 || prev.st_ino != w->attr.st_ino
2823 || w->prev.st_mode != w->attr.st_mode 3192 || prev.st_mode != w->attr.st_mode
2824 || w->prev.st_nlink != w->attr.st_nlink 3193 || prev.st_nlink != w->attr.st_nlink
2825 || w->prev.st_uid != w->attr.st_uid 3194 || prev.st_uid != w->attr.st_uid
2826 || w->prev.st_gid != w->attr.st_gid 3195 || prev.st_gid != w->attr.st_gid
2827 || w->prev.st_rdev != w->attr.st_rdev 3196 || prev.st_rdev != w->attr.st_rdev
2828 || w->prev.st_size != w->attr.st_size 3197 || prev.st_size != w->attr.st_size
2829 || w->prev.st_atime != w->attr.st_atime 3198 || prev.st_atime != w->attr.st_atime
2830 || w->prev.st_mtime != w->attr.st_mtime 3199 || prev.st_mtime != w->attr.st_mtime
2831 || w->prev.st_ctime != w->attr.st_ctime 3200 || prev.st_ctime != w->attr.st_ctime
2832 ) { 3201 ) {
3202 /* we only update w->prev on actual differences */
3203 /* in case we test more often than invoke the callback, */
3204 /* to ensure that prev is always different to attr */
3205 w->prev = prev;
3206
2833 #if EV_USE_INOTIFY 3207 #if EV_USE_INOTIFY
2834 if (fs_fd >= 0) 3208 if (fs_fd >= 0)
2835 { 3209 {
2836 infy_del (EV_A_ w); 3210 infy_del (EV_A_ w);
2837 infy_add (EV_A_ w); 3211 infy_add (EV_A_ w);
2862 3236
2863 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
2864 infy_add (EV_A_ w); 3238 infy_add (EV_A_ w);
2865 else 3239 else
2866#endif 3240#endif
3241 {
2867 ev_timer_again (EV_A_ &w->timer); 3242 ev_timer_again (EV_A_ &w->timer);
3243 ev_unref (EV_A);
3244 }
2868 3245
2869 ev_start (EV_A_ (W)w, 1); 3246 ev_start (EV_A_ (W)w, 1);
2870 3247
2871 EV_FREQUENT_CHECK; 3248 EV_FREQUENT_CHECK;
2872} 3249}
2881 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
2882 3259
2883#if EV_USE_INOTIFY 3260#if EV_USE_INOTIFY
2884 infy_del (EV_A_ w); 3261 infy_del (EV_A_ w);
2885#endif 3262#endif
3263
3264 if (ev_is_active (&w->timer))
3265 {
3266 ev_ref (EV_A);
2886 ev_timer_stop (EV_A_ &w->timer); 3267 ev_timer_stop (EV_A_ &w->timer);
3268 }
2887 3269
2888 ev_stop (EV_A_ (W)w); 3270 ev_stop (EV_A_ (W)w);
2889 3271
2890 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
2891} 3273}
3032embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3414embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3033{ 3415{
3034 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3416 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3035 3417
3036 { 3418 {
3037 struct ev_loop *loop = w->other; 3419 EV_P = w->other;
3038 3420
3039 while (fdchangecnt) 3421 while (fdchangecnt)
3040 { 3422 {
3041 fd_reify (EV_A); 3423 fd_reify (EV_A);
3042 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3424 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3050 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3432 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3051 3433
3052 ev_embed_stop (EV_A_ w); 3434 ev_embed_stop (EV_A_ w);
3053 3435
3054 { 3436 {
3055 struct ev_loop *loop = w->other; 3437 EV_P = w->other;
3056 3438
3057 ev_loop_fork (EV_A); 3439 ev_loop_fork (EV_A);
3058 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3440 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3059 } 3441 }
3060 3442
3074{ 3456{
3075 if (expect_false (ev_is_active (w))) 3457 if (expect_false (ev_is_active (w)))
3076 return; 3458 return;
3077 3459
3078 { 3460 {
3079 struct ev_loop *loop = w->other; 3461 EV_P = w->other;
3080 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3462 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3081 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3463 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3082 } 3464 }
3083 3465
3084 EV_FREQUENT_CHECK; 3466 EV_FREQUENT_CHECK;
3111 3493
3112 ev_io_stop (EV_A_ &w->io); 3494 ev_io_stop (EV_A_ &w->io);
3113 ev_prepare_stop (EV_A_ &w->prepare); 3495 ev_prepare_stop (EV_A_ &w->prepare);
3114 ev_fork_stop (EV_A_ &w->fork); 3496 ev_fork_stop (EV_A_ &w->fork);
3115 3497
3498 ev_stop (EV_A_ (W)w);
3499
3116 EV_FREQUENT_CHECK; 3500 EV_FREQUENT_CHECK;
3117} 3501}
3118#endif 3502#endif
3119 3503
3120#if EV_FORK_ENABLE 3504#if EV_FORK_ENABLE
3196 3580
3197void 3581void
3198ev_async_send (EV_P_ ev_async *w) 3582ev_async_send (EV_P_ ev_async *w)
3199{ 3583{
3200 w->sent = 1; 3584 w->sent = 1;
3201 evpipe_write (EV_A_ &gotasync); 3585 evpipe_write (EV_A_ &async_pending);
3202} 3586}
3203#endif 3587#endif
3204 3588
3205/*****************************************************************************/ 3589/*****************************************************************************/
3206 3590
3355 if (types & EV_CHECK) 3739 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; ) 3740 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]); 3741 cb (EV_A_ EV_CHECK, checks [i]);
3358 3742
3359 if (types & EV_SIGNAL) 3743 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i) 3744 for (i = 0; i < EV_NSIG - 1; ++i)
3361 for (wl = signals [i].head; wl; ) 3745 for (wl = signals [i].head; wl; )
3362 { 3746 {
3363 wn = wl->next; 3747 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl); 3748 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn; 3749 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines