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

Comparing libev/ev.c (file contents):
Revision 1.291 by root, Mon Jun 29 04:44:18 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
701#ifndef EV_HAVE_EV_TIME
569ev_tstamp 702ev_tstamp
570ev_time (void) 703ev_time (void)
571{ 704{
572#if EV_USE_REALTIME 705#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 706 if (expect_true (have_realtime))
580 713
581 struct timeval tv; 714 struct timeval tv;
582 gettimeofday (&tv, 0); 715 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 716 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 717}
718#endif
585 719
586inline_size ev_tstamp 720inline_size ev_tstamp
587get_clock (void) 721get_clock (void)
588{ 722{
589#if EV_USE_MONOTONIC 723#if EV_USE_MONOTONIC
625 759
626 tv.tv_sec = (time_t)delay; 760 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 762
629 /* 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 */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 764 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 765 /* by older ones */
632 select (0, 0, 0, 0, &tv); 766 select (0, 0, 0, 0, &tv);
633#endif 767#endif
634 } 768 }
635} 769}
743} 877}
744 878
745/*****************************************************************************/ 879/*****************************************************************************/
746 880
747inline_speed void 881inline_speed void
748fd_event (EV_P_ int fd, int revents) 882fd_event_nc (EV_P_ int fd, int revents)
749{ 883{
750 ANFD *anfd = anfds + fd; 884 ANFD *anfd = anfds + fd;
751 ev_io *w; 885 ev_io *w;
752 886
753 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)
757 if (ev) 891 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 892 ev_feed_event (EV_A_ (W)w, ev);
759 } 893 }
760} 894}
761 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
762void 907void
763ev_feed_fd_event (EV_P_ int fd, int revents) 908ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 909{
765 if (fd >= 0 && fd < anfdmax) 910 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 911 fd_event_nc (EV_A_ fd, revents);
767} 912}
768 913
769/* make sure the external fd watch events are in-sync */ 914/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 915/* with the kernel/libev internal state */
771inline_size void 916inline_size void
786 931
787#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
788 if (events) 933 if (events)
789 { 934 {
790 unsigned long arg; 935 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
793 #else
794 anfd->handle = _get_osfhandle (fd);
795 #endif
796 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));
797 } 938 }
798#endif 939#endif
799 940
800 { 941 {
843/* check whether the given fd is atcually valid, for error recovery */ 984/* check whether the given fd is atcually valid, for error recovery */
844inline_size int 985inline_size int
845fd_valid (int fd) 986fd_valid (int fd)
846{ 987{
847#ifdef _WIN32 988#ifdef _WIN32
848 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
849#else 990#else
850 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
851#endif 992#endif
852} 993}
853 994
871 1012
872 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 1014 if (anfds [fd].events)
874 { 1015 {
875 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
876 return; 1017 break;
877 } 1018 }
878} 1019}
879 1020
880/* 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 */
881static void noinline 1022static void noinline
886 for (fd = 0; fd < anfdmax; ++fd) 1027 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1028 if (anfds [fd].events)
888 { 1029 {
889 anfds [fd].events = 0; 1030 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1031 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1033 }
893} 1034}
894 1035
895/*****************************************************************************/ 1036/*****************************************************************************/
896 1037
971 1112
972 for (;;) 1113 for (;;)
973 { 1114 {
974 int c = k << 1; 1115 int c = k << 1;
975 1116
976 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
977 break; 1118 break;
978 1119
979 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])
980 ? 1 : 0; 1121 ? 1 : 0;
981 1122
1017 1158
1018/* move an element suitably so it is in a correct place */ 1159/* move an element suitably so it is in a correct place */
1019inline_size void 1160inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
1021{ 1162{
1022 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)]))
1023 upheap (heap, k); 1164 upheap (heap, k);
1024 else 1165 else
1025 downheap (heap, N, k); 1166 downheap (heap, N, k);
1026} 1167}
1027 1168
1040/*****************************************************************************/ 1181/*****************************************************************************/
1041 1182
1042/* associate signal watchers to a signal signal */ 1183/* associate signal watchers to a signal signal */
1043typedef struct 1184typedef struct
1044{ 1185{
1186 EV_ATOMIC_T pending;
1187#if EV_MULTIPLICITY
1188 EV_P;
1189#endif
1045 WL head; 1190 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1191} ANSIG;
1048 1192
1049static ANSIG *signals; 1193static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1194
1054/*****************************************************************************/ 1195/*****************************************************************************/
1055 1196
1056/* used to prepare libev internal fd's */ 1197/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1198/* this is not fork-safe */
1058inline_speed void 1199inline_speed void
1059fd_intern (int fd) 1200fd_intern (int fd)
1060{ 1201{
1061#ifdef _WIN32 1202#ifdef _WIN32
1062 unsigned long arg = 1; 1203 unsigned long arg = 1;
1063 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1064#else 1205#else
1065 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1066 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1067#endif 1208#endif
1068} 1209}
1071evpipe_init (EV_P) 1212evpipe_init (EV_P)
1072{ 1213{
1073 if (!ev_is_active (&pipe_w)) 1214 if (!ev_is_active (&pipe_w))
1074 { 1215 {
1075#if EV_USE_EVENTFD 1216#if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1219 evfd = eventfd (0, 0);
1220
1221 if (evfd >= 0)
1077 { 1222 {
1078 evpipe [0] = -1; 1223 evpipe [0] = -1;
1079 fd_intern (evfd); 1224 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1225 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1226 }
1082 else 1227 else
1083#endif 1228#endif
1084 { 1229 {
1121/* called whenever the libev signal pipe */ 1266/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1267/* got some events (signal, async) */
1123static void 1268static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1270{
1271 int i;
1272
1126#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1274 if (evfd >= 0)
1128 { 1275 {
1129 uint64_t counter; 1276 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
1134 { 1281 {
1135 char dummy; 1282 char dummy;
1136 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1137 } 1284 }
1138 1285
1139 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1140 { 1287 {
1141 int signum; 1288 sig_pending = 0;
1142 gotsig = 0;
1143 1289
1144 for (signum = signalmax; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1293 }
1148 1294
1149#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1150 if (gotasync) 1296 if (async_pending)
1151 { 1297 {
1152 int i; 1298 async_pending = 0;
1153 gotasync = 0;
1154 1299
1155 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1157 { 1302 {
1158 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
1166 1311
1167static void 1312static void
1168ev_sighandler (int signum) 1313ev_sighandler (int signum)
1169{ 1314{
1170#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1316 EV_P = signals [signum - 1].loop;
1172#endif 1317#endif
1173 1318
1174#if _WIN32 1319#ifdef _WIN32
1175 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1176#endif 1321#endif
1177 1322
1178 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1180} 1325}
1181 1326
1182void noinline 1327void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1184{ 1329{
1185 WL w; 1330 WL w;
1186 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1187#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1188 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 */
1189#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1340
1191 --signum; 1341 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1342 return;
1343#endif
1195 1344
1196 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1197 1346
1198 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 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
1201 1370
1202/*****************************************************************************/ 1371/*****************************************************************************/
1203 1372
1204static WL childs [EV_PID_HASHSIZE]; 1373static WL childs [EV_PID_HASHSIZE];
1205 1374
1350ev_backend (EV_P) 1519ev_backend (EV_P)
1351{ 1520{
1352 return backend; 1521 return backend;
1353} 1522}
1354 1523
1524#if EV_MINIMAL < 2
1355unsigned int 1525unsigned int
1356ev_loop_count (EV_P) 1526ev_loop_count (EV_P)
1357{ 1527{
1358 return loop_count; 1528 return loop_count;
1359} 1529}
1360 1530
1531unsigned int
1532ev_loop_depth (EV_P)
1533{
1534 return loop_depth;
1535}
1536
1361void 1537void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1538ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1539{
1364 io_blocktime = interval; 1540 io_blocktime = interval;
1365} 1541}
1367void 1543void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1544ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1545{
1370 timeout_blocktime = interval; 1546 timeout_blocktime = interval;
1371} 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
1372 1572
1373/* initialise a loop structure, must be zero-initialised */ 1573/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1574static void noinline
1375loop_init (EV_P_ unsigned int flags) 1575loop_init (EV_P_ unsigned int flags)
1376{ 1576{
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1594 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1595 have_monotonic = 1;
1396 } 1596 }
1397#endif 1597#endif
1398 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
1399 ev_rt_now = ev_time (); 1610 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1611 mn_now = get_clock ();
1401 now_floor = mn_now; 1612 now_floor = mn_now;
1402 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
1403 1617
1404 io_blocktime = 0.; 1618 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1406 backend = 0; 1620 backend = 0;
1407 backend_fd = -1; 1621 backend_fd = -1;
1408 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1409#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1410 fs_fd = -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1628#endif
1412 1629#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1631#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1632
1424 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1426 1635
1427#if EV_USE_PORT 1636#if EV_USE_PORT
1453{ 1662{
1454 int i; 1663 int i;
1455 1664
1456 if (ev_is_active (&pipe_w)) 1665 if (ev_is_active (&pipe_w))
1457 { 1666 {
1458 ev_ref (EV_A); /* signal watcher */ 1667 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1668 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1669
1461#if EV_USE_EVENTFD 1670#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1671 if (evfd >= 0)
1463 close (evfd); 1672 close (evfd);
1464#endif 1673#endif
1465 1674
1466 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1467 { 1676 {
1468 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1679 }
1471 } 1680 }
1681
1682#if EV_USE_SIGNALFD
1683 if (ev_is_active (&sigfd_w))
1684 close (sigfd);
1685#endif
1472 1686
1473#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1475 close (fs_fd); 1689 close (fs_fd);
1476#endif 1690#endif
1500#if EV_IDLE_ENABLE 1714#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1715 array_free (idle, [i]);
1502#endif 1716#endif
1503 } 1717 }
1504 1718
1505 ev_free (anfds); anfdmax = 0; 1719 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1720
1507 /* have to use the microsoft-never-gets-it-right macro */ 1721 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1722 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1723 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1724 array_free (timer, EMPTY);
1545 1759
1546 if (ev_is_active (&pipe_w)) 1760 if (ev_is_active (&pipe_w))
1547 { 1761 {
1548 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1550 gotsig = 1; 1764 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1766 async_pending = 1;
1553#endif 1767#endif
1554 1768
1555 ev_ref (EV_A); 1769 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1770 ev_io_stop (EV_A_ &pipe_w);
1557 1771
1560 close (evfd); 1774 close (evfd);
1561#endif 1775#endif
1562 1776
1563 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1564 { 1778 {
1565 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1781 }
1568 1782
1569 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
1577#if EV_MULTIPLICITY 1791#if EV_MULTIPLICITY
1578 1792
1579struct ev_loop * 1793struct ev_loop *
1580ev_loop_new (unsigned int flags) 1794ev_loop_new (unsigned int flags)
1581{ 1795{
1582 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));
1583 1797
1584 memset (loop, 0, sizeof (struct ev_loop)); 1798 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1799 loop_init (EV_A_ flags);
1587 1800
1588 if (ev_backend (EV_A)) 1801 if (ev_backend (EV_A))
1589 return loop; 1802 return EV_A;
1590 1803
1591 return 0; 1804 return 0;
1592} 1805}
1593 1806
1594void 1807void
1601void 1814void
1602ev_loop_fork (EV_P) 1815ev_loop_fork (EV_P)
1603{ 1816{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1817 postfork = 1; /* must be in line with ev_default_fork */
1605} 1818}
1819#endif /* multiplicity */
1606 1820
1607#if EV_VERIFY 1821#if EV_VERIFY
1608static void noinline 1822static void noinline
1609verify_watcher (EV_P_ W w) 1823verify_watcher (EV_P_ W w)
1610{ 1824{
1638 verify_watcher (EV_A_ ws [cnt]); 1852 verify_watcher (EV_A_ ws [cnt]);
1639 } 1853 }
1640} 1854}
1641#endif 1855#endif
1642 1856
1857#if EV_MINIMAL < 2
1643void 1858void
1644ev_loop_verify (EV_P) 1859ev_loop_verify (EV_P)
1645{ 1860{
1646#if EV_VERIFY 1861#if EV_VERIFY
1647 int i; 1862 int i;
1696 assert (checkmax >= checkcnt); 1911 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1912 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1913
1699# if 0 1914# if 0
1700 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)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif
1703#endif 1917# endif
1918#endif
1704} 1919}
1705 1920#endif
1706#endif /* multiplicity */
1707 1921
1708#if EV_MULTIPLICITY 1922#if EV_MULTIPLICITY
1709struct ev_loop * 1923struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1924ev_default_loop_init (unsigned int flags)
1711#else 1925#else
1714#endif 1928#endif
1715{ 1929{
1716 if (!ev_default_loop_ptr) 1930 if (!ev_default_loop_ptr)
1717 { 1931 {
1718#if EV_MULTIPLICITY 1932#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1933 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1934#else
1721 ev_default_loop_ptr = 1; 1935 ev_default_loop_ptr = 1;
1722#endif 1936#endif
1723 1937
1724 loop_init (EV_A_ flags); 1938 loop_init (EV_A_ flags);
1741 1955
1742void 1956void
1743ev_default_destroy (void) 1957ev_default_destroy (void)
1744{ 1958{
1745#if EV_MULTIPLICITY 1959#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1960 EV_P = ev_default_loop_ptr;
1747#endif 1961#endif
1748 1962
1749 ev_default_loop_ptr = 0; 1963 ev_default_loop_ptr = 0;
1750 1964
1751#ifndef _WIN32 1965#ifndef _WIN32
1758 1972
1759void 1973void
1760ev_default_fork (void) 1974ev_default_fork (void)
1761{ 1975{
1762#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1977 EV_P = ev_default_loop_ptr;
1764#endif 1978#endif
1765 1979
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1980 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1981}
1768 1982
1772ev_invoke (EV_P_ void *w, int revents) 1986ev_invoke (EV_P_ void *w, int revents)
1773{ 1987{
1774 EV_CB_INVOKE ((W)w, revents); 1988 EV_CB_INVOKE ((W)w, revents);
1775} 1989}
1776 1990
1777inline_speed void 1991unsigned int
1778call_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)
1779{ 2005{
1780 int pri; 2006 int pri;
1781 2007
1782 for (pri = NUMPRI; pri--; ) 2008 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 2009 while (pendingcnt [pri])
1951 ANHE_at_cache (*he); 2177 ANHE_at_cache (*he);
1952 } 2178 }
1953} 2179}
1954 2180
1955/* fetch new monotonic and realtime times from the kernel */ 2181/* fetch new monotonic and realtime times from the kernel */
1956/* also detetc if there was a timejump, and act accordingly */ 2182/* also detect if there was a timejump, and act accordingly */
1957inline_speed void 2183inline_speed void
1958time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
1959{ 2185{
1960#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
1961 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
2018 2244
2019 mn_now = ev_rt_now; 2245 mn_now = ev_rt_now;
2020 } 2246 }
2021} 2247}
2022 2248
2023static int loop_done;
2024
2025void 2249void
2026ev_loop (EV_P_ int flags) 2250ev_loop (EV_P_ int flags)
2027{ 2251{
2252#if EV_MINIMAL < 2
2253 ++loop_depth;
2254#endif
2255
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2257
2028 loop_done = EVUNLOOP_CANCEL; 2258 loop_done = EVUNLOOP_CANCEL;
2029 2259
2030 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 */
2031 2261
2032 do 2262 do
2033 { 2263 {
2034#if EV_VERIFY >= 2 2264#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2265 ev_loop_verify (EV_A);
2048 /* we might have forked, so queue fork handlers */ 2278 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2279 if (expect_false (postfork))
2050 if (forkcnt) 2280 if (forkcnt)
2051 { 2281 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2283 EV_INVOKE_PENDING;
2054 } 2284 }
2055#endif 2285#endif
2056 2286
2057 /* queue prepare watchers (and execute them) */ 2287 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2288 if (expect_false (preparecnt))
2059 { 2289 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
2062 } 2292 }
2293
2294 if (expect_false (loop_done))
2295 break;
2063 2296
2064 /* we might have forked, so reify kernel state if necessary */ 2297 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2298 if (expect_false (postfork))
2066 loop_fork (EV_A); 2299 loop_fork (EV_A);
2067 2300
2073 ev_tstamp waittime = 0.; 2306 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2307 ev_tstamp sleeptime = 0.;
2075 2308
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2310 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
2078 /* update time to cancel out callback processing overhead */ 2314 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2315 time_update (EV_A_ 1e100);
2080 2316
2081 waittime = MAX_BLOCKTIME; 2317 waittime = MAX_BLOCKTIME;
2082 2318
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2328 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2329 if (waittime > to) waittime = to;
2094 } 2330 }
2095#endif 2331#endif
2096 2332
2333 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2334 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2335 waittime = timeout_blocktime;
2099 2336
2100 sleeptime = waittime - backend_fudge; 2337 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2338 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2339 {
2340 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2341
2342 if (sleeptime > waittime - backend_fudge)
2343 sleeptime = waittime - backend_fudge;
2344
2345 if (expect_true (sleeptime > 0.))
2346 {
2107 ev_sleep (sleeptime); 2347 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2348 waittime -= sleeptime;
2349 }
2109 } 2350 }
2110 } 2351 }
2111 2352
2353#if EV_MINIMAL < 2
2112 ++loop_count; 2354 ++loop_count;
2355#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2357 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2359
2115 /* update ev_rt_now, do magic */ 2360 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2361 time_update (EV_A_ waittime + sleeptime);
2117 } 2362 }
2118 2363
2129 2374
2130 /* queue check watchers, to be executed first */ 2375 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2376 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2378
2134 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
2135 } 2380 }
2136 while (expect_true ( 2381 while (expect_true (
2137 activecnt 2382 activecnt
2138 && !loop_done 2383 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2385 ));
2141 2386
2142 if (loop_done == EVUNLOOP_ONE) 2387 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2388 loop_done = EVUNLOOP_CANCEL;
2389
2390#if EV_MINIMAL < 2
2391 --loop_depth;
2392#endif
2144} 2393}
2145 2394
2146void 2395void
2147ev_unloop (EV_P_ int how) 2396ev_unloop (EV_P_ int how)
2148{ 2397{
2199inline_size void 2448inline_size void
2200wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
2201{ 2450{
2202 while (*head) 2451 while (*head)
2203 { 2452 {
2204 if (*head == elem) 2453 if (expect_true (*head == elem))
2205 { 2454 {
2206 *head = elem->next; 2455 *head = elem->next;
2207 return; 2456 break;
2208 } 2457 }
2209 2458
2210 head = &(*head)->next; 2459 head = &(*head)->next;
2211 } 2460 }
2212} 2461}
2240} 2489}
2241 2490
2242inline_size void 2491inline_size void
2243pri_adjust (EV_P_ W w) 2492pri_adjust (EV_P_ W w)
2244{ 2493{
2245 int pri = w->priority; 2494 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2495 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2496 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2497 ev_set_priority (w, pri);
2249} 2498}
2250 2499
2251inline_speed void 2500inline_speed void
2252ev_start (EV_P_ W w, int active) 2501ev_start (EV_P_ W w, int active)
2253{ 2502{
2272 2521
2273 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2274 return; 2523 return;
2275 2524
2276 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2277 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))));
2278 2527
2279 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2280 2529
2281 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2532 wlist_add (&anfds[fd].head, (WL)w);
2284 2533
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2534 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2535 w->events &= ~EV__IOFDSET;
2287 2536
2288 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2289} 2538}
2290 2539
2352 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2353 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2354 } 2603 }
2355 } 2604 }
2356 2605
2357 EV_FREQUENT_CHECK;
2358
2359 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2360 2607
2361 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2362} 2611}
2363 2612
2364void noinline 2613void noinline
2365ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2366{ 2615{
2384 } 2633 }
2385 2634
2386 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
2387} 2636}
2388 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
2389#if EV_PERIODIC_ENABLE 2644#if EV_PERIODIC_ENABLE
2390void noinline 2645void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2646ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2647{
2393 if (expect_false (ev_is_active (w))) 2648 if (expect_false (ev_is_active (w)))
2439 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2440 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2441 } 2696 }
2442 } 2697 }
2443 2698
2444 EV_FREQUENT_CHECK;
2445
2446 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2447} 2702}
2448 2703
2449void noinline 2704void noinline
2450ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2451{ 2706{
2460#endif 2715#endif
2461 2716
2462void noinline 2717void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2718ev_signal_start (EV_P_ ev_signal *w)
2464{ 2719{
2465#if EV_MULTIPLICITY
2466 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2467#endif
2468 if (expect_false (ev_is_active (w))) 2720 if (expect_false (ev_is_active (w)))
2469 return; 2721 return;
2470 2722
2471 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));
2472 2724
2473 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));
2474 2728
2475 EV_FREQUENT_CHECK; 2729 signals [w->signum - 1].loop = EV_A;
2730#endif
2476 2731
2732 EV_FREQUENT_CHECK;
2733
2734#if EV_USE_SIGNALFD
2735 if (sigfd == -2)
2477 { 2736 {
2478#ifndef _WIN32 2737 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2738 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2739 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2740
2484 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 */
2485 2744
2486#ifndef _WIN32 2745 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2746
2488#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 }
2489 } 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
2490 2763
2491 ev_start (EV_A_ (W)w, 1); 2764 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2765 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2766
2494 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2768# if EV_USE_SIGNALFD
2769 if (sigfd < 0) /*TODO*/
2770# endif
2495 { 2771 {
2496#if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2497 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2498#else 2776# else
2499 struct sigaction sa; 2777 struct sigaction sa;
2778
2779 evpipe_init (EV_A);
2780
2500 sa.sa_handler = ev_sighandler; 2781 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2782 sigfillset (&sa.sa_mask);
2502 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 */
2503 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);
2504#endif 2789#endif
2505 } 2790 }
2506 2791
2507 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
2508} 2793}
2509 2794
2510void noinline 2795void noinline
2518 2803
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2521 2806
2522 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
2523 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2827 }
2524 2828
2525 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2526} 2830}
2527 2831
2528void 2832void
2569#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2570 2874
2571static 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);
2572 2876
2573#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2574# 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)
2575 2881
2576static void noinline 2882static void noinline
2577infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2578{ 2884{
2579 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);
2580 2886
2581 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 */
2582 { 2907 }
2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2583 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2911 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2584 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2585 2912
2586 /* monitor some parent directory for speedup hints */ 2913 /* if path is not there, monitor some parent directory for speedup hints */
2587 /* 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, */
2588 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2589 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2590 { 2917 {
2591 char path [4096]; 2918 char path [4096];
2607 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2608 } 2935 }
2609 } 2936 }
2610 2937
2611 if (w->wd >= 0) 2938 if (w->wd >= 0)
2612 {
2613 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);
2614 2940
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 2941 /* now re-arm timer, if required */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 2942 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2617 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619
2620 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */
2624 || sfs.f_type == 0x52654973 /* reiser3 */
2625 || sfs.f_type == 0x01021994 /* tempfs */
2626 || sfs.f_type == 0x58465342 /* xfs */)
2627 return;
2628
2629 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2630 ev_timer_again (EV_A_ &w->timer); 2943 ev_timer_again (EV_A_ &w->timer);
2631 } 2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2632} 2945}
2633 2946
2634static void noinline 2947static void noinline
2635infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2636{ 2949{
2681 2994
2682static void 2995static void
2683infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2684{ 2997{
2685 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2686 struct inotify_event *ev = (struct inotify_event *)buf;
2687 int ofs; 2999 int ofs;
2688 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2689 3001
2690 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);
2691 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;
2692} 3040}
2693 3041
2694inline_size void 3042inline_size void
2695check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2696{ 3044{
2697 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2698 * 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
2699 */ 3047 */
2700 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2701 int major, minor, micro;
2702
2703 if (uname (&buf))
2704 return; 3049 return;
2705 3050
2706 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2707 return;
2708
2709 if (major < 2
2710 || (major == 2 && minor < 6)
2711 || (major == 2 && minor == 6 && micro < 25))
2712 return;
2713
2714 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 ();
2715} 3063}
2716 3064
2717inline_size void 3065inline_size void
2718infy_init (EV_P) 3066infy_init (EV_P)
2719{ 3067{
2720 if (fs_fd != -2) 3068 if (fs_fd != -2)
2721 return; 3069 return;
2722 3070
2723 fs_fd = -1; 3071 fs_fd = -1;
2724 3072
2725 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
2726 3074
2727 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2728 3076
2729 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2730 { 3078 {
3079 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2734 } 3084 }
2735} 3085}
2736 3086
2737inline_size void 3087inline_size void
2738infy_fork (EV_P) 3088infy_fork (EV_P)
2740 int slot; 3090 int slot;
2741 3091
2742 if (fs_fd < 0) 3092 if (fs_fd < 0)
2743 return; 3093 return;
2744 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3097 close (fs_fd);
2746 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 }
2747 3107
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2749 { 3109 {
2750 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
2758 w->wd = -1; 3118 w->wd = -1;
2759 3119
2760 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
2761 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2762 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);
2763 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 }
2764 } 3129 }
2765 } 3130 }
2766} 3131}
2767 3132
2768#endif 3133#endif
2785static void noinline 3150static void noinline
2786stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2787{ 3152{
2788 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2789 3154
2790 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
2791 /* prev has the old value when the callback gets invoked */
2792 w->prev = w->attr;
2793 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2794 3157
2795 /* 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 */
2796 if ( 3159 if (
2797 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
2798 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
2799 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
2800 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
2801 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
2802 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
2803 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
2804 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
2805 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
2806 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
2807 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
2808 ) { 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
2809 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
2810 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2811 { 3179 {
2812 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
2813 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
2838 3206
2839 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
2840 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
2841 else 3209 else
2842#endif 3210#endif
3211 {
2843 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
2844 3215
2845 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
2846 3217
2847 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
2848} 3219}
2857 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
2858 3229
2859#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
2860 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2861#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
2862 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
2863 3239
2864 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
2865 3241
2866 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
2867} 3243}
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3385{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3386 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3387
3012 { 3388 {
3013 struct ev_loop *loop = w->other; 3389 EV_P = w->other;
3014 3390
3015 while (fdchangecnt) 3391 while (fdchangecnt)
3016 { 3392 {
3017 fd_reify (EV_A); 3393 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3394 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3026 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));
3027 3403
3028 ev_embed_stop (EV_A_ w); 3404 ev_embed_stop (EV_A_ w);
3029 3405
3030 { 3406 {
3031 struct ev_loop *loop = w->other; 3407 EV_P = w->other;
3032 3408
3033 ev_loop_fork (EV_A); 3409 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3410 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3411 }
3036 3412
3050{ 3426{
3051 if (expect_false (ev_is_active (w))) 3427 if (expect_false (ev_is_active (w)))
3052 return; 3428 return;
3053 3429
3054 { 3430 {
3055 struct ev_loop *loop = w->other; 3431 EV_P = w->other;
3056 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 ()));
3057 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);
3058 } 3434 }
3059 3435
3060 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3087 3463
3088 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3089 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3090 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3091 3467
3468 ev_stop (EV_A_ (W)w);
3469
3092 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3093} 3471}
3094#endif 3472#endif
3095 3473
3096#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE
3172 3550
3173void 3551void
3174ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
3175{ 3553{
3176 w->sent = 1; 3554 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
3178} 3556}
3179#endif 3557#endif
3180 3558
3181/*****************************************************************************/ 3559/*****************************************************************************/
3182 3560
3331 if (types & EV_CHECK) 3709 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3710 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3711 cb (EV_A_ EV_CHECK, checks [i]);
3334 3712
3335 if (types & EV_SIGNAL) 3713 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3714 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3715 for (wl = signals [i].head; wl; )
3338 { 3716 {
3339 wn = wl->next; 3717 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3718 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3719 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines