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

Comparing libev/ev.c (file contents):
Revision 1.335 by root, Tue Mar 9 09:02:03 2010 UTC vs.
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 115# ifndef EV_USE_KQUEUE
117# else 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
… …
172#ifdef EV_H 177#ifdef EV_H
173# include EV_H 178# include EV_H
174#else 179#else
175# include "ev.h" 180# include "ev.h"
176#endif 181#endif
182
183EV_CPP(extern "C" {)
177 184
178#ifndef _WIN32 185#ifndef _WIN32
179# include <sys/time.h> 186# include <sys/time.h>
180# include <sys/wait.h> 187# include <sys/wait.h>
181# include <unistd.h> 188# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
188# endif 195# endif
189# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
190#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
191 206
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
193 208
194/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
207#elif defined (MAXSIG) 222#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else 230#else
216# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
218# define EV_NSIG 65 234# define EV_NSIG 65
219#endif 235#endif
220 236
221#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
222# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
223# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
224# else 240# else
225# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
226# endif 242# endif
227#endif 243#endif
228 244
229#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
230# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
231# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
232# else 248# else
233# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
234# endif 250# endif
235#endif 251#endif
236 252
… …
238# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
239#endif 255#endif
240 256
241#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
242# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
243# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
244# else 260# else
245# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
246# endif 262# endif
247#endif 263#endif
248 264
249#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
250# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
251#endif 267#endif
252 268
253#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
254# ifdef _WIN32 270# ifdef _WIN32
255# define EV_USE_POLL 0 271# define EV_USE_POLL 0
256# else 272# else
257# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
258# endif 274# endif
259#endif 275#endif
260 276
261#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
263# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
264# else 280# else
265# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
266# endif 282# endif
267#endif 283#endif
268 284
… …
274# define EV_USE_PORT 0 290# define EV_USE_PORT 0
275#endif 291#endif
276 292
277#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
279# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
280# else 296# else
281# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
282# endif 298# endif
283#endif 299#endif
284 300
285#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
286# if EV_MINIMAL 302# 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 303#endif
292 304
293#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
294# if EV_MINIMAL 306# 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 307#endif
300 308
301#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
302# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
303# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
304# else 312# else
305# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
306# endif 314# endif
307#endif 315#endif
308 316
309#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
312# else 320# else
313# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
314# endif 322# endif
315#endif 323#endif
316 324
… …
319# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
320# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
321#endif 329#endif
322 330
323#ifndef EV_VERIFY 331#ifndef EV_VERIFY
324# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
325#endif 333#endif
326 334
327#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
328# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
329#endif 337#endif
330 338
331#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
332# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
333#endif 341#endif
334 342
335/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* 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. */ 344/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
374# include <sys/select.h> 382# include <sys/select.h>
375# endif 383# endif
376#endif 384#endif
377 385
378#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
379# include <sys/utsname.h>
380# include <sys/statfs.h> 387# include <sys/statfs.h>
381# include <sys/inotify.h> 388# include <sys/inotify.h>
382/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
383# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
384# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
401# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
402# else 409# else
403# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
404# endif 411# endif
405# endif 412# endif
406# ifdef __cplusplus
407extern "C" {
408# endif
409int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
410# ifdef __cplusplus
411}
412# endif
413#endif 414#endif
414 415
415#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h> 418# include <stdint.h>
… …
423# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
424# else 425# else
425# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
426# endif 427# endif
427# endif 428# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
432 430
433struct signalfd_siginfo 431struct signalfd_siginfo
434{ 432{
435 uint32_t ssi_signo; 433 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
437}; 435};
438# ifdef __cplusplus
439}
440# endif 436#endif
441#endif
442
443 437
444/**/ 438/**/
445 439
446#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
448#else 442#else
449# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
450#endif 444#endif
451 445
452/* 446/*
… …
460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
461 455
462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#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) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
464 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
465#if __GNUC__ >= 4 462#if __GNUC__ >= 4
466# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
467# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
468#else 465#else
469# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
475 472
476#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
477#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
478#define inline_size static inline 475#define inline_size static inline
479 476
480#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
481# define inline_speed static noinline 480# define inline_speed static noinline
482#else
483# define inline_speed static inline
484#endif 481#endif
485 482
486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487 484
488#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
501#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
502#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
503 500
504#if EV_USE_REALTIME 501#if EV_USE_REALTIME
505/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* 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 */ 503/* giving it a reasonably high chance of working on typical architectures */
507static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
508#endif 505#endif
509 506
510#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
522#endif 519#endif
523 520
524#ifdef _WIN32 521#ifdef _WIN32
525# include "ev_win32.c" 522# include "ev_win32.c"
526#endif 523#endif
524
525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
527 566
528/*****************************************************************************/ 567/*****************************************************************************/
529 568
530#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
531static void noinline 570static void noinline
… …
695 734
696 static int ev_default_loop_ptr; 735 static int ev_default_loop_ptr;
697 736
698#endif 737#endif
699 738
700#if EV_MINIMAL < 2 739#if EV_FEATURE_API
701# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 740# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
702# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 741# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
703# define EV_INVOKE_PENDING invoke_cb (EV_A) 742# define EV_INVOKE_PENDING invoke_cb (EV_A)
704#else 743#else
705# define EV_RELEASE_CB (void)0 744# define EV_RELEASE_CB (void)0
706# define EV_ACQUIRE_CB (void)0 745# define EV_ACQUIRE_CB (void)0
707# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 746# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
708#endif 747#endif
709 748
710#define EVUNLOOP_RECURSE 0x80 749#define EVBREAK_RECURSE 0x80
711 750
712/*****************************************************************************/ 751/*****************************************************************************/
713 752
714#ifndef EV_HAVE_EV_TIME 753#ifndef EV_HAVE_EV_TIME
715ev_tstamp 754ev_tstamp
… …
759 if (delay > 0.) 798 if (delay > 0.)
760 { 799 {
761#if EV_USE_NANOSLEEP 800#if EV_USE_NANOSLEEP
762 struct timespec ts; 801 struct timespec ts;
763 802
764 ts.tv_sec = (time_t)delay; 803 EV_TS_SET (ts, delay);
765 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
766
767 nanosleep (&ts, 0); 804 nanosleep (&ts, 0);
768#elif defined(_WIN32) 805#elif defined(_WIN32)
769 Sleep ((unsigned long)(delay * 1e3)); 806 Sleep ((unsigned long)(delay * 1e3));
770#else 807#else
771 struct timeval tv; 808 struct timeval tv;
772 809
773 tv.tv_sec = (time_t)delay;
774 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
775
776 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 810 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
777 /* something not guaranteed by newer posix versions, but guaranteed */ 811 /* something not guaranteed by newer posix versions, but guaranteed */
778 /* by older ones */ 812 /* by older ones */
813 EV_TV_SET (tv, delay);
779 select (0, 0, 0, 0, &tv); 814 select (0, 0, 0, 0, &tv);
780#endif 815#endif
781 } 816 }
782} 817}
783 818
784/*****************************************************************************/ 819/*****************************************************************************/
785 820
786#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 821#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
787 822
788/* find a suitable new size for the given array, */ 823/* find a suitable new size for the given array, */
789/* hopefully by rounding to a ncie-to-malloc size */ 824/* hopefully by rounding to a nice-to-malloc size */
790inline_size int 825inline_size int
791array_nextsize (int elem, int cur, int cnt) 826array_nextsize (int elem, int cur, int cnt)
792{ 827{
793 int ncur = cur + 1; 828 int ncur = cur + 1;
794 829
… …
890} 925}
891 926
892/*****************************************************************************/ 927/*****************************************************************************/
893 928
894inline_speed void 929inline_speed void
895fd_event_nc (EV_P_ int fd, int revents) 930fd_event_nocheck (EV_P_ int fd, int revents)
896{ 931{
897 ANFD *anfd = anfds + fd; 932 ANFD *anfd = anfds + fd;
898 ev_io *w; 933 ev_io *w;
899 934
900 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
912fd_event (EV_P_ int fd, int revents) 947fd_event (EV_P_ int fd, int revents)
913{ 948{
914 ANFD *anfd = anfds + fd; 949 ANFD *anfd = anfds + fd;
915 950
916 if (expect_true (!anfd->reify)) 951 if (expect_true (!anfd->reify))
917 fd_event_nc (EV_A_ fd, revents); 952 fd_event_nocheck (EV_A_ fd, revents);
918} 953}
919 954
920void 955void
921ev_feed_fd_event (EV_P_ int fd, int revents) 956ev_feed_fd_event (EV_P_ int fd, int revents)
922{ 957{
923 if (fd >= 0 && fd < anfdmax) 958 if (fd >= 0 && fd < anfdmax)
924 fd_event_nc (EV_A_ fd, revents); 959 fd_event_nocheck (EV_A_ fd, revents);
925} 960}
926 961
927/* make sure the external fd watch events are in-sync */ 962/* make sure the external fd watch events are in-sync */
928/* with the kernel/libev internal state */ 963/* with the kernel/libev internal state */
929inline_size void 964inline_size void
… …
935 { 970 {
936 int fd = fdchanges [i]; 971 int fd = fdchanges [i];
937 ANFD *anfd = anfds + fd; 972 ANFD *anfd = anfds + fd;
938 ev_io *w; 973 ev_io *w;
939 974
940 unsigned char events = 0; 975 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify;
941 977
942 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 978 anfd->reify = 0;
943 events |= (unsigned char)w->events;
944 979
945#if EV_SELECT_IS_WINSOCKET 980#if EV_SELECT_IS_WINSOCKET
946 if (events) 981 if (o_reify & EV__IOFDSET)
947 { 982 {
948 unsigned long arg; 983 unsigned long arg;
949 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
950 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 985 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
951 } 986 }
952#endif 987#endif
953 988
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
954 { 990 {
955 unsigned char o_events = anfd->events;
956 unsigned char o_reify = anfd->reify;
957
958 anfd->reify = 0;
959 anfd->events = events; 991 anfd->events = 0;
960 992
961 if (o_events != events || o_reify & EV__IOFDSET) 993 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
994 anfd->events |= (unsigned char)w->events;
995
996 if (o_events != anfd->events)
997 o_reify = EV__IOFDSET; /* actually |= */
998 }
999
1000 if (o_reify & EV__IOFDSET)
962 backend_modify (EV_A_ fd, o_events, events); 1001 backend_modify (EV_A_ fd, o_events, anfd->events);
963 }
964 } 1002 }
965 1003
966 fdchangecnt = 0; 1004 fdchangecnt = 0;
967} 1005}
968 1006
… …
992 ev_io_stop (EV_A_ w); 1030 ev_io_stop (EV_A_ w);
993 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1031 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
994 } 1032 }
995} 1033}
996 1034
997/* check whether the given fd is atcually valid, for error recovery */ 1035/* check whether the given fd is actually valid, for error recovery */
998inline_size int 1036inline_size int
999fd_valid (int fd) 1037fd_valid (int fd)
1000{ 1038{
1001#ifdef _WIN32 1039#ifdef _WIN32
1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1040 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1044 anfds [fd].emask = 0; 1082 anfds [fd].emask = 0;
1045 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1083 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1046 } 1084 }
1047} 1085}
1048 1086
1087/* used to prepare libev internal fd's */
1088/* this is not fork-safe */
1089inline_speed void
1090fd_intern (int fd)
1091{
1092#ifdef _WIN32
1093 unsigned long arg = 1;
1094 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1095#else
1096 fcntl (fd, F_SETFD, FD_CLOEXEC);
1097 fcntl (fd, F_SETFL, O_NONBLOCK);
1098#endif
1099}
1100
1049/*****************************************************************************/ 1101/*****************************************************************************/
1050 1102
1051/* 1103/*
1052 * the heap functions want a real array index. array index 0 uis guaranteed to not 1104 * the heap functions want a real array index. array index 0 is guaranteed to not
1053 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1105 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1054 * the branching factor of the d-tree. 1106 * the branching factor of the d-tree.
1055 */ 1107 */
1056 1108
1057/* 1109/*
… …
1205 1257
1206static ANSIG signals [EV_NSIG - 1]; 1258static ANSIG signals [EV_NSIG - 1];
1207 1259
1208/*****************************************************************************/ 1260/*****************************************************************************/
1209 1261
1210/* used to prepare libev internal fd's */ 1262#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1211/* this is not fork-safe */
1212inline_speed void
1213fd_intern (int fd)
1214{
1215#ifdef _WIN32
1216 unsigned long arg = 1;
1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1218#else
1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1221#endif
1222}
1223 1263
1224static void noinline 1264static void noinline
1225evpipe_init (EV_P) 1265evpipe_init (EV_P)
1226{ 1266{
1227 if (!ev_is_active (&pipe_w)) 1267 if (!ev_is_active (&pipe_w))
1228 { 1268 {
1229#if EV_USE_EVENTFD 1269# if EV_USE_EVENTFD
1230 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1270 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1231 if (evfd < 0 && errno == EINVAL) 1271 if (evfd < 0 && errno == EINVAL)
1232 evfd = eventfd (0, 0); 1272 evfd = eventfd (0, 0);
1233 1273
1234 if (evfd >= 0) 1274 if (evfd >= 0)
… …
1236 evpipe [0] = -1; 1276 evpipe [0] = -1;
1237 fd_intern (evfd); /* doing it twice doesn't hurt */ 1277 fd_intern (evfd); /* doing it twice doesn't hurt */
1238 ev_io_set (&pipe_w, evfd, EV_READ); 1278 ev_io_set (&pipe_w, evfd, EV_READ);
1239 } 1279 }
1240 else 1280 else
1241#endif 1281# endif
1242 { 1282 {
1243 while (pipe (evpipe)) 1283 while (pipe (evpipe))
1244 ev_syserr ("(libev) error creating signal/async pipe"); 1284 ev_syserr ("(libev) error creating signal/async pipe");
1245 1285
1246 fd_intern (evpipe [0]); 1286 fd_intern (evpipe [0]);
… …
1257evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1297evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1258{ 1298{
1259 if (!*flag) 1299 if (!*flag)
1260 { 1300 {
1261 int old_errno = errno; /* save errno because write might clobber it */ 1301 int old_errno = errno; /* save errno because write might clobber it */
1302 char dummy;
1262 1303
1263 *flag = 1; 1304 *flag = 1;
1264 1305
1265#if EV_USE_EVENTFD 1306#if EV_USE_EVENTFD
1266 if (evfd >= 0) 1307 if (evfd >= 0)
… …
1268 uint64_t counter = 1; 1309 uint64_t counter = 1;
1269 write (evfd, &counter, sizeof (uint64_t)); 1310 write (evfd, &counter, sizeof (uint64_t));
1270 } 1311 }
1271 else 1312 else
1272#endif 1313#endif
1314 /* win32 people keep sending patches that change this write() to send() */
1315 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1316 /* so when you think this write should be a send instead, please find out */
1317 /* where your send() is from - it's definitely not the microsoft send, and */
1318 /* tell me. thank you. */
1273 write (evpipe [1], &old_errno, 1); 1319 write (evpipe [1], &dummy, 1);
1274 1320
1275 errno = old_errno; 1321 errno = old_errno;
1276 } 1322 }
1277} 1323}
1278 1324
… …
1291 } 1337 }
1292 else 1338 else
1293#endif 1339#endif
1294 { 1340 {
1295 char dummy; 1341 char dummy;
1342 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1296 read (evpipe [0], &dummy, 1); 1343 read (evpipe [0], &dummy, 1);
1297 } 1344 }
1298 1345
1299 if (sig_pending) 1346 if (sig_pending)
1300 { 1347 {
… …
1379 break; 1426 break;
1380 } 1427 }
1381} 1428}
1382#endif 1429#endif
1383 1430
1431#endif
1432
1384/*****************************************************************************/ 1433/*****************************************************************************/
1385 1434
1435#if EV_CHILD_ENABLE
1386static WL childs [EV_PID_HASHSIZE]; 1436static WL childs [EV_PID_HASHSIZE];
1387
1388#ifndef _WIN32
1389 1437
1390static ev_signal childev; 1438static ev_signal childev;
1391 1439
1392#ifndef WIFCONTINUED 1440#ifndef WIFCONTINUED
1393# define WIFCONTINUED(status) 0 1441# define WIFCONTINUED(status) 0
… …
1398child_reap (EV_P_ int chain, int pid, int status) 1446child_reap (EV_P_ int chain, int pid, int status)
1399{ 1447{
1400 ev_child *w; 1448 ev_child *w;
1401 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1449 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1402 1450
1403 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1451 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1404 { 1452 {
1405 if ((w->pid == pid || !w->pid) 1453 if ((w->pid == pid || !w->pid)
1406 && (!traced || (w->flags & 1))) 1454 && (!traced || (w->flags & 1)))
1407 { 1455 {
1408 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1456 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1433 /* make sure we are called again until all children have been reaped */ 1481 /* make sure we are called again until all children have been reaped */
1434 /* we need to do it this way so that the callback gets called before we continue */ 1482 /* we need to do it this way so that the callback gets called before we continue */
1435 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1483 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1436 1484
1437 child_reap (EV_A_ pid, pid, status); 1485 child_reap (EV_A_ pid, pid, status);
1438 if (EV_PID_HASHSIZE > 1) 1486 if ((EV_PID_HASHSIZE) > 1)
1439 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1487 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1440} 1488}
1441 1489
1442#endif 1490#endif
1443 1491
… …
1510#ifdef __APPLE__ 1558#ifdef __APPLE__
1511 /* only select works correctly on that "unix-certified" platform */ 1559 /* only select works correctly on that "unix-certified" platform */
1512 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1560 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1513 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1561 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1514#endif 1562#endif
1563#ifdef __FreeBSD__
1564 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1565#endif
1515 1566
1516 return flags; 1567 return flags;
1517} 1568}
1518 1569
1519unsigned int 1570unsigned int
1520ev_embeddable_backends (void) 1571ev_embeddable_backends (void)
1521{ 1572{
1522 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1573 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1523 1574
1524 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1575 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1525 /* please fix it and tell me how to detect the fix */ 1576 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1526 flags &= ~EVBACKEND_EPOLL; 1577 flags &= ~EVBACKEND_EPOLL;
1527 1578
1528 return flags; 1579 return flags;
1529} 1580}
1530 1581
1531unsigned int 1582unsigned int
1532ev_backend (EV_P) 1583ev_backend (EV_P)
1533{ 1584{
1534 return backend; 1585 return backend;
1535} 1586}
1536 1587
1537#if EV_MINIMAL < 2 1588#if EV_FEATURE_API
1538unsigned int 1589unsigned int
1539ev_loop_count (EV_P) 1590ev_iteration (EV_P)
1540{ 1591{
1541 return loop_count; 1592 return loop_count;
1542} 1593}
1543 1594
1544unsigned int 1595unsigned int
1545ev_loop_depth (EV_P) 1596ev_depth (EV_P)
1546{ 1597{
1547 return loop_depth; 1598 return loop_depth;
1548} 1599}
1549 1600
1550void 1601void
… …
1622 1673
1623 ev_rt_now = ev_time (); 1674 ev_rt_now = ev_time ();
1624 mn_now = get_clock (); 1675 mn_now = get_clock ();
1625 now_floor = mn_now; 1676 now_floor = mn_now;
1626 rtmn_diff = ev_rt_now - mn_now; 1677 rtmn_diff = ev_rt_now - mn_now;
1627#if EV_MINIMAL < 2 1678#if EV_FEATURE_API
1628 invoke_cb = ev_invoke_pending; 1679 invoke_cb = ev_invoke_pending;
1629#endif 1680#endif
1630 1681
1631 io_blocktime = 0.; 1682 io_blocktime = 0.;
1632 timeout_blocktime = 0.; 1683 timeout_blocktime = 0.;
… …
1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1713 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1663#endif 1714#endif
1664 1715
1665 ev_prepare_init (&pending_w, pendingcb); 1716 ev_prepare_init (&pending_w, pendingcb);
1666 1717
1718#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1667 ev_init (&pipe_w, pipecb); 1719 ev_init (&pipe_w, pipecb);
1668 ev_set_priority (&pipe_w, EV_MAXPRI); 1720 ev_set_priority (&pipe_w, EV_MAXPRI);
1721#endif
1669 } 1722 }
1670} 1723}
1671 1724
1672/* free up a loop structure */ 1725/* free up a loop structure */
1673static void noinline 1726static void noinline
… …
1791 { 1844 {
1792 EV_WIN32_CLOSE_FD (evpipe [0]); 1845 EV_WIN32_CLOSE_FD (evpipe [0]);
1793 EV_WIN32_CLOSE_FD (evpipe [1]); 1846 EV_WIN32_CLOSE_FD (evpipe [1]);
1794 } 1847 }
1795 1848
1849#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1796 evpipe_init (EV_A); 1850 evpipe_init (EV_A);
1797 /* now iterate over everything, in case we missed something */ 1851 /* now iterate over everything, in case we missed something */
1798 pipecb (EV_A_ &pipe_w, EV_READ); 1852 pipecb (EV_A_ &pipe_w, EV_READ);
1853#endif
1799 } 1854 }
1800 1855
1801 postfork = 0; 1856 postfork = 0;
1802} 1857}
1803 1858
… …
1865 verify_watcher (EV_A_ ws [cnt]); 1920 verify_watcher (EV_A_ ws [cnt]);
1866 } 1921 }
1867} 1922}
1868#endif 1923#endif
1869 1924
1870#if EV_MINIMAL < 2 1925#if EV_FEATURE_API
1871void 1926void
1872ev_loop_verify (EV_P) 1927ev_verify (EV_P)
1873{ 1928{
1874#if EV_VERIFY 1929#if EV_VERIFY
1875 int i; 1930 int i;
1876 WL w; 1931 WL w;
1877 1932
… …
1916#if EV_ASYNC_ENABLE 1971#if EV_ASYNC_ENABLE
1917 assert (asyncmax >= asynccnt); 1972 assert (asyncmax >= asynccnt);
1918 array_verify (EV_A_ (W *)asyncs, asynccnt); 1973 array_verify (EV_A_ (W *)asyncs, asynccnt);
1919#endif 1974#endif
1920 1975
1976#if EV_PREPARE_ENABLE
1921 assert (preparemax >= preparecnt); 1977 assert (preparemax >= preparecnt);
1922 array_verify (EV_A_ (W *)prepares, preparecnt); 1978 array_verify (EV_A_ (W *)prepares, preparecnt);
1979#endif
1923 1980
1981#if EV_CHECK_ENABLE
1924 assert (checkmax >= checkcnt); 1982 assert (checkmax >= checkcnt);
1925 array_verify (EV_A_ (W *)checks, checkcnt); 1983 array_verify (EV_A_ (W *)checks, checkcnt);
1984#endif
1926 1985
1927# if 0 1986# if 0
1987#if EV_CHILD_ENABLE
1928 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1988 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1929 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1989 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1990#endif
1930# endif 1991# endif
1931#endif 1992#endif
1932} 1993}
1933#endif 1994#endif
1934 1995
… …
1950 2011
1951 loop_init (EV_A_ flags); 2012 loop_init (EV_A_ flags);
1952 2013
1953 if (ev_backend (EV_A)) 2014 if (ev_backend (EV_A))
1954 { 2015 {
1955#ifndef _WIN32 2016#if EV_CHILD_ENABLE
1956 ev_signal_init (&childev, childcb, SIGCHLD); 2017 ev_signal_init (&childev, childcb, SIGCHLD);
1957 ev_set_priority (&childev, EV_MAXPRI); 2018 ev_set_priority (&childev, EV_MAXPRI);
1958 ev_signal_start (EV_A_ &childev); 2019 ev_signal_start (EV_A_ &childev);
1959 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2020 ev_unref (EV_A); /* child watcher should not keep loop alive */
1960#endif 2021#endif
… …
1973 EV_P = ev_default_loop_ptr; 2034 EV_P = ev_default_loop_ptr;
1974#endif 2035#endif
1975 2036
1976 ev_default_loop_ptr = 0; 2037 ev_default_loop_ptr = 0;
1977 2038
1978#ifndef _WIN32 2039#if EV_CHILD_ENABLE
1979 ev_ref (EV_A); /* child watcher */ 2040 ev_ref (EV_A); /* child watcher */
1980 ev_signal_stop (EV_A_ &childev); 2041 ev_signal_stop (EV_A_ &childev);
1981#endif 2042#endif
1982 2043
1983 loop_destroy (EV_A); 2044 loop_destroy (EV_A);
… …
2089 EV_FREQUENT_CHECK; 2150 EV_FREQUENT_CHECK;
2090 feed_reverse (EV_A_ (W)w); 2151 feed_reverse (EV_A_ (W)w);
2091 } 2152 }
2092 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2153 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2093 2154
2094 feed_reverse_done (EV_A_ EV_TIMEOUT); 2155 feed_reverse_done (EV_A_ EV_TIMER);
2095 } 2156 }
2096} 2157}
2097 2158
2098#if EV_PERIODIC_ENABLE 2159#if EV_PERIODIC_ENABLE
2099/* make periodics pending */ 2160/* make periodics pending */
… …
2152 feed_reverse_done (EV_A_ EV_PERIODIC); 2213 feed_reverse_done (EV_A_ EV_PERIODIC);
2153 } 2214 }
2154} 2215}
2155 2216
2156/* simply recalculate all periodics */ 2217/* simply recalculate all periodics */
2157/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2218/* TODO: maybe ensure that at least one event happens when jumping forward? */
2158static void noinline 2219static void noinline
2159periodics_reschedule (EV_P) 2220periodics_reschedule (EV_P)
2160{ 2221{
2161 int i; 2222 int i;
2162 2223
… …
2258 mn_now = ev_rt_now; 2319 mn_now = ev_rt_now;
2259 } 2320 }
2260} 2321}
2261 2322
2262void 2323void
2263ev_loop (EV_P_ int flags) 2324ev_run (EV_P_ int flags)
2264{ 2325{
2265#if EV_MINIMAL < 2 2326#if EV_FEATURE_API
2266 ++loop_depth; 2327 ++loop_depth;
2267#endif 2328#endif
2268 2329
2269 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2330 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2270 2331
2271 loop_done = EVUNLOOP_CANCEL; 2332 loop_done = EVBREAK_CANCEL;
2272 2333
2273 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2334 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2274 2335
2275 do 2336 do
2276 { 2337 {
2277#if EV_VERIFY >= 2 2338#if EV_VERIFY >= 2
2278 ev_loop_verify (EV_A); 2339 ev_verify (EV_A);
2279#endif 2340#endif
2280 2341
2281#ifndef _WIN32 2342#ifndef _WIN32
2282 if (expect_false (curpid)) /* penalise the forking check even more */ 2343 if (expect_false (curpid)) /* penalise the forking check even more */
2283 if (expect_false (getpid () != curpid)) 2344 if (expect_false (getpid () != curpid))
… …
2295 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2356 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2296 EV_INVOKE_PENDING; 2357 EV_INVOKE_PENDING;
2297 } 2358 }
2298#endif 2359#endif
2299 2360
2361#if EV_PREPARE_ENABLE
2300 /* queue prepare watchers (and execute them) */ 2362 /* queue prepare watchers (and execute them) */
2301 if (expect_false (preparecnt)) 2363 if (expect_false (preparecnt))
2302 { 2364 {
2303 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2365 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2304 EV_INVOKE_PENDING; 2366 EV_INVOKE_PENDING;
2305 } 2367 }
2368#endif
2306 2369
2307 if (expect_false (loop_done)) 2370 if (expect_false (loop_done))
2308 break; 2371 break;
2309 2372
2310 /* we might have forked, so reify kernel state if necessary */ 2373 /* we might have forked, so reify kernel state if necessary */
… …
2317 /* calculate blocking time */ 2380 /* calculate blocking time */
2318 { 2381 {
2319 ev_tstamp waittime = 0.; 2382 ev_tstamp waittime = 0.;
2320 ev_tstamp sleeptime = 0.; 2383 ev_tstamp sleeptime = 0.;
2321 2384
2385 /* remember old timestamp for io_blocktime calculation */
2386 ev_tstamp prev_mn_now = mn_now;
2387
2388 /* update time to cancel out callback processing overhead */
2389 time_update (EV_A_ 1e100);
2390
2322 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2391 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2323 { 2392 {
2324 /* remember old timestamp for io_blocktime calculation */
2325 ev_tstamp prev_mn_now = mn_now;
2326
2327 /* update time to cancel out callback processing overhead */
2328 time_update (EV_A_ 1e100);
2329
2330 waittime = MAX_BLOCKTIME; 2393 waittime = MAX_BLOCKTIME;
2331 2394
2332 if (timercnt) 2395 if (timercnt)
2333 { 2396 {
2334 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2397 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2361 waittime -= sleeptime; 2424 waittime -= sleeptime;
2362 } 2425 }
2363 } 2426 }
2364 } 2427 }
2365 2428
2366#if EV_MINIMAL < 2 2429#if EV_FEATURE_API
2367 ++loop_count; 2430 ++loop_count;
2368#endif 2431#endif
2369 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2432 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2370 backend_poll (EV_A_ waittime); 2433 backend_poll (EV_A_ waittime);
2371 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2434 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2372 2435
2373 /* update ev_rt_now, do magic */ 2436 /* update ev_rt_now, do magic */
2374 time_update (EV_A_ waittime + sleeptime); 2437 time_update (EV_A_ waittime + sleeptime);
2375 } 2438 }
2376 2439
… …
2383#if EV_IDLE_ENABLE 2446#if EV_IDLE_ENABLE
2384 /* queue idle watchers unless other events are pending */ 2447 /* queue idle watchers unless other events are pending */
2385 idle_reify (EV_A); 2448 idle_reify (EV_A);
2386#endif 2449#endif
2387 2450
2451#if EV_CHECK_ENABLE
2388 /* queue check watchers, to be executed first */ 2452 /* queue check watchers, to be executed first */
2389 if (expect_false (checkcnt)) 2453 if (expect_false (checkcnt))
2390 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2454 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2455#endif
2391 2456
2392 EV_INVOKE_PENDING; 2457 EV_INVOKE_PENDING;
2393 } 2458 }
2394 while (expect_true ( 2459 while (expect_true (
2395 activecnt 2460 activecnt
2396 && !loop_done 2461 && !loop_done
2397 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2462 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2398 )); 2463 ));
2399 2464
2400 if (loop_done == EVUNLOOP_ONE) 2465 if (loop_done == EVBREAK_ONE)
2401 loop_done = EVUNLOOP_CANCEL; 2466 loop_done = EVBREAK_CANCEL;
2402 2467
2403#if EV_MINIMAL < 2 2468#if EV_FEATURE_API
2404 --loop_depth; 2469 --loop_depth;
2405#endif 2470#endif
2406} 2471}
2407 2472
2408void 2473void
2409ev_unloop (EV_P_ int how) 2474ev_break (EV_P_ int how)
2410{ 2475{
2411 loop_done = how; 2476 loop_done = how;
2412} 2477}
2413 2478
2414void 2479void
… …
2562 EV_FREQUENT_CHECK; 2627 EV_FREQUENT_CHECK;
2563 2628
2564 wlist_del (&anfds[w->fd].head, (WL)w); 2629 wlist_del (&anfds[w->fd].head, (WL)w);
2565 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2566 2631
2567 fd_change (EV_A_ w->fd, 1); 2632 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2568 2633
2569 EV_FREQUENT_CHECK; 2634 EV_FREQUENT_CHECK;
2570} 2635}
2571 2636
2572void noinline 2637void noinline
… …
2725 2790
2726#ifndef SA_RESTART 2791#ifndef SA_RESTART
2727# define SA_RESTART 0 2792# define SA_RESTART 0
2728#endif 2793#endif
2729 2794
2795#if EV_SIGNAL_ENABLE
2796
2730void noinline 2797void noinline
2731ev_signal_start (EV_P_ ev_signal *w) 2798ev_signal_start (EV_P_ ev_signal *w)
2732{ 2799{
2733 if (expect_false (ev_is_active (w))) 2800 if (expect_false (ev_is_active (w)))
2734 return; 2801 return;
… …
2840 } 2907 }
2841 2908
2842 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2843} 2910}
2844 2911
2912#endif
2913
2914#if EV_CHILD_ENABLE
2915
2845void 2916void
2846ev_child_start (EV_P_ ev_child *w) 2917ev_child_start (EV_P_ ev_child *w)
2847{ 2918{
2848#if EV_MULTIPLICITY 2919#if EV_MULTIPLICITY
2849 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2920 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2852 return; 2923 return;
2853 2924
2854 EV_FREQUENT_CHECK; 2925 EV_FREQUENT_CHECK;
2855 2926
2856 ev_start (EV_A_ (W)w, 1); 2927 ev_start (EV_A_ (W)w, 1);
2857 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2928 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2858 2929
2859 EV_FREQUENT_CHECK; 2930 EV_FREQUENT_CHECK;
2860} 2931}
2861 2932
2862void 2933void
… …
2866 if (expect_false (!ev_is_active (w))) 2937 if (expect_false (!ev_is_active (w)))
2867 return; 2938 return;
2868 2939
2869 EV_FREQUENT_CHECK; 2940 EV_FREQUENT_CHECK;
2870 2941
2871 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2942 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2872 ev_stop (EV_A_ (W)w); 2943 ev_stop (EV_A_ (W)w);
2873 2944
2874 EV_FREQUENT_CHECK; 2945 EV_FREQUENT_CHECK;
2875} 2946}
2947
2948#endif
2876 2949
2877#if EV_STAT_ENABLE 2950#if EV_STAT_ENABLE
2878 2951
2879# ifdef _WIN32 2952# ifdef _WIN32
2880# undef lstat 2953# undef lstat
… …
2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3020 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2948 } 3021 }
2949 } 3022 }
2950 3023
2951 if (w->wd >= 0) 3024 if (w->wd >= 0)
2952 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3025 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2953 3026
2954 /* now re-arm timer, if required */ 3027 /* now re-arm timer, if required */
2955 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3028 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2956 ev_timer_again (EV_A_ &w->timer); 3029 ev_timer_again (EV_A_ &w->timer);
2957 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3030 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2965 3038
2966 if (wd < 0) 3039 if (wd < 0)
2967 return; 3040 return;
2968 3041
2969 w->wd = -2; 3042 w->wd = -2;
2970 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3043 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2971 wlist_del (&fs_hash [slot].head, (WL)w); 3044 wlist_del (&fs_hash [slot].head, (WL)w);
2972 3045
2973 /* remove this watcher, if others are watching it, they will rearm */ 3046 /* remove this watcher, if others are watching it, they will rearm */
2974 inotify_rm_watch (fs_fd, wd); 3047 inotify_rm_watch (fs_fd, wd);
2975} 3048}
… …
2977static void noinline 3050static void noinline
2978infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3051infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2979{ 3052{
2980 if (slot < 0) 3053 if (slot < 0)
2981 /* overflow, need to check for all hash slots */ 3054 /* overflow, need to check for all hash slots */
2982 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3055 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2983 infy_wd (EV_A_ slot, wd, ev); 3056 infy_wd (EV_A_ slot, wd, ev);
2984 else 3057 else
2985 { 3058 {
2986 WL w_; 3059 WL w_;
2987 3060
2988 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3061 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2989 { 3062 {
2990 ev_stat *w = (ev_stat *)w_; 3063 ev_stat *w = (ev_stat *)w_;
2991 w_ = w_->next; /* lets us remove this watcher and all before it */ 3064 w_ = w_->next; /* lets us remove this watcher and all before it */
2992 3065
2993 if (w->wd == wd || wd == -1) 3066 if (w->wd == wd || wd == -1)
2994 { 3067 {
2995 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3068 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2996 { 3069 {
2997 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3070 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2998 w->wd = -1; 3071 w->wd = -1;
2999 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
3000 } 3073 }
3001 3074
3002 stat_timer_cb (EV_A_ &w->timer, 0); 3075 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3016 { 3089 {
3017 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3090 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3018 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3091 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3019 ofs += sizeof (struct inotify_event) + ev->len; 3092 ofs += sizeof (struct inotify_event) + ev->len;
3020 } 3093 }
3021}
3022
3023inline_size unsigned int
3024ev_linux_version (void)
3025{
3026 struct utsname buf;
3027 unsigned int v;
3028 int i;
3029 char *p = buf.release;
3030
3031 if (uname (&buf))
3032 return 0;
3033
3034 for (i = 3+1; --i; )
3035 {
3036 unsigned int c = 0;
3037
3038 for (;;)
3039 {
3040 if (*p >= '0' && *p <= '9')
3041 c = c * 10 + *p++ - '0';
3042 else
3043 {
3044 p += *p == '.';
3045 break;
3046 }
3047 }
3048
3049 v = (v << 8) | c;
3050 }
3051
3052 return v;
3053} 3094}
3054 3095
3055inline_size void 3096inline_size void
3056ev_check_2625 (EV_P) 3097ev_check_2625 (EV_P)
3057{ 3098{
… …
3116 ev_io_set (&fs_w, fs_fd, EV_READ); 3157 ev_io_set (&fs_w, fs_fd, EV_READ);
3117 ev_io_start (EV_A_ &fs_w); 3158 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A); 3159 ev_unref (EV_A);
3119 } 3160 }
3120 3161
3121 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3162 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3122 { 3163 {
3123 WL w_ = fs_hash [slot].head; 3164 WL w_ = fs_hash [slot].head;
3124 fs_hash [slot].head = 0; 3165 fs_hash [slot].head = 0;
3125 3166
3126 while (w_) 3167 while (w_)
… …
3301 3342
3302 EV_FREQUENT_CHECK; 3343 EV_FREQUENT_CHECK;
3303} 3344}
3304#endif 3345#endif
3305 3346
3347#if EV_PREPARE_ENABLE
3306void 3348void
3307ev_prepare_start (EV_P_ ev_prepare *w) 3349ev_prepare_start (EV_P_ ev_prepare *w)
3308{ 3350{
3309 if (expect_false (ev_is_active (w))) 3351 if (expect_false (ev_is_active (w)))
3310 return; 3352 return;
… …
3336 3378
3337 ev_stop (EV_A_ (W)w); 3379 ev_stop (EV_A_ (W)w);
3338 3380
3339 EV_FREQUENT_CHECK; 3381 EV_FREQUENT_CHECK;
3340} 3382}
3383#endif
3341 3384
3385#if EV_CHECK_ENABLE
3342void 3386void
3343ev_check_start (EV_P_ ev_check *w) 3387ev_check_start (EV_P_ ev_check *w)
3344{ 3388{
3345 if (expect_false (ev_is_active (w))) 3389 if (expect_false (ev_is_active (w)))
3346 return; 3390 return;
… …
3372 3416
3373 ev_stop (EV_A_ (W)w); 3417 ev_stop (EV_A_ (W)w);
3374 3418
3375 EV_FREQUENT_CHECK; 3419 EV_FREQUENT_CHECK;
3376} 3420}
3421#endif
3377 3422
3378#if EV_EMBED_ENABLE 3423#if EV_EMBED_ENABLE
3379void noinline 3424void noinline
3380ev_embed_sweep (EV_P_ ev_embed *w) 3425ev_embed_sweep (EV_P_ ev_embed *w)
3381{ 3426{
3382 ev_loop (w->other, EVLOOP_NONBLOCK); 3427 ev_run (w->other, EVRUN_NOWAIT);
3383} 3428}
3384 3429
3385static void 3430static void
3386embed_io_cb (EV_P_ ev_io *io, int revents) 3431embed_io_cb (EV_P_ ev_io *io, int revents)
3387{ 3432{
3388 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3433 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3389 3434
3390 if (ev_cb (w)) 3435 if (ev_cb (w))
3391 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3436 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3392 else 3437 else
3393 ev_loop (w->other, EVLOOP_NONBLOCK); 3438 ev_run (w->other, EVRUN_NOWAIT);
3394} 3439}
3395 3440
3396static void 3441static void
3397embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3442embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3398{ 3443{
… …
3402 EV_P = w->other; 3447 EV_P = w->other;
3403 3448
3404 while (fdchangecnt) 3449 while (fdchangecnt)
3405 { 3450 {
3406 fd_reify (EV_A); 3451 fd_reify (EV_A);
3407 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3452 ev_run (EV_A_ EVRUN_NOWAIT);
3408 } 3453 }
3409 } 3454 }
3410} 3455}
3411 3456
3412static void 3457static void
… …
3418 3463
3419 { 3464 {
3420 EV_P = w->other; 3465 EV_P = w->other;
3421 3466
3422 ev_loop_fork (EV_A); 3467 ev_loop_fork (EV_A);
3423 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3468 ev_run (EV_A_ EVRUN_NOWAIT);
3424 } 3469 }
3425 3470
3426 ev_embed_start (EV_A_ w); 3471 ev_embed_start (EV_A_ w);
3427} 3472}
3428 3473
… …
3527ev_async_start (EV_P_ ev_async *w) 3572ev_async_start (EV_P_ ev_async *w)
3528{ 3573{
3529 if (expect_false (ev_is_active (w))) 3574 if (expect_false (ev_is_active (w)))
3530 return; 3575 return;
3531 3576
3577 w->sent = 0;
3578
3532 evpipe_init (EV_A); 3579 evpipe_init (EV_A);
3533 3580
3534 EV_FREQUENT_CHECK; 3581 EV_FREQUENT_CHECK;
3535 3582
3536 ev_start (EV_A_ (W)w, ++asynccnt); 3583 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3613{ 3660{
3614 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3661 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3615 3662
3616 if (expect_false (!once)) 3663 if (expect_false (!once))
3617 { 3664 {
3618 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3665 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3619 return; 3666 return;
3620 } 3667 }
3621 3668
3622 once->cb = cb; 3669 once->cb = cb;
3623 once->arg = arg; 3670 once->arg = arg;
… …
3710 if (types & EV_ASYNC) 3757 if (types & EV_ASYNC)
3711 for (i = asynccnt; i--; ) 3758 for (i = asynccnt; i--; )
3712 cb (EV_A_ EV_ASYNC, asyncs [i]); 3759 cb (EV_A_ EV_ASYNC, asyncs [i]);
3713#endif 3760#endif
3714 3761
3762#if EV_PREPARE_ENABLE
3715 if (types & EV_PREPARE) 3763 if (types & EV_PREPARE)
3716 for (i = preparecnt; i--; ) 3764 for (i = preparecnt; i--; )
3717#if EV_EMBED_ENABLE 3765# if EV_EMBED_ENABLE
3718 if (ev_cb (prepares [i]) != embed_prepare_cb) 3766 if (ev_cb (prepares [i]) != embed_prepare_cb)
3719#endif 3767# endif
3720 cb (EV_A_ EV_PREPARE, prepares [i]); 3768 cb (EV_A_ EV_PREPARE, prepares [i]);
3769#endif
3721 3770
3771#if EV_CHECK_ENABLE
3722 if (types & EV_CHECK) 3772 if (types & EV_CHECK)
3723 for (i = checkcnt; i--; ) 3773 for (i = checkcnt; i--; )
3724 cb (EV_A_ EV_CHECK, checks [i]); 3774 cb (EV_A_ EV_CHECK, checks [i]);
3775#endif
3725 3776
3777#if EV_SIGNAL_ENABLE
3726 if (types & EV_SIGNAL) 3778 if (types & EV_SIGNAL)
3727 for (i = 0; i < EV_NSIG - 1; ++i) 3779 for (i = 0; i < EV_NSIG - 1; ++i)
3728 for (wl = signals [i].head; wl; ) 3780 for (wl = signals [i].head; wl; )
3729 { 3781 {
3730 wn = wl->next; 3782 wn = wl->next;
3731 cb (EV_A_ EV_SIGNAL, wl); 3783 cb (EV_A_ EV_SIGNAL, wl);
3732 wl = wn; 3784 wl = wn;
3733 } 3785 }
3786#endif
3734 3787
3788#if EV_CHILD_ENABLE
3735 if (types & EV_CHILD) 3789 if (types & EV_CHILD)
3736 for (i = EV_PID_HASHSIZE; i--; ) 3790 for (i = (EV_PID_HASHSIZE); i--; )
3737 for (wl = childs [i]; wl; ) 3791 for (wl = childs [i]; wl; )
3738 { 3792 {
3739 wn = wl->next; 3793 wn = wl->next;
3740 cb (EV_A_ EV_CHILD, wl); 3794 cb (EV_A_ EV_CHILD, wl);
3741 wl = wn; 3795 wl = wn;
3742 } 3796 }
3797#endif
3743/* EV_STAT 0x00001000 /* stat data changed */ 3798/* EV_STAT 0x00001000 /* stat data changed */
3744/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3799/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3745} 3800}
3746#endif 3801#endif
3747 3802
3748#if EV_MULTIPLICITY 3803#if EV_MULTIPLICITY
3749 #include "ev_wrap.h" 3804 #include "ev_wrap.h"
3750#endif 3805#endif
3751 3806
3752#ifdef __cplusplus 3807EV_CPP(})
3753}
3754#endif
3755 3808

Diff Legend

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