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

Comparing libev/ev.c (file contents):
Revision 1.331 by root, Tue Mar 9 08:55:03 2010 UTC vs.
Revision 1.350 by root, Sat Oct 16 00:59:56 2010 UTC

… …
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
88# endif 98# endif
89 99
100# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
103# endif
104# endif 107# endif
105 108
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
109# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
112# endif 116# endif
113 117
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 119# ifndef EV_USE_KQUEUE
117# else 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
118# define EV_USE_KQUEUE 0
119# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
120# endif 125# endif
121 126
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
125# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
128# endif 134# endif
129 135
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
136# endif 143# endif
137 144
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 146# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 147# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
144# endif 152# endif
145 153
154# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
188# endif 197# endif
189# undef EV_AVOID_STDIO 198# undef EV_AVOID_STDIO
190#endif 199#endif
200
201/* OS X, in its infinite idiocy, actually HARDCODES
202 * a limit of 1024 into their select. Where people have brains,
203 * OS X engineers apparently have a vacuum. Or maybe they were
204 * ordered to have a vacuum, or they do anything for money.
205 * This might help. Or not.
206 */
207#define _DARWIN_UNLIMITED_SELECT 1
191 208
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 209/* this block tries to deduce configuration from header-defined symbols and defaults */
193 210
194/* try to deduce the maximum number of signals on this platform */ 211/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 212#if defined (EV_NSIG)
… …
207#elif defined (MAXSIG) 224#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1) 225# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG) 226#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1) 227# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE) 228#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig) 230#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else 232#else
216# error "unable to find value for NSIG, please report" 233# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */ 234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
218# define EV_NSIG 65 236# define EV_NSIG 65
219#endif 237#endif
220 238
221#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
222# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
223# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
224# else 242# else
225# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
226# endif 244# endif
227#endif 245#endif
228 246
229#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
230# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
231# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
232# else 250# else
233# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
234# endif 252# endif
235#endif 253#endif
236 254
… …
238# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
239#endif 257#endif
240 258
241#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
242# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
243# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
244# else 262# else
245# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
246# endif 264# endif
247#endif 265#endif
248 266
249#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
250# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
251#endif 269#endif
252 270
253#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
254# ifdef _WIN32 272# ifdef _WIN32
255# define EV_USE_POLL 0 273# define EV_USE_POLL 0
256# else 274# else
257# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
258# endif 276# endif
259#endif 277#endif
260 278
261#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
263# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
264# else 282# else
265# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
266# endif 284# endif
267#endif 285#endif
268 286
… …
274# define EV_USE_PORT 0 292# define EV_USE_PORT 0
275#endif 293#endif
276 294
277#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
279# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
280# else 298# else
281# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
282# endif 300# endif
283#endif 301#endif
284 302
285#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
286# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
287# define EV_PID_HASHSIZE 1
288# else
289# define EV_PID_HASHSIZE 16
290# endif
291#endif 305#endif
292 306
293#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
294# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
295# define EV_INOTIFY_HASHSIZE 1
296# else
297# define EV_INOTIFY_HASHSIZE 16
298# endif
299#endif 309#endif
300 310
301#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
302# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
303# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
304# else 314# else
305# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
306# endif 316# endif
307#endif 317#endif
308 318
309#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
312# else 322# else
313# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
314# endif 324# endif
315#endif 325#endif
316 326
… …
319# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
320# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
321#endif 331#endif
322 332
323#ifndef EV_VERIFY 333#ifndef EV_VERIFY
324# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
325#endif 335#endif
326 336
327#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
328# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
329#endif 339#endif
330 340
331#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
332# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
333#endif 343#endif
334 344
335/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 345/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
336/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
438# ifdef __cplusplus 448# ifdef __cplusplus
439} 449}
440# endif 450# endif
441#endif 451#endif
442 452
443
444/**/ 453/**/
445 454
446#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
448#else 457#else
449# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
450#endif 459#endif
451 460
452/* 461/*
… …
460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
461 470
462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 471#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 472#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
464 473
474#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
475#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
476
465#if __GNUC__ >= 4 477#if __GNUC__ >= 4
466# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
467# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
468#else 480#else
469# define expect(expr,value) (expr) 481# define expect(expr,value) (expr)
… …
475 487
476#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
477#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
478#define inline_size static inline 490#define inline_size static inline
479 491
480#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
481# define inline_speed static noinline 495# define inline_speed static noinline
482#else
483# define inline_speed static inline
484#endif 496#endif
485 497
486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487 499
488#if EV_MINPRI == EV_MAXPRI 500#if EV_MINPRI == EV_MAXPRI
… …
501#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
502#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
503 515
504#if EV_USE_REALTIME 516#if EV_USE_REALTIME
505/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 517/* sig_atomic_t is used to avoid per-thread variables or locking but still */
506/* giving it a reasonably high chance of working on typical architetcures */ 518/* giving it a reasonably high chance of working on typical architectures */
507static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
508#endif 520#endif
509 521
510#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
568} 580}
569 581
570static void * 582static void *
571ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
572{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
573 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
574 * implement realloc (x, 0) (as required by both ansi c-98 and 589 * implement realloc (x, 0) (as required by both ansi c-89 and
575 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
576 */ 591 */
577 592
578 if (size) 593 if (size)
579 return realloc (ptr, size); 594 return realloc (ptr, size);
580 595
581 free (ptr); 596 free (ptr);
582 return 0; 597 return 0;
598#endif
583} 599}
584 600
585static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
586 602
587void 603void
… …
691 707
692 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
693 709
694#endif 710#endif
695 711
696#if EV_MINIMAL < 2 712#if EV_FEATURE_API
697# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 713# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
698# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 714# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
699# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
700#else 716#else
701# define EV_RELEASE_CB (void)0 717# define EV_RELEASE_CB (void)0
… …
755 if (delay > 0.) 771 if (delay > 0.)
756 { 772 {
757#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
758 struct timespec ts; 774 struct timespec ts;
759 775
760 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
761 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
762
763 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
764#elif defined(_WIN32) 778#elif defined(_WIN32)
765 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
766#else 780#else
767 struct timeval tv; 781 struct timeval tv;
768 782
769 tv.tv_sec = (time_t)delay;
770 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
771
772 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
773 /* something not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
774 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
775 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
776#endif 788#endif
777 } 789 }
778} 790}
779 791
780/*****************************************************************************/ 792/*****************************************************************************/
781 793
782#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
783 795
784/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
785/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
786inline_size int 798inline_size int
787array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
788{ 800{
789 int ncur = cur + 1; 801 int ncur = cur + 1;
790 802
… …
886} 898}
887 899
888/*****************************************************************************/ 900/*****************************************************************************/
889 901
890inline_speed void 902inline_speed void
891fd_event_nc (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
892{ 904{
893 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
894 ev_io *w; 906 ev_io *w;
895 907
896 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
908fd_event (EV_P_ int fd, int revents) 920fd_event (EV_P_ int fd, int revents)
909{ 921{
910 ANFD *anfd = anfds + fd; 922 ANFD *anfd = anfds + fd;
911 923
912 if (expect_true (!anfd->reify)) 924 if (expect_true (!anfd->reify))
913 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
914} 926}
915 927
916void 928void
917ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
918{ 930{
919 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
920 fd_event_nc (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
921} 933}
922 934
923/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
924/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
925inline_size void 937inline_size void
… …
931 { 943 {
932 int fd = fdchanges [i]; 944 int fd = fdchanges [i];
933 ANFD *anfd = anfds + fd; 945 ANFD *anfd = anfds + fd;
934 ev_io *w; 946 ev_io *w;
935 947
936 unsigned char events = 0; 948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
937 950
938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 951 anfd->reify = 0;
939 events |= (unsigned char)w->events;
940 952
941#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
942 if (events) 954 if (o_reify & EV__IOFDSET)
943 { 955 {
944 unsigned long arg; 956 unsigned long arg;
945 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
947 } 959 }
948#endif 960#endif
949 961
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
950 { 963 {
951 unsigned char o_events = anfd->events;
952 unsigned char o_reify = anfd->reify;
953
954 anfd->reify = 0;
955 anfd->events = events; 964 anfd->events = 0;
956 965
957 if (o_events != events || o_reify & EV__IOFDSET) 966 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
967 anfd->events |= (unsigned char)w->events;
968
969 if (o_events !=anfd-> events)
970 o_reify = EV__IOFDSET; /* actually |= */
971 }
972
973 if (o_reify & EV__IOFDSET)
958 backend_modify (EV_A_ fd, o_events, events); 974 backend_modify (EV_A_ fd, o_events, anfd->events);
959 }
960 } 975 }
961 976
962 fdchangecnt = 0; 977 fdchangecnt = 0;
963} 978}
964 979
… …
988 ev_io_stop (EV_A_ w); 1003 ev_io_stop (EV_A_ w);
989 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1004 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
990 } 1005 }
991} 1006}
992 1007
993/* check whether the given fd is atcually valid, for error recovery */ 1008/* check whether the given fd is actually valid, for error recovery */
994inline_size int 1009inline_size int
995fd_valid (int fd) 1010fd_valid (int fd)
996{ 1011{
997#ifdef _WIN32 1012#ifdef _WIN32
998 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1013 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1040 anfds [fd].emask = 0; 1055 anfds [fd].emask = 0;
1041 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1056 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1042 } 1057 }
1043} 1058}
1044 1059
1060/* used to prepare libev internal fd's */
1061/* this is not fork-safe */
1062inline_speed void
1063fd_intern (int fd)
1064{
1065#ifdef _WIN32
1066 unsigned long arg = 1;
1067 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1068#else
1069 fcntl (fd, F_SETFD, FD_CLOEXEC);
1070 fcntl (fd, F_SETFL, O_NONBLOCK);
1071#endif
1072}
1073
1045/*****************************************************************************/ 1074/*****************************************************************************/
1046 1075
1047/* 1076/*
1048 * the heap functions want a real array index. array index 0 uis guaranteed to not 1077 * the heap functions want a real array index. array index 0 is guaranteed to not
1049 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1078 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1050 * the branching factor of the d-tree. 1079 * the branching factor of the d-tree.
1051 */ 1080 */
1052 1081
1053/* 1082/*
… …
1201 1230
1202static ANSIG signals [EV_NSIG - 1]; 1231static ANSIG signals [EV_NSIG - 1];
1203 1232
1204/*****************************************************************************/ 1233/*****************************************************************************/
1205 1234
1206/* used to prepare libev internal fd's */ 1235#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1207/* this is not fork-safe */
1208inline_speed void
1209fd_intern (int fd)
1210{
1211#ifdef _WIN32
1212 unsigned long arg = 1;
1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1214#else
1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1217#endif
1218}
1219 1236
1220static void noinline 1237static void noinline
1221evpipe_init (EV_P) 1238evpipe_init (EV_P)
1222{ 1239{
1223 if (!ev_is_active (&pipe_w)) 1240 if (!ev_is_active (&pipe_w))
1224 { 1241 {
1225#if EV_USE_EVENTFD 1242# if EV_USE_EVENTFD
1226 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1243 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1227 if (evfd < 0 && errno == EINVAL) 1244 if (evfd < 0 && errno == EINVAL)
1228 evfd = eventfd (0, 0); 1245 evfd = eventfd (0, 0);
1229 1246
1230 if (evfd >= 0) 1247 if (evfd >= 0)
… …
1232 evpipe [0] = -1; 1249 evpipe [0] = -1;
1233 fd_intern (evfd); /* doing it twice doesn't hurt */ 1250 fd_intern (evfd); /* doing it twice doesn't hurt */
1234 ev_io_set (&pipe_w, evfd, EV_READ); 1251 ev_io_set (&pipe_w, evfd, EV_READ);
1235 } 1252 }
1236 else 1253 else
1237#endif 1254# endif
1238 { 1255 {
1239 while (pipe (evpipe)) 1256 while (pipe (evpipe))
1240 ev_syserr ("(libev) error creating signal/async pipe"); 1257 ev_syserr ("(libev) error creating signal/async pipe");
1241 1258
1242 fd_intern (evpipe [0]); 1259 fd_intern (evpipe [0]);
… …
1253evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1270evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1254{ 1271{
1255 if (!*flag) 1272 if (!*flag)
1256 { 1273 {
1257 int old_errno = errno; /* save errno because write might clobber it */ 1274 int old_errno = errno; /* save errno because write might clobber it */
1275 char dummy;
1258 1276
1259 *flag = 1; 1277 *flag = 1;
1260 1278
1261#if EV_USE_EVENTFD 1279#if EV_USE_EVENTFD
1262 if (evfd >= 0) 1280 if (evfd >= 0)
… …
1264 uint64_t counter = 1; 1282 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1283 write (evfd, &counter, sizeof (uint64_t));
1266 } 1284 }
1267 else 1285 else
1268#endif 1286#endif
1287 /* win32 people keep sending patches that change this write() to send() */
1288 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1289 /* so when you think this write should be a send instead, please find out */
1290 /* where your send() is from - it's definitely not the microsoft send, and */
1291 /* tell me. thank you. */
1269 write (evpipe [1], &old_errno, 1); 1292 write (evpipe [1], &dummy, 1);
1270 1293
1271 errno = old_errno; 1294 errno = old_errno;
1272 } 1295 }
1273} 1296}
1274 1297
… …
1287 } 1310 }
1288 else 1311 else
1289#endif 1312#endif
1290 { 1313 {
1291 char dummy; 1314 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1292 read (evpipe [0], &dummy, 1); 1316 read (evpipe [0], &dummy, 1);
1293 } 1317 }
1294 1318
1295 if (sig_pending) 1319 if (sig_pending)
1296 { 1320 {
… …
1375 break; 1399 break;
1376 } 1400 }
1377} 1401}
1378#endif 1402#endif
1379 1403
1404#endif
1405
1380/*****************************************************************************/ 1406/*****************************************************************************/
1381 1407
1408#if EV_CHILD_ENABLE
1382static WL childs [EV_PID_HASHSIZE]; 1409static WL childs [EV_PID_HASHSIZE];
1383
1384#ifndef _WIN32
1385 1410
1386static ev_signal childev; 1411static ev_signal childev;
1387 1412
1388#ifndef WIFCONTINUED 1413#ifndef WIFCONTINUED
1389# define WIFCONTINUED(status) 0 1414# define WIFCONTINUED(status) 0
… …
1394child_reap (EV_P_ int chain, int pid, int status) 1419child_reap (EV_P_ int chain, int pid, int status)
1395{ 1420{
1396 ev_child *w; 1421 ev_child *w;
1397 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1422 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1398 1423
1399 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1424 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1400 { 1425 {
1401 if ((w->pid == pid || !w->pid) 1426 if ((w->pid == pid || !w->pid)
1402 && (!traced || (w->flags & 1))) 1427 && (!traced || (w->flags & 1)))
1403 { 1428 {
1404 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1429 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1429 /* make sure we are called again until all children have been reaped */ 1454 /* make sure we are called again until all children have been reaped */
1430 /* we need to do it this way so that the callback gets called before we continue */ 1455 /* we need to do it this way so that the callback gets called before we continue */
1431 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1456 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1432 1457
1433 child_reap (EV_A_ pid, pid, status); 1458 child_reap (EV_A_ pid, pid, status);
1434 if (EV_PID_HASHSIZE > 1) 1459 if ((EV_PID_HASHSIZE) > 1)
1435 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1460 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1436} 1461}
1437 1462
1438#endif 1463#endif
1439 1464
… …
1506#ifdef __APPLE__ 1531#ifdef __APPLE__
1507 /* only select works correctly on that "unix-certified" platform */ 1532 /* only select works correctly on that "unix-certified" platform */
1508 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1533 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1509 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1534 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1510#endif 1535#endif
1536#ifdef __FreeBSD__
1537 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1538#endif
1511 1539
1512 return flags; 1540 return flags;
1513} 1541}
1514 1542
1515unsigned int 1543unsigned int
… …
1528ev_backend (EV_P) 1556ev_backend (EV_P)
1529{ 1557{
1530 return backend; 1558 return backend;
1531} 1559}
1532 1560
1533#if EV_MINIMAL < 2 1561#if EV_FEATURE_API
1534unsigned int 1562unsigned int
1535ev_loop_count (EV_P) 1563ev_iteration (EV_P)
1536{ 1564{
1537 return loop_count; 1565 return loop_count;
1538} 1566}
1539 1567
1540unsigned int 1568unsigned int
1541ev_loop_depth (EV_P) 1569ev_depth (EV_P)
1542{ 1570{
1543 return loop_depth; 1571 return loop_depth;
1544} 1572}
1545 1573
1546void 1574void
… …
1618 1646
1619 ev_rt_now = ev_time (); 1647 ev_rt_now = ev_time ();
1620 mn_now = get_clock (); 1648 mn_now = get_clock ();
1621 now_floor = mn_now; 1649 now_floor = mn_now;
1622 rtmn_diff = ev_rt_now - mn_now; 1650 rtmn_diff = ev_rt_now - mn_now;
1623#if EV_MINIMAL < 2 1651#if EV_FEATURE_API
1624 invoke_cb = ev_invoke_pending; 1652 invoke_cb = ev_invoke_pending;
1625#endif 1653#endif
1626 1654
1627 io_blocktime = 0.; 1655 io_blocktime = 0.;
1628 timeout_blocktime = 0.; 1656 timeout_blocktime = 0.;
… …
1658 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1686 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1659#endif 1687#endif
1660 1688
1661 ev_prepare_init (&pending_w, pendingcb); 1689 ev_prepare_init (&pending_w, pendingcb);
1662 1690
1691#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1663 ev_init (&pipe_w, pipecb); 1692 ev_init (&pipe_w, pipecb);
1664 ev_set_priority (&pipe_w, EV_MAXPRI); 1693 ev_set_priority (&pipe_w, EV_MAXPRI);
1694#endif
1665 } 1695 }
1666} 1696}
1667 1697
1668/* free up a loop structure */ 1698/* free up a loop structure */
1669static void noinline 1699static void noinline
… …
1787 { 1817 {
1788 EV_WIN32_CLOSE_FD (evpipe [0]); 1818 EV_WIN32_CLOSE_FD (evpipe [0]);
1789 EV_WIN32_CLOSE_FD (evpipe [1]); 1819 EV_WIN32_CLOSE_FD (evpipe [1]);
1790 } 1820 }
1791 1821
1822#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1792 evpipe_init (EV_A); 1823 evpipe_init (EV_A);
1793 /* now iterate over everything, in case we missed something */ 1824 /* now iterate over everything, in case we missed something */
1794 pipecb (EV_A_ &pipe_w, EV_READ); 1825 pipecb (EV_A_ &pipe_w, EV_READ);
1826#endif
1795 } 1827 }
1796 1828
1797 postfork = 0; 1829 postfork = 0;
1798} 1830}
1799 1831
… …
1861 verify_watcher (EV_A_ ws [cnt]); 1893 verify_watcher (EV_A_ ws [cnt]);
1862 } 1894 }
1863} 1895}
1864#endif 1896#endif
1865 1897
1866#if EV_MINIMAL < 2 1898#if EV_FEATURE_API
1867void 1899void
1868ev_loop_verify (EV_P) 1900ev_verify (EV_P)
1869{ 1901{
1870#if EV_VERIFY 1902#if EV_VERIFY
1871 int i; 1903 int i;
1872 WL w; 1904 WL w;
1873 1905
… …
1912#if EV_ASYNC_ENABLE 1944#if EV_ASYNC_ENABLE
1913 assert (asyncmax >= asynccnt); 1945 assert (asyncmax >= asynccnt);
1914 array_verify (EV_A_ (W *)asyncs, asynccnt); 1946 array_verify (EV_A_ (W *)asyncs, asynccnt);
1915#endif 1947#endif
1916 1948
1949#if EV_PREPARE_ENABLE
1917 assert (preparemax >= preparecnt); 1950 assert (preparemax >= preparecnt);
1918 array_verify (EV_A_ (W *)prepares, preparecnt); 1951 array_verify (EV_A_ (W *)prepares, preparecnt);
1952#endif
1919 1953
1954#if EV_CHECK_ENABLE
1920 assert (checkmax >= checkcnt); 1955 assert (checkmax >= checkcnt);
1921 array_verify (EV_A_ (W *)checks, checkcnt); 1956 array_verify (EV_A_ (W *)checks, checkcnt);
1957#endif
1922 1958
1923# if 0 1959# if 0
1960#if EV_CHILD_ENABLE
1924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1961 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1962 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1963#endif
1926# endif 1964# endif
1927#endif 1965#endif
1928} 1966}
1929#endif 1967#endif
1930 1968
… …
1946 1984
1947 loop_init (EV_A_ flags); 1985 loop_init (EV_A_ flags);
1948 1986
1949 if (ev_backend (EV_A)) 1987 if (ev_backend (EV_A))
1950 { 1988 {
1951#ifndef _WIN32 1989#if EV_CHILD_ENABLE
1952 ev_signal_init (&childev, childcb, SIGCHLD); 1990 ev_signal_init (&childev, childcb, SIGCHLD);
1953 ev_set_priority (&childev, EV_MAXPRI); 1991 ev_set_priority (&childev, EV_MAXPRI);
1954 ev_signal_start (EV_A_ &childev); 1992 ev_signal_start (EV_A_ &childev);
1955 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1993 ev_unref (EV_A); /* child watcher should not keep loop alive */
1956#endif 1994#endif
… …
1969 EV_P = ev_default_loop_ptr; 2007 EV_P = ev_default_loop_ptr;
1970#endif 2008#endif
1971 2009
1972 ev_default_loop_ptr = 0; 2010 ev_default_loop_ptr = 0;
1973 2011
1974#ifndef _WIN32 2012#if EV_CHILD_ENABLE
1975 ev_ref (EV_A); /* child watcher */ 2013 ev_ref (EV_A); /* child watcher */
1976 ev_signal_stop (EV_A_ &childev); 2014 ev_signal_stop (EV_A_ &childev);
1977#endif 2015#endif
1978 2016
1979 loop_destroy (EV_A); 2017 loop_destroy (EV_A);
… …
2085 EV_FREQUENT_CHECK; 2123 EV_FREQUENT_CHECK;
2086 feed_reverse (EV_A_ (W)w); 2124 feed_reverse (EV_A_ (W)w);
2087 } 2125 }
2088 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2126 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2089 2127
2090 feed_reverse_done (EV_A_ EV_TIMEOUT); 2128 feed_reverse_done (EV_A_ EV_TIMER);
2091 } 2129 }
2092} 2130}
2093 2131
2094#if EV_PERIODIC_ENABLE 2132#if EV_PERIODIC_ENABLE
2095/* make periodics pending */ 2133/* make periodics pending */
… …
2148 feed_reverse_done (EV_A_ EV_PERIODIC); 2186 feed_reverse_done (EV_A_ EV_PERIODIC);
2149 } 2187 }
2150} 2188}
2151 2189
2152/* simply recalculate all periodics */ 2190/* simply recalculate all periodics */
2153/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2191/* TODO: maybe ensure that at least one event happens when jumping forward? */
2154static void noinline 2192static void noinline
2155periodics_reschedule (EV_P) 2193periodics_reschedule (EV_P)
2156{ 2194{
2157 int i; 2195 int i;
2158 2196
… …
2256} 2294}
2257 2295
2258void 2296void
2259ev_loop (EV_P_ int flags) 2297ev_loop (EV_P_ int flags)
2260{ 2298{
2261#if EV_MINIMAL < 2 2299#if EV_FEATURE_API
2262 ++loop_depth; 2300 ++loop_depth;
2263#endif 2301#endif
2264 2302
2265 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2266 2304
… …
2269 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2270 2308
2271 do 2309 do
2272 { 2310 {
2273#if EV_VERIFY >= 2 2311#if EV_VERIFY >= 2
2274 ev_loop_verify (EV_A); 2312 ev_verify (EV_A);
2275#endif 2313#endif
2276 2314
2277#ifndef _WIN32 2315#ifndef _WIN32
2278 if (expect_false (curpid)) /* penalise the forking check even more */ 2316 if (expect_false (curpid)) /* penalise the forking check even more */
2279 if (expect_false (getpid () != curpid)) 2317 if (expect_false (getpid () != curpid))
… …
2291 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2329 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2292 EV_INVOKE_PENDING; 2330 EV_INVOKE_PENDING;
2293 } 2331 }
2294#endif 2332#endif
2295 2333
2334#if EV_PREPARE_ENABLE
2296 /* queue prepare watchers (and execute them) */ 2335 /* queue prepare watchers (and execute them) */
2297 if (expect_false (preparecnt)) 2336 if (expect_false (preparecnt))
2298 { 2337 {
2299 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2338 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2300 EV_INVOKE_PENDING; 2339 EV_INVOKE_PENDING;
2301 } 2340 }
2341#endif
2302 2342
2303 if (expect_false (loop_done)) 2343 if (expect_false (loop_done))
2304 break; 2344 break;
2305 2345
2306 /* we might have forked, so reify kernel state if necessary */ 2346 /* we might have forked, so reify kernel state if necessary */
… …
2357 waittime -= sleeptime; 2397 waittime -= sleeptime;
2358 } 2398 }
2359 } 2399 }
2360 } 2400 }
2361 2401
2362#if EV_MINIMAL < 2 2402#if EV_FEATURE_API
2363 ++loop_count; 2403 ++loop_count;
2364#endif 2404#endif
2365 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2366 backend_poll (EV_A_ waittime); 2406 backend_poll (EV_A_ waittime);
2367 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2379#if EV_IDLE_ENABLE 2419#if EV_IDLE_ENABLE
2380 /* queue idle watchers unless other events are pending */ 2420 /* queue idle watchers unless other events are pending */
2381 idle_reify (EV_A); 2421 idle_reify (EV_A);
2382#endif 2422#endif
2383 2423
2424#if EV_CHECK_ENABLE
2384 /* queue check watchers, to be executed first */ 2425 /* queue check watchers, to be executed first */
2385 if (expect_false (checkcnt)) 2426 if (expect_false (checkcnt))
2386 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2427 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2428#endif
2387 2429
2388 EV_INVOKE_PENDING; 2430 EV_INVOKE_PENDING;
2389 } 2431 }
2390 while (expect_true ( 2432 while (expect_true (
2391 activecnt 2433 activecnt
… …
2394 )); 2436 ));
2395 2437
2396 if (loop_done == EVUNLOOP_ONE) 2438 if (loop_done == EVUNLOOP_ONE)
2397 loop_done = EVUNLOOP_CANCEL; 2439 loop_done = EVUNLOOP_CANCEL;
2398 2440
2399#if EV_MINIMAL < 2 2441#if EV_FEATURE_API
2400 --loop_depth; 2442 --loop_depth;
2401#endif 2443#endif
2402} 2444}
2403 2445
2404void 2446void
… …
2558 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2559 2601
2560 wlist_del (&anfds[w->fd].head, (WL)w); 2602 wlist_del (&anfds[w->fd].head, (WL)w);
2561 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2562 2604
2563 fd_change (EV_A_ w->fd, 1); 2605 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2564 2606
2565 EV_FREQUENT_CHECK; 2607 EV_FREQUENT_CHECK;
2566} 2608}
2567 2609
2568void noinline 2610void noinline
… …
2721 2763
2722#ifndef SA_RESTART 2764#ifndef SA_RESTART
2723# define SA_RESTART 0 2765# define SA_RESTART 0
2724#endif 2766#endif
2725 2767
2768#if EV_SIGNAL_ENABLE
2769
2726void noinline 2770void noinline
2727ev_signal_start (EV_P_ ev_signal *w) 2771ev_signal_start (EV_P_ ev_signal *w)
2728{ 2772{
2729 if (expect_false (ev_is_active (w))) 2773 if (expect_false (ev_is_active (w)))
2730 return; 2774 return;
… …
2836 } 2880 }
2837 2881
2838 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
2839} 2883}
2840 2884
2885#endif
2886
2887#if EV_CHILD_ENABLE
2888
2841void 2889void
2842ev_child_start (EV_P_ ev_child *w) 2890ev_child_start (EV_P_ ev_child *w)
2843{ 2891{
2844#if EV_MULTIPLICITY 2892#if EV_MULTIPLICITY
2845 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2893 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2848 return; 2896 return;
2849 2897
2850 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2851 2899
2852 ev_start (EV_A_ (W)w, 1); 2900 ev_start (EV_A_ (W)w, 1);
2853 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2854 2902
2855 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2856} 2904}
2857 2905
2858void 2906void
… …
2862 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2863 return; 2911 return;
2864 2912
2865 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2866 2914
2867 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2915 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2868 ev_stop (EV_A_ (W)w); 2916 ev_stop (EV_A_ (W)w);
2869 2917
2870 EV_FREQUENT_CHECK; 2918 EV_FREQUENT_CHECK;
2871} 2919}
2920
2921#endif
2872 2922
2873#if EV_STAT_ENABLE 2923#if EV_STAT_ENABLE
2874 2924
2875# ifdef _WIN32 2925# ifdef _WIN32
2876# undef lstat 2926# undef lstat
… …
2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2944 } 2994 }
2945 } 2995 }
2946 2996
2947 if (w->wd >= 0) 2997 if (w->wd >= 0)
2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2998 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2949 2999
2950 /* now re-arm timer, if required */ 3000 /* now re-arm timer, if required */
2951 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3001 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2952 ev_timer_again (EV_A_ &w->timer); 3002 ev_timer_again (EV_A_ &w->timer);
2953 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3003 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2961 3011
2962 if (wd < 0) 3012 if (wd < 0)
2963 return; 3013 return;
2964 3014
2965 w->wd = -2; 3015 w->wd = -2;
2966 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3016 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2967 wlist_del (&fs_hash [slot].head, (WL)w); 3017 wlist_del (&fs_hash [slot].head, (WL)w);
2968 3018
2969 /* remove this watcher, if others are watching it, they will rearm */ 3019 /* remove this watcher, if others are watching it, they will rearm */
2970 inotify_rm_watch (fs_fd, wd); 3020 inotify_rm_watch (fs_fd, wd);
2971} 3021}
… …
2973static void noinline 3023static void noinline
2974infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3024infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2975{ 3025{
2976 if (slot < 0) 3026 if (slot < 0)
2977 /* overflow, need to check for all hash slots */ 3027 /* overflow, need to check for all hash slots */
2978 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3028 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2979 infy_wd (EV_A_ slot, wd, ev); 3029 infy_wd (EV_A_ slot, wd, ev);
2980 else 3030 else
2981 { 3031 {
2982 WL w_; 3032 WL w_;
2983 3033
2984 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3034 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2985 { 3035 {
2986 ev_stat *w = (ev_stat *)w_; 3036 ev_stat *w = (ev_stat *)w_;
2987 w_ = w_->next; /* lets us remove this watcher and all before it */ 3037 w_ = w_->next; /* lets us remove this watcher and all before it */
2988 3038
2989 if (w->wd == wd || wd == -1) 3039 if (w->wd == wd || wd == -1)
2990 { 3040 {
2991 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3041 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2992 { 3042 {
2993 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3043 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2994 w->wd = -1; 3044 w->wd = -1;
2995 infy_add (EV_A_ w); /* re-add, no matter what */ 3045 infy_add (EV_A_ w); /* re-add, no matter what */
2996 } 3046 }
2997 3047
2998 stat_timer_cb (EV_A_ &w->timer, 0); 3048 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3112 ev_io_set (&fs_w, fs_fd, EV_READ); 3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w); 3163 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A); 3164 ev_unref (EV_A);
3115 } 3165 }
3116 3166
3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3118 { 3168 {
3119 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
3120 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
3121 3171
3122 while (w_) 3172 while (w_)
… …
3297 3347
3298 EV_FREQUENT_CHECK; 3348 EV_FREQUENT_CHECK;
3299} 3349}
3300#endif 3350#endif
3301 3351
3352#if EV_PREPARE_ENABLE
3302void 3353void
3303ev_prepare_start (EV_P_ ev_prepare *w) 3354ev_prepare_start (EV_P_ ev_prepare *w)
3304{ 3355{
3305 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
3306 return; 3357 return;
… …
3332 3383
3333 ev_stop (EV_A_ (W)w); 3384 ev_stop (EV_A_ (W)w);
3334 3385
3335 EV_FREQUENT_CHECK; 3386 EV_FREQUENT_CHECK;
3336} 3387}
3388#endif
3337 3389
3390#if EV_CHECK_ENABLE
3338void 3391void
3339ev_check_start (EV_P_ ev_check *w) 3392ev_check_start (EV_P_ ev_check *w)
3340{ 3393{
3341 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
3342 return; 3395 return;
… …
3368 3421
3369 ev_stop (EV_A_ (W)w); 3422 ev_stop (EV_A_ (W)w);
3370 3423
3371 EV_FREQUENT_CHECK; 3424 EV_FREQUENT_CHECK;
3372} 3425}
3426#endif
3373 3427
3374#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
3375void noinline 3429void noinline
3376ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
3377{ 3431{
… …
3609{ 3663{
3610 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3664 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3611 3665
3612 if (expect_false (!once)) 3666 if (expect_false (!once))
3613 { 3667 {
3614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3668 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3615 return; 3669 return;
3616 } 3670 }
3617 3671
3618 once->cb = cb; 3672 once->cb = cb;
3619 once->arg = arg; 3673 once->arg = arg;
… …
3706 if (types & EV_ASYNC) 3760 if (types & EV_ASYNC)
3707 for (i = asynccnt; i--; ) 3761 for (i = asynccnt; i--; )
3708 cb (EV_A_ EV_ASYNC, asyncs [i]); 3762 cb (EV_A_ EV_ASYNC, asyncs [i]);
3709#endif 3763#endif
3710 3764
3765#if EV_PREPARE_ENABLE
3711 if (types & EV_PREPARE) 3766 if (types & EV_PREPARE)
3712 for (i = preparecnt; i--; ) 3767 for (i = preparecnt; i--; )
3713#if EV_EMBED_ENABLE 3768# if EV_EMBED_ENABLE
3714 if (ev_cb (prepares [i]) != embed_prepare_cb) 3769 if (ev_cb (prepares [i]) != embed_prepare_cb)
3715#endif 3770# endif
3716 cb (EV_A_ EV_PREPARE, prepares [i]); 3771 cb (EV_A_ EV_PREPARE, prepares [i]);
3772#endif
3717 3773
3774#if EV_CHECK_ENABLE
3718 if (types & EV_CHECK) 3775 if (types & EV_CHECK)
3719 for (i = checkcnt; i--; ) 3776 for (i = checkcnt; i--; )
3720 cb (EV_A_ EV_CHECK, checks [i]); 3777 cb (EV_A_ EV_CHECK, checks [i]);
3778#endif
3721 3779
3780#if EV_SIGNAL_ENABLE
3722 if (types & EV_SIGNAL) 3781 if (types & EV_SIGNAL)
3723 for (i = 0; i < EV_NSIG - 1; ++i) 3782 for (i = 0; i < EV_NSIG - 1; ++i)
3724 for (wl = signals [i].head; wl; ) 3783 for (wl = signals [i].head; wl; )
3725 { 3784 {
3726 wn = wl->next; 3785 wn = wl->next;
3727 cb (EV_A_ EV_SIGNAL, wl); 3786 cb (EV_A_ EV_SIGNAL, wl);
3728 wl = wn; 3787 wl = wn;
3729 } 3788 }
3789#endif
3730 3790
3791#if EV_CHILD_ENABLE
3731 if (types & EV_CHILD) 3792 if (types & EV_CHILD)
3732 for (i = EV_PID_HASHSIZE; i--; ) 3793 for (i = (EV_PID_HASHSIZE); i--; )
3733 for (wl = childs [i]; wl; ) 3794 for (wl = childs [i]; wl; )
3734 { 3795 {
3735 wn = wl->next; 3796 wn = wl->next;
3736 cb (EV_A_ EV_CHILD, wl); 3797 cb (EV_A_ EV_CHILD, wl);
3737 wl = wn; 3798 wl = wn;
3738 } 3799 }
3800#endif
3739/* EV_STAT 0x00001000 /* stat data changed */ 3801/* EV_STAT 0x00001000 /* stat data changed */
3740/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3802/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3741} 3803}
3742#endif 3804#endif
3743 3805

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines