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

Comparing libev/ev.c (file contents):
Revision 1.289 by root, Sat Jun 6 11:13:16 2009 UTC vs.
Revision 1.327 by root, Sun Feb 14 19:09:04 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 *
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 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
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
153#include <assert.h> 164#include <assert.h>
154#include <errno.h> 165#include <errno.h>
155#include <sys/types.h> 166#include <sys/types.h>
156#include <time.h> 167#include <time.h>
168#include <limits.h>
157 169
158#include <signal.h> 170#include <signal.h>
159 171
160#ifdef EV_H 172#ifdef EV_H
161# include EV_H 173# include EV_H
176# endif 188# endif
177#endif 189#endif
178 190
179/* 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 */
180 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
181#ifndef EV_USE_CLOCK_SYSCALL 220#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 221# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 222# define EV_USE_CLOCK_SYSCALL 1
184# else 223# else
185# define EV_USE_CLOCK_SYSCALL 0 224# define EV_USE_CLOCK_SYSCALL 0
264# else 303# else
265# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
266# endif 305# endif
267#endif 306#endif
268 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
313# endif
314#endif
315
269#if 0 /* debugging */ 316#if 0 /* debugging */
270# define EV_VERIFY 3 317# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 318# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 319# define EV_HEAP_CACHE_AT 1
273#endif 320#endif
282 329
283#ifndef EV_HEAP_CACHE_AT 330#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 331# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 332#endif
286 333
334/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
335/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL
337# include <syscall.h>
338# ifdef SYS_clock_gettime
339# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
340# undef EV_USE_MONOTONIC
341# define EV_USE_MONOTONIC 1
342# else
343# undef EV_USE_CLOCK_SYSCALL
344# define EV_USE_CLOCK_SYSCALL 0
345# endif
346#endif
347
287/* 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 */
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
288 355
289#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
292#endif 359#endif
320 387
321#if EV_SELECT_IS_WINSOCKET 388#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 389# include <winsock.h>
323#endif 390#endif
324 391
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
335/* 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 */
336# 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
337# ifdef __cplusplus 405# ifdef __cplusplus
338extern "C" { 406extern "C" {
339# endif 407# endif
340int eventfd (unsigned int initval, int flags); 408int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 409# ifdef __cplusplus
342} 410}
343# endif 411# endif
344#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
345 442
346/**/ 443/**/
347 444
348#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 458 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 460
364#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) */
365#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) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 463
368#if __GNUC__ >= 4 464#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
371#else 467#else
384# define inline_speed static noinline 480# define inline_speed static noinline
385#else 481#else
386# define inline_speed static inline 482# define inline_speed static inline
387#endif 483#endif
388 484
389#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
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 490# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
491#endif
391 492
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 493#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 494#define EMPTY2(a,b) /* used to suppress some warnings */
394 495
395typedef ev_watcher *W; 496typedef ev_watcher *W;
407 508
408#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 511#endif
411 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
412#ifdef _WIN32 523#ifdef _WIN32
413# include "ev_win32.c" 524# include "ev_win32.c"
414#endif 525#endif
415 526
416/*****************************************************************************/ 527/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 589#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 590#define ev_free(ptr) ev_realloc ((ptr), 0)
480 591
481/*****************************************************************************/ 592/*****************************************************************************/
482 593
594/* set in reify when reification needed */
595#define EV_ANFD_REIFY 1
596
483/* file descriptor info structure */ 597/* file descriptor info structure */
484typedef struct 598typedef struct
485{ 599{
486 WL head; 600 WL head;
487 unsigned char events; /* the events watched for */ 601 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 602 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 603 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 604 unsigned char unused;
491#if EV_USE_EPOLL 605#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 606 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 607#endif
555 669
556 static int ev_default_loop_ptr; 670 static int ev_default_loop_ptr;
557 671
558#endif 672#endif
559 673
674#if EV_MINIMAL < 2
675# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
676# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
677# define EV_INVOKE_PENDING invoke_cb (EV_A)
678#else
679# define EV_RELEASE_CB (void)0
680# define EV_ACQUIRE_CB (void)0
681# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
682#endif
683
684#define EVUNLOOP_RECURSE 0x80
685
560/*****************************************************************************/ 686/*****************************************************************************/
561 687
688#ifndef EV_HAVE_EV_TIME
562ev_tstamp 689ev_tstamp
563ev_time (void) 690ev_time (void)
564{ 691{
565#if EV_USE_REALTIME 692#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 693 if (expect_true (have_realtime))
573 700
574 struct timeval tv; 701 struct timeval tv;
575 gettimeofday (&tv, 0); 702 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 703 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 704}
705#endif
578 706
579inline_size ev_tstamp 707inline_size ev_tstamp
580get_clock (void) 708get_clock (void)
581{ 709{
582#if EV_USE_MONOTONIC 710#if EV_USE_MONOTONIC
618 746
619 tv.tv_sec = (time_t)delay; 747 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 748 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 749
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 750 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 751 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 752 /* by older ones */
625 select (0, 0, 0, 0, &tv); 753 select (0, 0, 0, 0, &tv);
626#endif 754#endif
627 } 755 }
628} 756}
736} 864}
737 865
738/*****************************************************************************/ 866/*****************************************************************************/
739 867
740inline_speed void 868inline_speed void
741fd_event (EV_P_ int fd, int revents) 869fd_event_nc (EV_P_ int fd, int revents)
742{ 870{
743 ANFD *anfd = anfds + fd; 871 ANFD *anfd = anfds + fd;
744 ev_io *w; 872 ev_io *w;
745 873
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 874 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
750 if (ev) 878 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 879 ev_feed_event (EV_A_ (W)w, ev);
752 } 880 }
753} 881}
754 882
883/* do not submit kernel events for fds that have reify set */
884/* because that means they changed while we were polling for new events */
885inline_speed void
886fd_event (EV_P_ int fd, int revents)
887{
888 ANFD *anfd = anfds + fd;
889
890 if (expect_true (!anfd->reify))
891 fd_event_nc (EV_A_ fd, revents);
892}
893
755void 894void
756ev_feed_fd_event (EV_P_ int fd, int revents) 895ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 896{
758 if (fd >= 0 && fd < anfdmax) 897 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 898 fd_event_nc (EV_A_ fd, revents);
760} 899}
761 900
762/* make sure the external fd watch events are in-sync */ 901/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 902/* with the kernel/libev internal state */
764inline_size void 903inline_size void
779 918
780#if EV_SELECT_IS_WINSOCKET 919#if EV_SELECT_IS_WINSOCKET
781 if (events) 920 if (events)
782 { 921 {
783 unsigned long arg; 922 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
786 #else
787 anfd->handle = _get_osfhandle (fd);
788 #endif
789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 924 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 925 }
791#endif 926#endif
792 927
793 { 928 {
836/* check whether the given fd is atcually valid, for error recovery */ 971/* check whether the given fd is atcually valid, for error recovery */
837inline_size int 972inline_size int
838fd_valid (int fd) 973fd_valid (int fd)
839{ 974{
840#ifdef _WIN32 975#ifdef _WIN32
841 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
842#else 977#else
843 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
844#endif 979#endif
845} 980}
846 981
864 999
865 for (fd = anfdmax; fd--; ) 1000 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 1001 if (anfds [fd].events)
867 { 1002 {
868 fd_kill (EV_A_ fd); 1003 fd_kill (EV_A_ fd);
869 return; 1004 break;
870 } 1005 }
871} 1006}
872 1007
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 1008/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 1009static void noinline
879 for (fd = 0; fd < anfdmax; ++fd) 1014 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1015 if (anfds [fd].events)
881 { 1016 {
882 anfds [fd].events = 0; 1017 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1018 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1019 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1020 }
886} 1021}
887 1022
888/*****************************************************************************/ 1023/*****************************************************************************/
889 1024
964 1099
965 for (;;) 1100 for (;;)
966 { 1101 {
967 int c = k << 1; 1102 int c = k << 1;
968 1103
969 if (c > N + HEAP0 - 1) 1104 if (c >= N + HEAP0)
970 break; 1105 break;
971 1106
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1107 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1108 ? 1 : 0;
974 1109
1010 1145
1011/* move an element suitably so it is in a correct place */ 1146/* move an element suitably so it is in a correct place */
1012inline_size void 1147inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1148adjustheap (ANHE *heap, int N, int k)
1014{ 1149{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1150 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1151 upheap (heap, k);
1017 else 1152 else
1018 downheap (heap, N, k); 1153 downheap (heap, N, k);
1019} 1154}
1020 1155
1033/*****************************************************************************/ 1168/*****************************************************************************/
1034 1169
1035/* associate signal watchers to a signal signal */ 1170/* associate signal watchers to a signal signal */
1036typedef struct 1171typedef struct
1037{ 1172{
1173 EV_ATOMIC_T pending;
1174#if EV_MULTIPLICITY
1175 EV_P;
1176#endif
1038 WL head; 1177 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1178} ANSIG;
1041 1179
1042static ANSIG *signals; 1180static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1181
1047/*****************************************************************************/ 1182/*****************************************************************************/
1048 1183
1049/* used to prepare libev internal fd's */ 1184/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1185/* this is not fork-safe */
1051inline_speed void 1186inline_speed void
1052fd_intern (int fd) 1187fd_intern (int fd)
1053{ 1188{
1054#ifdef _WIN32 1189#ifdef _WIN32
1055 unsigned long arg = 1; 1190 unsigned long arg = 1;
1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1057#else 1192#else
1058 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1059 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1060#endif 1195#endif
1061} 1196}
1064evpipe_init (EV_P) 1199evpipe_init (EV_P)
1065{ 1200{
1066 if (!ev_is_active (&pipe_w)) 1201 if (!ev_is_active (&pipe_w))
1067 { 1202 {
1068#if EV_USE_EVENTFD 1203#if EV_USE_EVENTFD
1204 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1205 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1206 evfd = eventfd (0, 0);
1207
1208 if (evfd >= 0)
1070 { 1209 {
1071 evpipe [0] = -1; 1210 evpipe [0] = -1;
1072 fd_intern (evfd); 1211 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1212 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1213 }
1075 else 1214 else
1076#endif 1215#endif
1077 { 1216 {
1114/* called whenever the libev signal pipe */ 1253/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1254/* got some events (signal, async) */
1116static void 1255static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1256pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1257{
1258 int i;
1259
1119#if EV_USE_EVENTFD 1260#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1261 if (evfd >= 0)
1121 { 1262 {
1122 uint64_t counter; 1263 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1264 read (evfd, &counter, sizeof (uint64_t));
1127 { 1268 {
1128 char dummy; 1269 char dummy;
1129 read (evpipe [0], &dummy, 1); 1270 read (evpipe [0], &dummy, 1);
1130 } 1271 }
1131 1272
1132 if (gotsig && ev_is_default_loop (EV_A)) 1273 if (sig_pending)
1133 { 1274 {
1134 int signum; 1275 sig_pending = 0;
1135 gotsig = 0;
1136 1276
1137 for (signum = signalmax; signum--; ) 1277 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1278 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1279 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1280 }
1141 1281
1142#if EV_ASYNC_ENABLE 1282#if EV_ASYNC_ENABLE
1143 if (gotasync) 1283 if (async_pending)
1144 { 1284 {
1145 int i; 1285 async_pending = 0;
1146 gotasync = 0;
1147 1286
1148 for (i = asynccnt; i--; ) 1287 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1288 if (asyncs [i]->sent)
1150 { 1289 {
1151 asyncs [i]->sent = 0; 1290 asyncs [i]->sent = 0;
1159 1298
1160static void 1299static void
1161ev_sighandler (int signum) 1300ev_sighandler (int signum)
1162{ 1301{
1163#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1303 EV_P = signals [signum - 1].loop;
1165#endif 1304#endif
1166 1305
1167#if _WIN32 1306#ifdef _WIN32
1168 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1169#endif 1308#endif
1170 1309
1171 signals [signum - 1].gotsig = 1; 1310 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1311 evpipe_write (EV_A_ &sig_pending);
1173} 1312}
1174 1313
1175void noinline 1314void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1315ev_feed_signal_event (EV_P_ int signum)
1177{ 1316{
1178 WL w; 1317 WL w;
1179 1318
1319 if (expect_false (signum <= 0 || signum > EV_NSIG))
1320 return;
1321
1322 --signum;
1323
1180#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1325 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1326 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1327
1184 --signum; 1328 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1329 return;
1330#endif
1188 1331
1189 signals [signum].gotsig = 0; 1332 signals [signum].pending = 0;
1190 1333
1191 for (w = signals [signum].head; w; w = w->next) 1334 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1335 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1336}
1337
1338#if EV_USE_SIGNALFD
1339static void
1340sigfdcb (EV_P_ ev_io *iow, int revents)
1341{
1342 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1343
1344 for (;;)
1345 {
1346 ssize_t res = read (sigfd, si, sizeof (si));
1347
1348 /* not ISO-C, as res might be -1, but works with SuS */
1349 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1350 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1351
1352 if (res < (ssize_t)sizeof (si))
1353 break;
1354 }
1355}
1356#endif
1194 1357
1195/*****************************************************************************/ 1358/*****************************************************************************/
1196 1359
1197static WL childs [EV_PID_HASHSIZE]; 1360static WL childs [EV_PID_HASHSIZE];
1198 1361
1343ev_backend (EV_P) 1506ev_backend (EV_P)
1344{ 1507{
1345 return backend; 1508 return backend;
1346} 1509}
1347 1510
1511#if EV_MINIMAL < 2
1348unsigned int 1512unsigned int
1349ev_loop_count (EV_P) 1513ev_loop_count (EV_P)
1350{ 1514{
1351 return loop_count; 1515 return loop_count;
1352} 1516}
1353 1517
1518unsigned int
1519ev_loop_depth (EV_P)
1520{
1521 return loop_depth;
1522}
1523
1354void 1524void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1525ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1526{
1357 io_blocktime = interval; 1527 io_blocktime = interval;
1358} 1528}
1360void 1530void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1531ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1532{
1363 timeout_blocktime = interval; 1533 timeout_blocktime = interval;
1364} 1534}
1535
1536void
1537ev_set_userdata (EV_P_ void *data)
1538{
1539 userdata = data;
1540}
1541
1542void *
1543ev_userdata (EV_P)
1544{
1545 return userdata;
1546}
1547
1548void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1549{
1550 invoke_cb = invoke_pending_cb;
1551}
1552
1553void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1554{
1555 release_cb = release;
1556 acquire_cb = acquire;
1557}
1558#endif
1365 1559
1366/* initialise a loop structure, must be zero-initialised */ 1560/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1561static void noinline
1368loop_init (EV_P_ unsigned int flags) 1562loop_init (EV_P_ unsigned int flags)
1369{ 1563{
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1581 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1582 have_monotonic = 1;
1389 } 1583 }
1390#endif 1584#endif
1391 1585
1586 /* pid check not overridable via env */
1587#ifndef _WIN32
1588 if (flags & EVFLAG_FORKCHECK)
1589 curpid = getpid ();
1590#endif
1591
1592 if (!(flags & EVFLAG_NOENV)
1593 && !enable_secure ()
1594 && getenv ("LIBEV_FLAGS"))
1595 flags = atoi (getenv ("LIBEV_FLAGS"));
1596
1392 ev_rt_now = ev_time (); 1597 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1598 mn_now = get_clock ();
1394 now_floor = mn_now; 1599 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1600 rtmn_diff = ev_rt_now - mn_now;
1601#if EV_MINIMAL < 2
1602 invoke_cb = ev_invoke_pending;
1603#endif
1396 1604
1397 io_blocktime = 0.; 1605 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1606 timeout_blocktime = 0.;
1399 backend = 0; 1607 backend = 0;
1400 backend_fd = -1; 1608 backend_fd = -1;
1401 gotasync = 0; 1609 sig_pending = 0;
1610#if EV_ASYNC_ENABLE
1611 async_pending = 0;
1612#endif
1402#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1403 fs_fd = -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1615#endif
1405 1616#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1618#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1619
1417 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1419 1622
1420#if EV_USE_PORT 1623#if EV_USE_PORT
1446{ 1649{
1447 int i; 1650 int i;
1448 1651
1449 if (ev_is_active (&pipe_w)) 1652 if (ev_is_active (&pipe_w))
1450 { 1653 {
1451 ev_ref (EV_A); /* signal watcher */ 1654 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1655 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1656
1454#if EV_USE_EVENTFD 1657#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1658 if (evfd >= 0)
1456 close (evfd); 1659 close (evfd);
1457#endif 1660#endif
1458 1661
1459 if (evpipe [0] >= 0) 1662 if (evpipe [0] >= 0)
1460 { 1663 {
1461 close (evpipe [0]); 1664 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1665 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1666 }
1464 } 1667 }
1668
1669#if EV_USE_SIGNALFD
1670 if (ev_is_active (&sigfd_w))
1671 close (sigfd);
1672#endif
1465 1673
1466#if EV_USE_INOTIFY 1674#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1675 if (fs_fd >= 0)
1468 close (fs_fd); 1676 close (fs_fd);
1469#endif 1677#endif
1493#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1702 array_free (idle, [i]);
1495#endif 1703#endif
1496 } 1704 }
1497 1705
1498 ev_free (anfds); anfdmax = 0; 1706 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1707
1500 /* have to use the microsoft-never-gets-it-right macro */ 1708 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1709 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1710 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1711 array_free (timer, EMPTY);
1538 1746
1539 if (ev_is_active (&pipe_w)) 1747 if (ev_is_active (&pipe_w))
1540 { 1748 {
1541 /* this "locks" the handlers against writing to the pipe */ 1749 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1750 /* while we modify the fd vars */
1543 gotsig = 1; 1751 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1752#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1753 async_pending = 1;
1546#endif 1754#endif
1547 1755
1548 ev_ref (EV_A); 1756 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1757 ev_io_stop (EV_A_ &pipe_w);
1550 1758
1553 close (evfd); 1761 close (evfd);
1554#endif 1762#endif
1555 1763
1556 if (evpipe [0] >= 0) 1764 if (evpipe [0] >= 0)
1557 { 1765 {
1558 close (evpipe [0]); 1766 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1767 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1768 }
1561 1769
1562 evpipe_init (EV_A); 1770 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1771 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1772 pipecb (EV_A_ &pipe_w, EV_READ);
1570#if EV_MULTIPLICITY 1778#if EV_MULTIPLICITY
1571 1779
1572struct ev_loop * 1780struct ev_loop *
1573ev_loop_new (unsigned int flags) 1781ev_loop_new (unsigned int flags)
1574{ 1782{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1783 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1784
1577 memset (loop, 0, sizeof (struct ev_loop)); 1785 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1786 loop_init (EV_A_ flags);
1580 1787
1581 if (ev_backend (EV_A)) 1788 if (ev_backend (EV_A))
1582 return loop; 1789 return EV_A;
1583 1790
1584 return 0; 1791 return 0;
1585} 1792}
1586 1793
1587void 1794void
1594void 1801void
1595ev_loop_fork (EV_P) 1802ev_loop_fork (EV_P)
1596{ 1803{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1804 postfork = 1; /* must be in line with ev_default_fork */
1598} 1805}
1806#endif /* multiplicity */
1599 1807
1600#if EV_VERIFY 1808#if EV_VERIFY
1601static void noinline 1809static void noinline
1602verify_watcher (EV_P_ W w) 1810verify_watcher (EV_P_ W w)
1603{ 1811{
1631 verify_watcher (EV_A_ ws [cnt]); 1839 verify_watcher (EV_A_ ws [cnt]);
1632 } 1840 }
1633} 1841}
1634#endif 1842#endif
1635 1843
1844#if EV_MINIMAL < 2
1636void 1845void
1637ev_loop_verify (EV_P) 1846ev_loop_verify (EV_P)
1638{ 1847{
1639#if EV_VERIFY 1848#if EV_VERIFY
1640 int i; 1849 int i;
1689 assert (checkmax >= checkcnt); 1898 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1899 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1900
1692# if 0 1901# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1902 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif
1696#endif 1904# endif
1905#endif
1697} 1906}
1698 1907#endif
1699#endif /* multiplicity */
1700 1908
1701#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1702struct ev_loop * 1910struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1911ev_default_loop_init (unsigned int flags)
1704#else 1912#else
1707#endif 1915#endif
1708{ 1916{
1709 if (!ev_default_loop_ptr) 1917 if (!ev_default_loop_ptr)
1710 { 1918 {
1711#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1920 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1921#else
1714 ev_default_loop_ptr = 1; 1922 ev_default_loop_ptr = 1;
1715#endif 1923#endif
1716 1924
1717 loop_init (EV_A_ flags); 1925 loop_init (EV_A_ flags);
1734 1942
1735void 1943void
1736ev_default_destroy (void) 1944ev_default_destroy (void)
1737{ 1945{
1738#if EV_MULTIPLICITY 1946#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1947 EV_P = ev_default_loop_ptr;
1740#endif 1948#endif
1741 1949
1742 ev_default_loop_ptr = 0; 1950 ev_default_loop_ptr = 0;
1743 1951
1744#ifndef _WIN32 1952#ifndef _WIN32
1751 1959
1752void 1960void
1753ev_default_fork (void) 1961ev_default_fork (void)
1754{ 1962{
1755#if EV_MULTIPLICITY 1963#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1964 EV_P = ev_default_loop_ptr;
1757#endif 1965#endif
1758 1966
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1967 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1968}
1761 1969
1765ev_invoke (EV_P_ void *w, int revents) 1973ev_invoke (EV_P_ void *w, int revents)
1766{ 1974{
1767 EV_CB_INVOKE ((W)w, revents); 1975 EV_CB_INVOKE ((W)w, revents);
1768} 1976}
1769 1977
1770inline_speed void 1978unsigned int
1771call_pending (EV_P) 1979ev_pending_count (EV_P)
1980{
1981 int pri;
1982 unsigned int count = 0;
1983
1984 for (pri = NUMPRI; pri--; )
1985 count += pendingcnt [pri];
1986
1987 return count;
1988}
1989
1990void noinline
1991ev_invoke_pending (EV_P)
1772{ 1992{
1773 int pri; 1993 int pri;
1774 1994
1775 for (pri = NUMPRI; pri--; ) 1995 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 1996 while (pendingcnt [pri])
1944 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
1945 } 2165 }
1946} 2166}
1947 2167
1948/* fetch new monotonic and realtime times from the kernel */ 2168/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2169/* also detect if there was a timejump, and act accordingly */
1950inline_speed void 2170inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
1952{ 2172{
1953#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
1954 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
2011 2231
2012 mn_now = ev_rt_now; 2232 mn_now = ev_rt_now;
2013 } 2233 }
2014} 2234}
2015 2235
2016static int loop_done;
2017
2018void 2236void
2019ev_loop (EV_P_ int flags) 2237ev_loop (EV_P_ int flags)
2020{ 2238{
2239#if EV_MINIMAL < 2
2240 ++loop_depth;
2241#endif
2242
2243 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2244
2021 loop_done = EVUNLOOP_CANCEL; 2245 loop_done = EVUNLOOP_CANCEL;
2022 2246
2023 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2247 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2024 2248
2025 do 2249 do
2026 { 2250 {
2027#if EV_VERIFY >= 2 2251#if EV_VERIFY >= 2
2028 ev_loop_verify (EV_A); 2252 ev_loop_verify (EV_A);
2041 /* we might have forked, so queue fork handlers */ 2265 /* we might have forked, so queue fork handlers */
2042 if (expect_false (postfork)) 2266 if (expect_false (postfork))
2043 if (forkcnt) 2267 if (forkcnt)
2044 { 2268 {
2045 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2269 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2046 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
2047 } 2271 }
2048#endif 2272#endif
2049 2273
2050 /* queue prepare watchers (and execute them) */ 2274 /* queue prepare watchers (and execute them) */
2051 if (expect_false (preparecnt)) 2275 if (expect_false (preparecnt))
2052 { 2276 {
2053 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2277 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2054 call_pending (EV_A); 2278 EV_INVOKE_PENDING;
2055 } 2279 }
2280
2281 if (expect_false (loop_done))
2282 break;
2056 2283
2057 /* we might have forked, so reify kernel state if necessary */ 2284 /* we might have forked, so reify kernel state if necessary */
2058 if (expect_false (postfork)) 2285 if (expect_false (postfork))
2059 loop_fork (EV_A); 2286 loop_fork (EV_A);
2060 2287
2066 ev_tstamp waittime = 0.; 2293 ev_tstamp waittime = 0.;
2067 ev_tstamp sleeptime = 0.; 2294 ev_tstamp sleeptime = 0.;
2068 2295
2069 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2296 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2070 { 2297 {
2298 /* remember old timestamp for io_blocktime calculation */
2299 ev_tstamp prev_mn_now = mn_now;
2300
2071 /* update time to cancel out callback processing overhead */ 2301 /* update time to cancel out callback processing overhead */
2072 time_update (EV_A_ 1e100); 2302 time_update (EV_A_ 1e100);
2073 2303
2074 waittime = MAX_BLOCKTIME; 2304 waittime = MAX_BLOCKTIME;
2075 2305
2085 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2315 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2086 if (waittime > to) waittime = to; 2316 if (waittime > to) waittime = to;
2087 } 2317 }
2088#endif 2318#endif
2089 2319
2320 /* don't let timeouts decrease the waittime below timeout_blocktime */
2090 if (expect_false (waittime < timeout_blocktime)) 2321 if (expect_false (waittime < timeout_blocktime))
2091 waittime = timeout_blocktime; 2322 waittime = timeout_blocktime;
2092 2323
2093 sleeptime = waittime - backend_fudge; 2324 /* extra check because io_blocktime is commonly 0 */
2094
2095 if (expect_true (sleeptime > io_blocktime)) 2325 if (expect_false (io_blocktime))
2096 sleeptime = io_blocktime;
2097
2098 if (sleeptime)
2099 { 2326 {
2327 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2328
2329 if (sleeptime > waittime - backend_fudge)
2330 sleeptime = waittime - backend_fudge;
2331
2332 if (expect_true (sleeptime > 0.))
2333 {
2100 ev_sleep (sleeptime); 2334 ev_sleep (sleeptime);
2101 waittime -= sleeptime; 2335 waittime -= sleeptime;
2336 }
2102 } 2337 }
2103 } 2338 }
2104 2339
2340#if EV_MINIMAL < 2
2105 ++loop_count; 2341 ++loop_count;
2342#endif
2343 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2106 backend_poll (EV_A_ waittime); 2344 backend_poll (EV_A_ waittime);
2345 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2107 2346
2108 /* update ev_rt_now, do magic */ 2347 /* update ev_rt_now, do magic */
2109 time_update (EV_A_ waittime + sleeptime); 2348 time_update (EV_A_ waittime + sleeptime);
2110 } 2349 }
2111 2350
2122 2361
2123 /* queue check watchers, to be executed first */ 2362 /* queue check watchers, to be executed first */
2124 if (expect_false (checkcnt)) 2363 if (expect_false (checkcnt))
2125 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2364 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2126 2365
2127 call_pending (EV_A); 2366 EV_INVOKE_PENDING;
2128 } 2367 }
2129 while (expect_true ( 2368 while (expect_true (
2130 activecnt 2369 activecnt
2131 && !loop_done 2370 && !loop_done
2132 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2371 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2133 )); 2372 ));
2134 2373
2135 if (loop_done == EVUNLOOP_ONE) 2374 if (loop_done == EVUNLOOP_ONE)
2136 loop_done = EVUNLOOP_CANCEL; 2375 loop_done = EVUNLOOP_CANCEL;
2376
2377#if EV_MINIMAL < 2
2378 --loop_depth;
2379#endif
2137} 2380}
2138 2381
2139void 2382void
2140ev_unloop (EV_P_ int how) 2383ev_unloop (EV_P_ int how)
2141{ 2384{
2192inline_size void 2435inline_size void
2193wlist_del (WL *head, WL elem) 2436wlist_del (WL *head, WL elem)
2194{ 2437{
2195 while (*head) 2438 while (*head)
2196 { 2439 {
2197 if (*head == elem) 2440 if (expect_true (*head == elem))
2198 { 2441 {
2199 *head = elem->next; 2442 *head = elem->next;
2200 return; 2443 break;
2201 } 2444 }
2202 2445
2203 head = &(*head)->next; 2446 head = &(*head)->next;
2204 } 2447 }
2205} 2448}
2233} 2476}
2234 2477
2235inline_size void 2478inline_size void
2236pri_adjust (EV_P_ W w) 2479pri_adjust (EV_P_ W w)
2237{ 2480{
2238 int pri = w->priority; 2481 int pri = ev_priority (w);
2239 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2482 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2240 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2483 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2241 w->priority = pri; 2484 ev_set_priority (w, pri);
2242} 2485}
2243 2486
2244inline_speed void 2487inline_speed void
2245ev_start (EV_P_ W w, int active) 2488ev_start (EV_P_ W w, int active)
2246{ 2489{
2265 2508
2266 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2267 return; 2510 return;
2268 2511
2269 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2270 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2513 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2271 2514
2272 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2273 2516
2274 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2275 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2276 wlist_add (&anfds[fd].head, (WL)w); 2519 wlist_add (&anfds[fd].head, (WL)w);
2277 2520
2278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2521 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2279 w->events &= ~EV__IOFDSET; 2522 w->events &= ~EV__IOFDSET;
2280 2523
2281 EV_FREQUENT_CHECK; 2524 EV_FREQUENT_CHECK;
2282} 2525}
2283 2526
2377 } 2620 }
2378 2621
2379 EV_FREQUENT_CHECK; 2622 EV_FREQUENT_CHECK;
2380} 2623}
2381 2624
2625ev_tstamp
2626ev_timer_remaining (EV_P_ ev_timer *w)
2627{
2628 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2629}
2630
2382#if EV_PERIODIC_ENABLE 2631#if EV_PERIODIC_ENABLE
2383void noinline 2632void noinline
2384ev_periodic_start (EV_P_ ev_periodic *w) 2633ev_periodic_start (EV_P_ ev_periodic *w)
2385{ 2634{
2386 if (expect_false (ev_is_active (w))) 2635 if (expect_false (ev_is_active (w)))
2453#endif 2702#endif
2454 2703
2455void noinline 2704void noinline
2456ev_signal_start (EV_P_ ev_signal *w) 2705ev_signal_start (EV_P_ ev_signal *w)
2457{ 2706{
2458#if EV_MULTIPLICITY
2459 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2460#endif
2461 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2462 return; 2708 return;
2463 2709
2464 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2710 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2465 2711
2466 evpipe_init (EV_A); 2712#if EV_MULTIPLICITY
2713 assert (("libev: a signal must not be attached to two different loops",
2714 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2467 2715
2468 EV_FREQUENT_CHECK; 2716 signals [w->signum - 1].loop = EV_A;
2717#endif
2469 2718
2719 EV_FREQUENT_CHECK;
2720
2721#if EV_USE_SIGNALFD
2722 if (sigfd == -2)
2470 { 2723 {
2471#ifndef _WIN32 2724 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2472 sigset_t full, prev; 2725 if (sigfd < 0 && errno == EINVAL)
2473 sigfillset (&full); 2726 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2474 sigprocmask (SIG_SETMASK, &full, &prev);
2475#endif
2476 2727
2477 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2728 if (sigfd >= 0)
2729 {
2730 fd_intern (sigfd); /* doing it twice will not hurt */
2478 2731
2479#ifndef _WIN32 2732 sigemptyset (&sigfd_set);
2480 sigprocmask (SIG_SETMASK, &prev, 0); 2733
2481#endif 2734 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2735 ev_set_priority (&sigfd_w, EV_MAXPRI);
2736 ev_io_start (EV_A_ &sigfd_w);
2737 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2738 }
2482 } 2739 }
2740
2741 if (sigfd >= 0)
2742 {
2743 /* TODO: check .head */
2744 sigaddset (&sigfd_set, w->signum);
2745 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2746
2747 signalfd (sigfd, &sigfd_set, 0);
2748 }
2749#endif
2483 2750
2484 ev_start (EV_A_ (W)w, 1); 2751 ev_start (EV_A_ (W)w, 1);
2485 wlist_add (&signals [w->signum - 1].head, (WL)w); 2752 wlist_add (&signals [w->signum - 1].head, (WL)w);
2486 2753
2487 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2755# if EV_USE_SIGNALFD
2756 if (sigfd < 0) /*TODO*/
2757# endif
2488 { 2758 {
2489#if _WIN32 2759# ifdef _WIN32
2760 evpipe_init (EV_A);
2761
2490 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2491#else 2763# else
2492 struct sigaction sa; 2764 struct sigaction sa;
2765
2766 evpipe_init (EV_A);
2767
2493 sa.sa_handler = ev_sighandler; 2768 sa.sa_handler = ev_sighandler;
2494 sigfillset (&sa.sa_mask); 2769 sigfillset (&sa.sa_mask);
2495 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2770 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2496 sigaction (w->signum, &sa, 0); 2771 sigaction (w->signum, &sa, 0);
2772
2773 sigemptyset (&sa.sa_mask);
2774 sigaddset (&sa.sa_mask, w->signum);
2775 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2497#endif 2776#endif
2498 } 2777 }
2499 2778
2500 EV_FREQUENT_CHECK; 2779 EV_FREQUENT_CHECK;
2501} 2780}
2502 2781
2503void noinline 2782void noinline
2511 2790
2512 wlist_del (&signals [w->signum - 1].head, (WL)w); 2791 wlist_del (&signals [w->signum - 1].head, (WL)w);
2513 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2514 2793
2515 if (!signals [w->signum - 1].head) 2794 if (!signals [w->signum - 1].head)
2795 {
2796#if EV_MULTIPLICITY
2797 signals [w->signum - 1].loop = 0; /* unattach from signal */
2798#endif
2799#if EV_USE_SIGNALFD
2800 if (sigfd >= 0)
2801 {
2802 sigset_t ss;
2803
2804 sigemptyset (&ss);
2805 sigaddset (&ss, w->signum);
2806 sigdelset (&sigfd_set, w->signum);
2807
2808 signalfd (sigfd, &sigfd_set, 0);
2809 sigprocmask (SIG_UNBLOCK, &ss, 0);
2810 }
2811 else
2812#endif
2516 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2814 }
2517 2815
2518 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2519} 2817}
2520 2818
2521void 2819void
2562#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2563 2861
2564static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2862static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2565 2863
2566#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2567# define EV_INOTIFY_BUFSIZE 8192 2865
2866/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2867# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2568 2868
2569static void noinline 2869static void noinline
2570infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2571{ 2871{
2572 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); 2872 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);
2573 2873
2574 if (w->wd < 0) 2874 if (w->wd >= 0)
2875 {
2876 struct statfs sfs;
2877
2878 /* now local changes will be tracked by inotify, but remote changes won't */
2879 /* unless the filesystem is known to be local, we therefore still poll */
2880 /* also do poll on <2.6.25, but with normal frequency */
2881
2882 if (!fs_2625)
2883 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2884 else if (!statfs (w->path, &sfs)
2885 && (sfs.f_type == 0x1373 /* devfs */
2886 || sfs.f_type == 0xEF53 /* ext2/3 */
2887 || sfs.f_type == 0x3153464a /* jfs */
2888 || sfs.f_type == 0x52654973 /* reiser3 */
2889 || sfs.f_type == 0x01021994 /* tempfs */
2890 || sfs.f_type == 0x58465342 /* xfs */))
2891 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2892 else
2893 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2575 { 2894 }
2895 else
2896 {
2897 /* can't use inotify, continue to stat */
2576 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2898 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2577 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2578 2899
2579 /* monitor some parent directory for speedup hints */ 2900 /* if path is not there, monitor some parent directory for speedup hints */
2580 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2901 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2581 /* but an efficiency issue only */ 2902 /* but an efficiency issue only */
2582 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2903 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2583 { 2904 {
2584 char path [4096]; 2905 char path [4096];
2600 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2601 } 2922 }
2602 } 2923 }
2603 2924
2604 if (w->wd >= 0) 2925 if (w->wd >= 0)
2605 {
2606 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2926 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2607 2927
2608 /* now local changes will be tracked by inotify, but remote changes won't */ 2928 /* now re-arm timer, if required */
2609 /* unless the filesystem it known to be local, we therefore still poll */ 2929 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2610 /* also do poll on <2.6.25, but with normal frequency */
2611 struct statfs sfs;
2612
2613 if (fs_2625 && !statfs (w->path, &sfs))
2614 if (sfs.f_type == 0x1373 /* devfs */
2615 || sfs.f_type == 0xEF53 /* ext2/3 */
2616 || sfs.f_type == 0x3153464a /* jfs */
2617 || sfs.f_type == 0x52654973 /* reiser3 */
2618 || sfs.f_type == 0x01021994 /* tempfs */
2619 || sfs.f_type == 0x58465342 /* xfs */)
2620 return;
2621
2622 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 ev_timer_again (EV_A_ &w->timer); 2930 ev_timer_again (EV_A_ &w->timer);
2624 } 2931 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2625} 2932}
2626 2933
2627static void noinline 2934static void noinline
2628infy_del (EV_P_ ev_stat *w) 2935infy_del (EV_P_ ev_stat *w)
2629{ 2936{
2674 2981
2675static void 2982static void
2676infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2677{ 2984{
2678 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2679 struct inotify_event *ev = (struct inotify_event *)buf;
2680 int ofs; 2986 int ofs;
2681 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2682 2988
2683 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2989 for (ofs = 0; ofs < len; )
2990 {
2991 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2684 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2992 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len;
2994 }
2685} 2995}
2686 2996
2687inline_size void 2997inline_size void
2688check_2625 (EV_P) 2998check_2625 (EV_P)
2689{ 2999{
2705 return; 3015 return;
2706 3016
2707 fs_2625 = 1; 3017 fs_2625 = 1;
2708} 3018}
2709 3019
3020inline_size int
3021infy_newfd (void)
3022{
3023#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3024 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3025 if (fd >= 0)
3026 return fd;
3027#endif
3028 return inotify_init ();
3029}
3030
2710inline_size void 3031inline_size void
2711infy_init (EV_P) 3032infy_init (EV_P)
2712{ 3033{
2713 if (fs_fd != -2) 3034 if (fs_fd != -2)
2714 return; 3035 return;
2715 3036
2716 fs_fd = -1; 3037 fs_fd = -1;
2717 3038
2718 check_2625 (EV_A); 3039 check_2625 (EV_A);
2719 3040
2720 fs_fd = inotify_init (); 3041 fs_fd = infy_newfd ();
2721 3042
2722 if (fs_fd >= 0) 3043 if (fs_fd >= 0)
2723 { 3044 {
3045 fd_intern (fs_fd);
2724 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3046 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2725 ev_set_priority (&fs_w, EV_MAXPRI); 3047 ev_set_priority (&fs_w, EV_MAXPRI);
2726 ev_io_start (EV_A_ &fs_w); 3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
2727 } 3050 }
2728} 3051}
2729 3052
2730inline_size void 3053inline_size void
2731infy_fork (EV_P) 3054infy_fork (EV_P)
2733 int slot; 3056 int slot;
2734 3057
2735 if (fs_fd < 0) 3058 if (fs_fd < 0)
2736 return; 3059 return;
2737 3060
3061 ev_ref (EV_A);
3062 ev_io_stop (EV_A_ &fs_w);
2738 close (fs_fd); 3063 close (fs_fd);
2739 fs_fd = inotify_init (); 3064 fs_fd = infy_newfd ();
3065
3066 if (fs_fd >= 0)
3067 {
3068 fd_intern (fs_fd);
3069 ev_io_set (&fs_w, fs_fd, EV_READ);
3070 ev_io_start (EV_A_ &fs_w);
3071 ev_unref (EV_A);
3072 }
2740 3073
2741 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2742 { 3075 {
2743 WL w_ = fs_hash [slot].head; 3076 WL w_ = fs_hash [slot].head;
2744 fs_hash [slot].head = 0; 3077 fs_hash [slot].head = 0;
2751 w->wd = -1; 3084 w->wd = -1;
2752 3085
2753 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2754 infy_add (EV_A_ w); /* re-add, no matter what */ 3087 infy_add (EV_A_ w); /* re-add, no matter what */
2755 else 3088 else
3089 {
3090 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3091 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2756 ev_timer_again (EV_A_ &w->timer); 3092 ev_timer_again (EV_A_ &w->timer);
3093 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3094 }
2757 } 3095 }
2758 } 3096 }
2759} 3097}
2760 3098
2761#endif 3099#endif
2778static void noinline 3116static void noinline
2779stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2780{ 3118{
2781 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2782 3120
2783 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
2784 /* prev has the old value when the callback gets invoked */
2785 w->prev = w->attr;
2786 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
2787 3123
2788 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3124 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2789 if ( 3125 if (
2790 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
2791 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
2792 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
2793 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
2794 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
2795 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
2796 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
2797 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
2798 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
2799 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
2800 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
2801 ) { 3137 ) {
3138 /* we only update w->prev on actual differences */
3139 /* in case we test more often than invoke the callback, */
3140 /* to ensure that prev is always different to attr */
3141 w->prev = prev;
3142
2802 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
2803 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2804 { 3145 {
2805 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
2806 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);
2831 3172
2832 if (fs_fd >= 0) 3173 if (fs_fd >= 0)
2833 infy_add (EV_A_ w); 3174 infy_add (EV_A_ w);
2834 else 3175 else
2835#endif 3176#endif
3177 {
2836 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 ev_unref (EV_A);
3180 }
2837 3181
2838 ev_start (EV_A_ (W)w, 1); 3182 ev_start (EV_A_ (W)w, 1);
2839 3183
2840 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
2841} 3185}
2850 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
2851 3195
2852#if EV_USE_INOTIFY 3196#if EV_USE_INOTIFY
2853 infy_del (EV_A_ w); 3197 infy_del (EV_A_ w);
2854#endif 3198#endif
3199
3200 if (ev_is_active (&w->timer))
3201 {
3202 ev_ref (EV_A);
2855 ev_timer_stop (EV_A_ &w->timer); 3203 ev_timer_stop (EV_A_ &w->timer);
3204 }
2856 3205
2857 ev_stop (EV_A_ (W)w); 3206 ev_stop (EV_A_ (W)w);
2858 3207
2859 EV_FREQUENT_CHECK; 3208 EV_FREQUENT_CHECK;
2860} 3209}
3001embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3350embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3002{ 3351{
3003 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3352 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3004 3353
3005 { 3354 {
3006 struct ev_loop *loop = w->other; 3355 EV_P = w->other;
3007 3356
3008 while (fdchangecnt) 3357 while (fdchangecnt)
3009 { 3358 {
3010 fd_reify (EV_A); 3359 fd_reify (EV_A);
3011 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3360 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3019 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3368 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3020 3369
3021 ev_embed_stop (EV_A_ w); 3370 ev_embed_stop (EV_A_ w);
3022 3371
3023 { 3372 {
3024 struct ev_loop *loop = w->other; 3373 EV_P = w->other;
3025 3374
3026 ev_loop_fork (EV_A); 3375 ev_loop_fork (EV_A);
3027 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3376 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3028 } 3377 }
3029 3378
3043{ 3392{
3044 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
3045 return; 3394 return;
3046 3395
3047 { 3396 {
3048 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
3049 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3398 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3050 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3399 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3051 } 3400 }
3052 3401
3053 EV_FREQUENT_CHECK; 3402 EV_FREQUENT_CHECK;
3165 3514
3166void 3515void
3167ev_async_send (EV_P_ ev_async *w) 3516ev_async_send (EV_P_ ev_async *w)
3168{ 3517{
3169 w->sent = 1; 3518 w->sent = 1;
3170 evpipe_write (EV_A_ &gotasync); 3519 evpipe_write (EV_A_ &async_pending);
3171} 3520}
3172#endif 3521#endif
3173 3522
3174/*****************************************************************************/ 3523/*****************************************************************************/
3175 3524
3324 if (types & EV_CHECK) 3673 if (types & EV_CHECK)
3325 for (i = checkcnt; i--; ) 3674 for (i = checkcnt; i--; )
3326 cb (EV_A_ EV_CHECK, checks [i]); 3675 cb (EV_A_ EV_CHECK, checks [i]);
3327 3676
3328 if (types & EV_SIGNAL) 3677 if (types & EV_SIGNAL)
3329 for (i = 0; i < signalmax; ++i) 3678 for (i = 0; i < EV_NSIG - 1; ++i)
3330 for (wl = signals [i].head; wl; ) 3679 for (wl = signals [i].head; wl; )
3331 { 3680 {
3332 wn = wl->next; 3681 wn = wl->next;
3333 cb (EV_A_ EV_SIGNAL, wl); 3682 cb (EV_A_ EV_SIGNAL, wl);
3334 wl = wn; 3683 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines