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

Comparing libev/ev.c (file contents):
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC vs.
Revision 1.354 by root, Fri Oct 22 09:24:11 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>
… …
184# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
185# include <windows.h> 192# include <windows.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
196# undef EV_AVOID_STDIO
189#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
190 206
191/* 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 */
192 208
193/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
206#elif defined (MAXSIG) 222#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else 230#else
215# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
216/* 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! :) */
217# define EV_NSIG 65 234# define EV_NSIG 65
218#endif 235#endif
219 236
220#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
221# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
222# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
223# else 240# else
224# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
225# endif 242# endif
226#endif 243#endif
227 244
228#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
229# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
230# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
231# else 248# else
232# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
233# endif 250# endif
234#endif 251#endif
235 252
… …
237# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
238#endif 255#endif
239 256
240#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
241# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
242# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
243# else 260# else
244# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
245# endif 262# endif
246#endif 263#endif
247 264
248#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
249# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
250#endif 267#endif
251 268
252#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
253# ifdef _WIN32 270# ifdef _WIN32
254# define EV_USE_POLL 0 271# define EV_USE_POLL 0
255# else 272# else
256# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
257# endif 274# endif
258#endif 275#endif
259 276
260#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
261# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
262# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
263# else 280# else
264# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
265# endif 282# endif
266#endif 283#endif
267 284
… …
273# define EV_USE_PORT 0 290# define EV_USE_PORT 0
274#endif 291#endif
275 292
276#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
277# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
278# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
279# else 296# else
280# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
281# endif 298# endif
282#endif 299#endif
283 300
284#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
285# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
286# define EV_PID_HASHSIZE 1
287# else
288# define EV_PID_HASHSIZE 16
289# endif
290#endif 303#endif
291 304
292#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
293# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
294# define EV_INOTIFY_HASHSIZE 1
295# else
296# define EV_INOTIFY_HASHSIZE 16
297# endif
298#endif 307#endif
299 308
300#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
301# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
302# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
303# else 312# else
304# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
305# endif 314# endif
306#endif 315#endif
307 316
308#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
311# else 320# else
312# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
313# endif 322# endif
314#endif 323#endif
315 324
… …
318# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
319# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
320#endif 329#endif
321 330
322#ifndef EV_VERIFY 331#ifndef EV_VERIFY
323# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
324#endif 333#endif
325 334
326#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
327# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
328#endif 337#endif
329 338
330#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
331# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
332#endif 341#endif
333 342
334/* 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, */
335/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
400# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
401# else 410# else
402# define EFD_CLOEXEC 02000000 411# define EFD_CLOEXEC 02000000
403# endif 412# endif
404# endif 413# endif
405# ifdef __cplusplus
406extern "C" {
407# endif
408int (eventfd) (unsigned int initval, int flags); 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
409# ifdef __cplusplus
410}
411# endif
412#endif 415#endif
413 416
414#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h> 419# include <stdint.h>
… …
422# define SFD_CLOEXEC O_CLOEXEC 425# define SFD_CLOEXEC O_CLOEXEC
423# else 426# else
424# define SFD_CLOEXEC 02000000 427# define SFD_CLOEXEC 02000000
425# endif 428# endif
426# endif 429# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags); 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
431 431
432struct signalfd_siginfo 432struct signalfd_siginfo
433{ 433{
434 uint32_t ssi_signo; 434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)]; 435 char pad[128 - sizeof (uint32_t)];
436}; 436};
437# ifdef __cplusplus
438}
439# endif 437#endif
440#endif
441
442 438
443/**/ 439/**/
444 440
445#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
447#else 443#else
448# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
449#endif 445#endif
450 446
451/* 447/*
… …
459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
460 456
461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
463 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462
464#if __GNUC__ >= 4 463#if __GNUC__ >= 4
465# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
466# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
467#else 466#else
468# define expect(expr,value) (expr) 467# define expect(expr,value) (expr)
… …
474 473
475#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
476#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
477#define inline_size static inline 476#define inline_size static inline
478 477
479#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
480# define inline_speed static noinline 481# define inline_speed static noinline
481#else
482# define inline_speed static inline
483#endif 482#endif
484 483
485#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
486 485
487#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
… …
500#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
501#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
502 501
503#if EV_USE_REALTIME 502#if EV_USE_REALTIME
504/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
505/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
506static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
507#endif 506#endif
508 507
509#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
523#ifdef _WIN32 522#ifdef _WIN32
524# include "ev_win32.c" 523# include "ev_win32.c"
525#endif 524#endif
526 525
527/*****************************************************************************/ 526/*****************************************************************************/
527
528#if EV_AVOID_STDIO
529static void noinline
530ev_printerr (const char *msg)
531{
532 write (STDERR_FILENO, msg, strlen (msg));
533}
534#endif
528 535
529static void (*syserr_cb)(const char *msg); 536static void (*syserr_cb)(const char *msg);
530 537
531void 538void
532ev_set_syserr_cb (void (*cb)(const char *msg)) 539ev_set_syserr_cb (void (*cb)(const char *msg))
… …
543 if (syserr_cb) 550 if (syserr_cb)
544 syserr_cb (msg); 551 syserr_cb (msg);
545 else 552 else
546 { 553 {
547#if EV_AVOID_STDIO 554#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno); 555 const char *err = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg)); 556
552 write (STDERR_FILENO, "\n", 1); 557 ev_printerr (msg);
558 ev_printerr (": ");
559 ev_printerr (err);
560 ev_printerr ("\n");
553#else 561#else
554 perror (msg); 562 perror (msg);
555#endif 563#endif
556 abort (); 564 abort ();
557 } 565 }
558} 566}
559 567
560static void * 568static void *
561ev_realloc_emul (void *ptr, long size) 569ev_realloc_emul (void *ptr, long size)
562{ 570{
571#if __GLIBC__
572 return realloc (ptr, size);
573#else
563 /* some systems, notably openbsd and darwin, fail to properly 574 /* some systems, notably openbsd and darwin, fail to properly
564 * implement realloc (x, 0) (as required by both ansi c-98 and 575 * implement realloc (x, 0) (as required by both ansi c-89 and
565 * the single unix specification, so work around them here. 576 * the single unix specification, so work around them here.
566 */ 577 */
567 578
568 if (size) 579 if (size)
569 return realloc (ptr, size); 580 return realloc (ptr, size);
570 581
571 free (ptr); 582 free (ptr);
572 return 0; 583 return 0;
584#endif
573} 585}
574 586
575static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 587static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
576 588
577void 589void
… …
586 ptr = alloc (ptr, size); 598 ptr = alloc (ptr, size);
587 599
588 if (!ptr && size) 600 if (!ptr && size)
589 { 601 {
590#if EV_AVOID_STDIO 602#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.", 603 ev_printerr ("libev: memory allocation failed, aborting.\n");
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else 604#else
594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 605 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif 606#endif
596 abort (); 607 abort ();
597 } 608 }
… …
682 693
683 static int ev_default_loop_ptr; 694 static int ev_default_loop_ptr;
684 695
685#endif 696#endif
686 697
687#if EV_MINIMAL < 2 698#if EV_FEATURE_API
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 699# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 700# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A) 701# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else 702#else
692# define EV_RELEASE_CB (void)0 703# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0 704# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif 706#endif
696 707
697#define EVUNLOOP_RECURSE 0x80 708#define EVBREAK_RECURSE 0x80
698 709
699/*****************************************************************************/ 710/*****************************************************************************/
700 711
701#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
702ev_tstamp 713ev_tstamp
… …
746 if (delay > 0.) 757 if (delay > 0.)
747 { 758 {
748#if EV_USE_NANOSLEEP 759#if EV_USE_NANOSLEEP
749 struct timespec ts; 760 struct timespec ts;
750 761
751 ts.tv_sec = (time_t)delay; 762 EV_TS_SET (ts, delay);
752 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
753
754 nanosleep (&ts, 0); 763 nanosleep (&ts, 0);
755#elif defined(_WIN32) 764#elif defined(_WIN32)
756 Sleep ((unsigned long)(delay * 1e3)); 765 Sleep ((unsigned long)(delay * 1e3));
757#else 766#else
758 struct timeval tv; 767 struct timeval tv;
759 768
760 tv.tv_sec = (time_t)delay;
761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
762
763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
764 /* something not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
765 /* by older ones */ 771 /* by older ones */
772 EV_TV_SET (tv, delay);
766 select (0, 0, 0, 0, &tv); 773 select (0, 0, 0, 0, &tv);
767#endif 774#endif
768 } 775 }
769} 776}
770 777
771/*****************************************************************************/ 778/*****************************************************************************/
772 779
773#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 780#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
774 781
775/* find a suitable new size for the given array, */ 782/* find a suitable new size for the given array, */
776/* hopefully by rounding to a ncie-to-malloc size */ 783/* hopefully by rounding to a nice-to-malloc size */
777inline_size int 784inline_size int
778array_nextsize (int elem, int cur, int cnt) 785array_nextsize (int elem, int cur, int cnt)
779{ 786{
780 int ncur = cur + 1; 787 int ncur = cur + 1;
781 788
… …
877} 884}
878 885
879/*****************************************************************************/ 886/*****************************************************************************/
880 887
881inline_speed void 888inline_speed void
882fd_event_nc (EV_P_ int fd, int revents) 889fd_event_nocheck (EV_P_ int fd, int revents)
883{ 890{
884 ANFD *anfd = anfds + fd; 891 ANFD *anfd = anfds + fd;
885 ev_io *w; 892 ev_io *w;
886 893
887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 894 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
899fd_event (EV_P_ int fd, int revents) 906fd_event (EV_P_ int fd, int revents)
900{ 907{
901 ANFD *anfd = anfds + fd; 908 ANFD *anfd = anfds + fd;
902 909
903 if (expect_true (!anfd->reify)) 910 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents); 911 fd_event_nocheck (EV_A_ fd, revents);
905} 912}
906 913
907void 914void
908ev_feed_fd_event (EV_P_ int fd, int revents) 915ev_feed_fd_event (EV_P_ int fd, int revents)
909{ 916{
910 if (fd >= 0 && fd < anfdmax) 917 if (fd >= 0 && fd < anfdmax)
911 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
912} 919}
913 920
914/* make sure the external fd watch events are in-sync */ 921/* make sure the external fd watch events are in-sync */
915/* with the kernel/libev internal state */ 922/* with the kernel/libev internal state */
916inline_size void 923inline_size void
… …
922 { 929 {
923 int fd = fdchanges [i]; 930 int fd = fdchanges [i];
924 ANFD *anfd = anfds + fd; 931 ANFD *anfd = anfds + fd;
925 ev_io *w; 932 ev_io *w;
926 933
927 unsigned char events = 0; 934 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify;
928 936
929 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 937 anfd->reify = 0;
930 events |= (unsigned char)w->events;
931 938
932#if EV_SELECT_IS_WINSOCKET 939#if EV_SELECT_IS_WINSOCKET
933 if (events) 940 if (o_reify & EV__IOFDSET)
934 { 941 {
935 unsigned long arg; 942 unsigned long arg;
936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 943 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 944 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
938 } 945 }
939#endif 946#endif
940 947
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
941 { 949 {
942 unsigned char o_events = anfd->events;
943 unsigned char o_reify = anfd->reify;
944
945 anfd->reify = 0;
946 anfd->events = events; 950 anfd->events = 0;
947 951
948 if (o_events != events || o_reify & EV__IOFDSET) 952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
953 anfd->events |= (unsigned char)w->events;
954
955 if (o_events != anfd->events)
956 o_reify = EV__IOFDSET; /* actually |= */
957 }
958
959 if (o_reify & EV__IOFDSET)
949 backend_modify (EV_A_ fd, o_events, events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
950 }
951 } 961 }
952 962
953 fdchangecnt = 0; 963 fdchangecnt = 0;
954} 964}
955 965
… …
979 ev_io_stop (EV_A_ w); 989 ev_io_stop (EV_A_ w);
980 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 990 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
981 } 991 }
982} 992}
983 993
984/* check whether the given fd is atcually valid, for error recovery */ 994/* check whether the given fd is actually valid, for error recovery */
985inline_size int 995inline_size int
986fd_valid (int fd) 996fd_valid (int fd)
987{ 997{
988#ifdef _WIN32 998#ifdef _WIN32
989 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 999 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1031 anfds [fd].emask = 0; 1041 anfds [fd].emask = 0;
1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1042 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1033 } 1043 }
1034} 1044}
1035 1045
1046/* used to prepare libev internal fd's */
1047/* this is not fork-safe */
1048inline_speed void
1049fd_intern (int fd)
1050{
1051#ifdef _WIN32
1052 unsigned long arg = 1;
1053 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1054#else
1055 fcntl (fd, F_SETFD, FD_CLOEXEC);
1056 fcntl (fd, F_SETFL, O_NONBLOCK);
1057#endif
1058}
1059
1036/*****************************************************************************/ 1060/*****************************************************************************/
1037 1061
1038/* 1062/*
1039 * the heap functions want a real array index. array index 0 uis guaranteed to not 1063 * the heap functions want a real array index. array index 0 is guaranteed to not
1040 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1064 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1041 * the branching factor of the d-tree. 1065 * the branching factor of the d-tree.
1042 */ 1066 */
1043 1067
1044/* 1068/*
… …
1192 1216
1193static ANSIG signals [EV_NSIG - 1]; 1217static ANSIG signals [EV_NSIG - 1];
1194 1218
1195/*****************************************************************************/ 1219/*****************************************************************************/
1196 1220
1197/* used to prepare libev internal fd's */ 1221#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1198/* this is not fork-safe */
1199inline_speed void
1200fd_intern (int fd)
1201{
1202#ifdef _WIN32
1203 unsigned long arg = 1;
1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1205#else
1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1208#endif
1209}
1210 1222
1211static void noinline 1223static void noinline
1212evpipe_init (EV_P) 1224evpipe_init (EV_P)
1213{ 1225{
1214 if (!ev_is_active (&pipe_w)) 1226 if (!ev_is_active (&pipe_w))
1215 { 1227 {
1216#if EV_USE_EVENTFD 1228# if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1229 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL) 1230 if (evfd < 0 && errno == EINVAL)
1219 evfd = eventfd (0, 0); 1231 evfd = eventfd (0, 0);
1220 1232
1221 if (evfd >= 0) 1233 if (evfd >= 0)
… …
1223 evpipe [0] = -1; 1235 evpipe [0] = -1;
1224 fd_intern (evfd); /* doing it twice doesn't hurt */ 1236 fd_intern (evfd); /* doing it twice doesn't hurt */
1225 ev_io_set (&pipe_w, evfd, EV_READ); 1237 ev_io_set (&pipe_w, evfd, EV_READ);
1226 } 1238 }
1227 else 1239 else
1228#endif 1240# endif
1229 { 1241 {
1230 while (pipe (evpipe)) 1242 while (pipe (evpipe))
1231 ev_syserr ("(libev) error creating signal/async pipe"); 1243 ev_syserr ("(libev) error creating signal/async pipe");
1232 1244
1233 fd_intern (evpipe [0]); 1245 fd_intern (evpipe [0]);
… …
1244evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1256evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1245{ 1257{
1246 if (!*flag) 1258 if (!*flag)
1247 { 1259 {
1248 int old_errno = errno; /* save errno because write might clobber it */ 1260 int old_errno = errno; /* save errno because write might clobber it */
1261 char dummy;
1249 1262
1250 *flag = 1; 1263 *flag = 1;
1251 1264
1252#if EV_USE_EVENTFD 1265#if EV_USE_EVENTFD
1253 if (evfd >= 0) 1266 if (evfd >= 0)
… …
1255 uint64_t counter = 1; 1268 uint64_t counter = 1;
1256 write (evfd, &counter, sizeof (uint64_t)); 1269 write (evfd, &counter, sizeof (uint64_t));
1257 } 1270 }
1258 else 1271 else
1259#endif 1272#endif
1273 /* win32 people keep sending patches that change this write() to send() */
1274 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1275 /* so when you think this write should be a send instead, please find out */
1276 /* where your send() is from - it's definitely not the microsoft send, and */
1277 /* tell me. thank you. */
1260 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1261 1279
1262 errno = old_errno; 1280 errno = old_errno;
1263 } 1281 }
1264} 1282}
1265 1283
… …
1278 } 1296 }
1279 else 1297 else
1280#endif 1298#endif
1281 { 1299 {
1282 char dummy; 1300 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1283 read (evpipe [0], &dummy, 1); 1302 read (evpipe [0], &dummy, 1);
1284 } 1303 }
1285 1304
1286 if (sig_pending) 1305 if (sig_pending)
1287 { 1306 {
… …
1366 break; 1385 break;
1367 } 1386 }
1368} 1387}
1369#endif 1388#endif
1370 1389
1390#endif
1391
1371/*****************************************************************************/ 1392/*****************************************************************************/
1372 1393
1394#if EV_CHILD_ENABLE
1373static WL childs [EV_PID_HASHSIZE]; 1395static WL childs [EV_PID_HASHSIZE];
1374
1375#ifndef _WIN32
1376 1396
1377static ev_signal childev; 1397static ev_signal childev;
1378 1398
1379#ifndef WIFCONTINUED 1399#ifndef WIFCONTINUED
1380# define WIFCONTINUED(status) 0 1400# define WIFCONTINUED(status) 0
… …
1385child_reap (EV_P_ int chain, int pid, int status) 1405child_reap (EV_P_ int chain, int pid, int status)
1386{ 1406{
1387 ev_child *w; 1407 ev_child *w;
1388 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1408 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1389 1409
1390 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1410 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1391 { 1411 {
1392 if ((w->pid == pid || !w->pid) 1412 if ((w->pid == pid || !w->pid)
1393 && (!traced || (w->flags & 1))) 1413 && (!traced || (w->flags & 1)))
1394 { 1414 {
1395 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1415 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1420 /* make sure we are called again until all children have been reaped */ 1440 /* make sure we are called again until all children have been reaped */
1421 /* we need to do it this way so that the callback gets called before we continue */ 1441 /* we need to do it this way so that the callback gets called before we continue */
1422 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1442 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1423 1443
1424 child_reap (EV_A_ pid, pid, status); 1444 child_reap (EV_A_ pid, pid, status);
1425 if (EV_PID_HASHSIZE > 1) 1445 if ((EV_PID_HASHSIZE) > 1)
1426 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1446 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1427} 1447}
1428 1448
1429#endif 1449#endif
1430 1450
… …
1497#ifdef __APPLE__ 1517#ifdef __APPLE__
1498 /* only select works correctly on that "unix-certified" platform */ 1518 /* only select works correctly on that "unix-certified" platform */
1499 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1519 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1500 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1520 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1501#endif 1521#endif
1522#ifdef __FreeBSD__
1523 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1524#endif
1502 1525
1503 return flags; 1526 return flags;
1504} 1527}
1505 1528
1506unsigned int 1529unsigned int
… …
1519ev_backend (EV_P) 1542ev_backend (EV_P)
1520{ 1543{
1521 return backend; 1544 return backend;
1522} 1545}
1523 1546
1524#if EV_MINIMAL < 2 1547#if EV_FEATURE_API
1525unsigned int 1548unsigned int
1526ev_loop_count (EV_P) 1549ev_iteration (EV_P)
1527{ 1550{
1528 return loop_count; 1551 return loop_count;
1529} 1552}
1530 1553
1531unsigned int 1554unsigned int
1532ev_loop_depth (EV_P) 1555ev_depth (EV_P)
1533{ 1556{
1534 return loop_depth; 1557 return loop_depth;
1535} 1558}
1536 1559
1537void 1560void
… …
1609 1632
1610 ev_rt_now = ev_time (); 1633 ev_rt_now = ev_time ();
1611 mn_now = get_clock (); 1634 mn_now = get_clock ();
1612 now_floor = mn_now; 1635 now_floor = mn_now;
1613 rtmn_diff = ev_rt_now - mn_now; 1636 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2 1637#if EV_FEATURE_API
1615 invoke_cb = ev_invoke_pending; 1638 invoke_cb = ev_invoke_pending;
1616#endif 1639#endif
1617 1640
1618 io_blocktime = 0.; 1641 io_blocktime = 0.;
1619 timeout_blocktime = 0.; 1642 timeout_blocktime = 0.;
… …
1649 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1672 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1650#endif 1673#endif
1651 1674
1652 ev_prepare_init (&pending_w, pendingcb); 1675 ev_prepare_init (&pending_w, pendingcb);
1653 1676
1677#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1654 ev_init (&pipe_w, pipecb); 1678 ev_init (&pipe_w, pipecb);
1655 ev_set_priority (&pipe_w, EV_MAXPRI); 1679 ev_set_priority (&pipe_w, EV_MAXPRI);
1680#endif
1656 } 1681 }
1657} 1682}
1658 1683
1659/* free up a loop structure */ 1684/* free up a loop structure */
1660static void noinline 1685static void noinline
… …
1778 { 1803 {
1779 EV_WIN32_CLOSE_FD (evpipe [0]); 1804 EV_WIN32_CLOSE_FD (evpipe [0]);
1780 EV_WIN32_CLOSE_FD (evpipe [1]); 1805 EV_WIN32_CLOSE_FD (evpipe [1]);
1781 } 1806 }
1782 1807
1808#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1783 evpipe_init (EV_A); 1809 evpipe_init (EV_A);
1784 /* now iterate over everything, in case we missed something */ 1810 /* now iterate over everything, in case we missed something */
1785 pipecb (EV_A_ &pipe_w, EV_READ); 1811 pipecb (EV_A_ &pipe_w, EV_READ);
1812#endif
1786 } 1813 }
1787 1814
1788 postfork = 0; 1815 postfork = 0;
1789} 1816}
1790 1817
… …
1852 verify_watcher (EV_A_ ws [cnt]); 1879 verify_watcher (EV_A_ ws [cnt]);
1853 } 1880 }
1854} 1881}
1855#endif 1882#endif
1856 1883
1857#if EV_MINIMAL < 2 1884#if EV_FEATURE_API
1858void 1885void
1859ev_loop_verify (EV_P) 1886ev_verify (EV_P)
1860{ 1887{
1861#if EV_VERIFY 1888#if EV_VERIFY
1862 int i; 1889 int i;
1863 WL w; 1890 WL w;
1864 1891
… …
1903#if EV_ASYNC_ENABLE 1930#if EV_ASYNC_ENABLE
1904 assert (asyncmax >= asynccnt); 1931 assert (asyncmax >= asynccnt);
1905 array_verify (EV_A_ (W *)asyncs, asynccnt); 1932 array_verify (EV_A_ (W *)asyncs, asynccnt);
1906#endif 1933#endif
1907 1934
1935#if EV_PREPARE_ENABLE
1908 assert (preparemax >= preparecnt); 1936 assert (preparemax >= preparecnt);
1909 array_verify (EV_A_ (W *)prepares, preparecnt); 1937 array_verify (EV_A_ (W *)prepares, preparecnt);
1938#endif
1910 1939
1940#if EV_CHECK_ENABLE
1911 assert (checkmax >= checkcnt); 1941 assert (checkmax >= checkcnt);
1912 array_verify (EV_A_ (W *)checks, checkcnt); 1942 array_verify (EV_A_ (W *)checks, checkcnt);
1943#endif
1913 1944
1914# if 0 1945# if 0
1946#if EV_CHILD_ENABLE
1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1947 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1948 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1949#endif
1917# endif 1950# endif
1918#endif 1951#endif
1919} 1952}
1920#endif 1953#endif
1921 1954
… …
1937 1970
1938 loop_init (EV_A_ flags); 1971 loop_init (EV_A_ flags);
1939 1972
1940 if (ev_backend (EV_A)) 1973 if (ev_backend (EV_A))
1941 { 1974 {
1942#ifndef _WIN32 1975#if EV_CHILD_ENABLE
1943 ev_signal_init (&childev, childcb, SIGCHLD); 1976 ev_signal_init (&childev, childcb, SIGCHLD);
1944 ev_set_priority (&childev, EV_MAXPRI); 1977 ev_set_priority (&childev, EV_MAXPRI);
1945 ev_signal_start (EV_A_ &childev); 1978 ev_signal_start (EV_A_ &childev);
1946 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1979 ev_unref (EV_A); /* child watcher should not keep loop alive */
1947#endif 1980#endif
… …
1960 EV_P = ev_default_loop_ptr; 1993 EV_P = ev_default_loop_ptr;
1961#endif 1994#endif
1962 1995
1963 ev_default_loop_ptr = 0; 1996 ev_default_loop_ptr = 0;
1964 1997
1965#ifndef _WIN32 1998#if EV_CHILD_ENABLE
1966 ev_ref (EV_A); /* child watcher */ 1999 ev_ref (EV_A); /* child watcher */
1967 ev_signal_stop (EV_A_ &childev); 2000 ev_signal_stop (EV_A_ &childev);
1968#endif 2001#endif
1969 2002
1970 loop_destroy (EV_A); 2003 loop_destroy (EV_A);
… …
2076 EV_FREQUENT_CHECK; 2109 EV_FREQUENT_CHECK;
2077 feed_reverse (EV_A_ (W)w); 2110 feed_reverse (EV_A_ (W)w);
2078 } 2111 }
2079 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2112 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2080 2113
2081 feed_reverse_done (EV_A_ EV_TIMEOUT); 2114 feed_reverse_done (EV_A_ EV_TIMER);
2082 } 2115 }
2083} 2116}
2084 2117
2085#if EV_PERIODIC_ENABLE 2118#if EV_PERIODIC_ENABLE
2086/* make periodics pending */ 2119/* make periodics pending */
… …
2139 feed_reverse_done (EV_A_ EV_PERIODIC); 2172 feed_reverse_done (EV_A_ EV_PERIODIC);
2140 } 2173 }
2141} 2174}
2142 2175
2143/* simply recalculate all periodics */ 2176/* simply recalculate all periodics */
2144/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2177/* TODO: maybe ensure that at least one event happens when jumping forward? */
2145static void noinline 2178static void noinline
2146periodics_reschedule (EV_P) 2179periodics_reschedule (EV_P)
2147{ 2180{
2148 int i; 2181 int i;
2149 2182
… …
2245 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2246 } 2279 }
2247} 2280}
2248 2281
2249void 2282void
2250ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2251{ 2284{
2252#if EV_MINIMAL < 2 2285#if EV_FEATURE_API
2253 ++loop_depth; 2286 ++loop_depth;
2254#endif 2287#endif
2255 2288
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2289 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2257 2290
2258 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2259 2292
2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2293 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2261 2294
2262 do 2295 do
2263 { 2296 {
2264#if EV_VERIFY >= 2 2297#if EV_VERIFY >= 2
2265 ev_loop_verify (EV_A); 2298 ev_verify (EV_A);
2266#endif 2299#endif
2267 2300
2268#ifndef _WIN32 2301#ifndef _WIN32
2269 if (expect_false (curpid)) /* penalise the forking check even more */ 2302 if (expect_false (curpid)) /* penalise the forking check even more */
2270 if (expect_false (getpid () != curpid)) 2303 if (expect_false (getpid () != curpid))
… …
2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2315 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2283 EV_INVOKE_PENDING; 2316 EV_INVOKE_PENDING;
2284 } 2317 }
2285#endif 2318#endif
2286 2319
2320#if EV_PREPARE_ENABLE
2287 /* queue prepare watchers (and execute them) */ 2321 /* queue prepare watchers (and execute them) */
2288 if (expect_false (preparecnt)) 2322 if (expect_false (preparecnt))
2289 { 2323 {
2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2324 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2291 EV_INVOKE_PENDING; 2325 EV_INVOKE_PENDING;
2292 } 2326 }
2327#endif
2293 2328
2294 if (expect_false (loop_done)) 2329 if (expect_false (loop_done))
2295 break; 2330 break;
2296 2331
2297 /* we might have forked, so reify kernel state if necessary */ 2332 /* we might have forked, so reify kernel state if necessary */
… …
2304 /* calculate blocking time */ 2339 /* calculate blocking time */
2305 { 2340 {
2306 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2307 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2308 2343
2344 /* remember old timestamp for io_blocktime calculation */
2345 ev_tstamp prev_mn_now = mn_now;
2346
2347 /* update time to cancel out callback processing overhead */
2348 time_update (EV_A_ 1e100);
2349
2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2310 { 2351 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
2314 /* update time to cancel out callback processing overhead */
2315 time_update (EV_A_ 1e100);
2316
2317 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2318 2353
2319 if (timercnt) 2354 if (timercnt)
2320 { 2355 {
2321 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2348 waittime -= sleeptime; 2383 waittime -= sleeptime;
2349 } 2384 }
2350 } 2385 }
2351 } 2386 }
2352 2387
2353#if EV_MINIMAL < 2 2388#if EV_FEATURE_API
2354 ++loop_count; 2389 ++loop_count;
2355#endif 2390#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2357 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2359 2394
2360 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2361 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2362 } 2397 }
2363 2398
… …
2370#if EV_IDLE_ENABLE 2405#if EV_IDLE_ENABLE
2371 /* queue idle watchers unless other events are pending */ 2406 /* queue idle watchers unless other events are pending */
2372 idle_reify (EV_A); 2407 idle_reify (EV_A);
2373#endif 2408#endif
2374 2409
2410#if EV_CHECK_ENABLE
2375 /* queue check watchers, to be executed first */ 2411 /* queue check watchers, to be executed first */
2376 if (expect_false (checkcnt)) 2412 if (expect_false (checkcnt))
2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2413 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2414#endif
2378 2415
2379 EV_INVOKE_PENDING; 2416 EV_INVOKE_PENDING;
2380 } 2417 }
2381 while (expect_true ( 2418 while (expect_true (
2382 activecnt 2419 activecnt
2383 && !loop_done 2420 && !loop_done
2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2385 )); 2422 ));
2386 2423
2387 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2388 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2389 2426
2390#if EV_MINIMAL < 2 2427#if EV_FEATURE_API
2391 --loop_depth; 2428 --loop_depth;
2392#endif 2429#endif
2393} 2430}
2394 2431
2395void 2432void
2396ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2397{ 2434{
2398 loop_done = how; 2435 loop_done = how;
2399} 2436}
2400 2437
2401void 2438void
… …
2549 EV_FREQUENT_CHECK; 2586 EV_FREQUENT_CHECK;
2550 2587
2551 wlist_del (&anfds[w->fd].head, (WL)w); 2588 wlist_del (&anfds[w->fd].head, (WL)w);
2552 ev_stop (EV_A_ (W)w); 2589 ev_stop (EV_A_ (W)w);
2553 2590
2554 fd_change (EV_A_ w->fd, 1); 2591 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2555 2592
2556 EV_FREQUENT_CHECK; 2593 EV_FREQUENT_CHECK;
2557} 2594}
2558 2595
2559void noinline 2596void noinline
… …
2712 2749
2713#ifndef SA_RESTART 2750#ifndef SA_RESTART
2714# define SA_RESTART 0 2751# define SA_RESTART 0
2715#endif 2752#endif
2716 2753
2754#if EV_SIGNAL_ENABLE
2755
2717void noinline 2756void noinline
2718ev_signal_start (EV_P_ ev_signal *w) 2757ev_signal_start (EV_P_ ev_signal *w)
2719{ 2758{
2720 if (expect_false (ev_is_active (w))) 2759 if (expect_false (ev_is_active (w)))
2721 return; 2760 return;
… …
2827 } 2866 }
2828 2867
2829 EV_FREQUENT_CHECK; 2868 EV_FREQUENT_CHECK;
2830} 2869}
2831 2870
2871#endif
2872
2873#if EV_CHILD_ENABLE
2874
2832void 2875void
2833ev_child_start (EV_P_ ev_child *w) 2876ev_child_start (EV_P_ ev_child *w)
2834{ 2877{
2835#if EV_MULTIPLICITY 2878#if EV_MULTIPLICITY
2836 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2879 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2839 return; 2882 return;
2840 2883
2841 EV_FREQUENT_CHECK; 2884 EV_FREQUENT_CHECK;
2842 2885
2843 ev_start (EV_A_ (W)w, 1); 2886 ev_start (EV_A_ (W)w, 1);
2844 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2887 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2845 2888
2846 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2847} 2890}
2848 2891
2849void 2892void
… …
2853 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2854 return; 2897 return;
2855 2898
2856 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2857 2900
2858 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2859 ev_stop (EV_A_ (W)w); 2902 ev_stop (EV_A_ (W)w);
2860 2903
2861 EV_FREQUENT_CHECK; 2904 EV_FREQUENT_CHECK;
2862} 2905}
2906
2907#endif
2863 2908
2864#if EV_STAT_ENABLE 2909#if EV_STAT_ENABLE
2865 2910
2866# ifdef _WIN32 2911# ifdef _WIN32
2867# undef lstat 2912# undef lstat
… …
2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2979 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2935 } 2980 }
2936 } 2981 }
2937 2982
2938 if (w->wd >= 0) 2983 if (w->wd >= 0)
2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2984 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2940 2985
2941 /* now re-arm timer, if required */ 2986 /* now re-arm timer, if required */
2942 if (ev_is_active (&w->timer)) ev_ref (EV_A); 2987 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2943 ev_timer_again (EV_A_ &w->timer); 2988 ev_timer_again (EV_A_ &w->timer);
2944 if (ev_is_active (&w->timer)) ev_unref (EV_A); 2989 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2952 2997
2953 if (wd < 0) 2998 if (wd < 0)
2954 return; 2999 return;
2955 3000
2956 w->wd = -2; 3001 w->wd = -2;
2957 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3002 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2958 wlist_del (&fs_hash [slot].head, (WL)w); 3003 wlist_del (&fs_hash [slot].head, (WL)w);
2959 3004
2960 /* remove this watcher, if others are watching it, they will rearm */ 3005 /* remove this watcher, if others are watching it, they will rearm */
2961 inotify_rm_watch (fs_fd, wd); 3006 inotify_rm_watch (fs_fd, wd);
2962} 3007}
… …
2964static void noinline 3009static void noinline
2965infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3010infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2966{ 3011{
2967 if (slot < 0) 3012 if (slot < 0)
2968 /* overflow, need to check for all hash slots */ 3013 /* overflow, need to check for all hash slots */
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3014 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2970 infy_wd (EV_A_ slot, wd, ev); 3015 infy_wd (EV_A_ slot, wd, ev);
2971 else 3016 else
2972 { 3017 {
2973 WL w_; 3018 WL w_;
2974 3019
2975 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3020 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2976 { 3021 {
2977 ev_stat *w = (ev_stat *)w_; 3022 ev_stat *w = (ev_stat *)w_;
2978 w_ = w_->next; /* lets us remove this watcher and all before it */ 3023 w_ = w_->next; /* lets us remove this watcher and all before it */
2979 3024
2980 if (w->wd == wd || wd == -1) 3025 if (w->wd == wd || wd == -1)
2981 { 3026 {
2982 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3027 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2983 { 3028 {
2984 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3029 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2985 w->wd = -1; 3030 w->wd = -1;
2986 infy_add (EV_A_ w); /* re-add, no matter what */ 3031 infy_add (EV_A_ w); /* re-add, no matter what */
2987 } 3032 }
2988 3033
2989 stat_timer_cb (EV_A_ &w->timer, 0); 3034 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3103 ev_io_set (&fs_w, fs_fd, EV_READ); 3148 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w); 3149 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A); 3150 ev_unref (EV_A);
3106 } 3151 }
3107 3152
3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3153 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3109 { 3154 {
3110 WL w_ = fs_hash [slot].head; 3155 WL w_ = fs_hash [slot].head;
3111 fs_hash [slot].head = 0; 3156 fs_hash [slot].head = 0;
3112 3157
3113 while (w_) 3158 while (w_)
… …
3288 3333
3289 EV_FREQUENT_CHECK; 3334 EV_FREQUENT_CHECK;
3290} 3335}
3291#endif 3336#endif
3292 3337
3338#if EV_PREPARE_ENABLE
3293void 3339void
3294ev_prepare_start (EV_P_ ev_prepare *w) 3340ev_prepare_start (EV_P_ ev_prepare *w)
3295{ 3341{
3296 if (expect_false (ev_is_active (w))) 3342 if (expect_false (ev_is_active (w)))
3297 return; 3343 return;
… …
3323 3369
3324 ev_stop (EV_A_ (W)w); 3370 ev_stop (EV_A_ (W)w);
3325 3371
3326 EV_FREQUENT_CHECK; 3372 EV_FREQUENT_CHECK;
3327} 3373}
3374#endif
3328 3375
3376#if EV_CHECK_ENABLE
3329void 3377void
3330ev_check_start (EV_P_ ev_check *w) 3378ev_check_start (EV_P_ ev_check *w)
3331{ 3379{
3332 if (expect_false (ev_is_active (w))) 3380 if (expect_false (ev_is_active (w)))
3333 return; 3381 return;
… …
3359 3407
3360 ev_stop (EV_A_ (W)w); 3408 ev_stop (EV_A_ (W)w);
3361 3409
3362 EV_FREQUENT_CHECK; 3410 EV_FREQUENT_CHECK;
3363} 3411}
3412#endif
3364 3413
3365#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3366void noinline 3415void noinline
3367ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3368{ 3417{
3369 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3370} 3419}
3371 3420
3372static void 3421static void
3373embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3374{ 3423{
3375 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3376 3425
3377 if (ev_cb (w)) 3426 if (ev_cb (w))
3378 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3379 else 3428 else
3380 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3381} 3430}
3382 3431
3383static void 3432static void
3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3385{ 3434{
… …
3389 EV_P = w->other; 3438 EV_P = w->other;
3390 3439
3391 while (fdchangecnt) 3440 while (fdchangecnt)
3392 { 3441 {
3393 fd_reify (EV_A); 3442 fd_reify (EV_A);
3394 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3395 } 3444 }
3396 } 3445 }
3397} 3446}
3398 3447
3399static void 3448static void
… …
3405 3454
3406 { 3455 {
3407 EV_P = w->other; 3456 EV_P = w->other;
3408 3457
3409 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3410 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3411 } 3460 }
3412 3461
3413 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3414} 3463}
3415 3464
… …
3514ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3515{ 3564{
3516 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3517 return; 3566 return;
3518 3567
3568 w->sent = 0;
3569
3519 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3520 3571
3521 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3522 3573
3523 ev_start (EV_A_ (W)w, ++asynccnt); 3574 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3600{ 3651{
3601 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3652 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3602 3653
3603 if (expect_false (!once)) 3654 if (expect_false (!once))
3604 { 3655 {
3605 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3656 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3606 return; 3657 return;
3607 } 3658 }
3608 3659
3609 once->cb = cb; 3660 once->cb = cb;
3610 once->arg = arg; 3661 once->arg = arg;
… …
3697 if (types & EV_ASYNC) 3748 if (types & EV_ASYNC)
3698 for (i = asynccnt; i--; ) 3749 for (i = asynccnt; i--; )
3699 cb (EV_A_ EV_ASYNC, asyncs [i]); 3750 cb (EV_A_ EV_ASYNC, asyncs [i]);
3700#endif 3751#endif
3701 3752
3753#if EV_PREPARE_ENABLE
3702 if (types & EV_PREPARE) 3754 if (types & EV_PREPARE)
3703 for (i = preparecnt; i--; ) 3755 for (i = preparecnt; i--; )
3704#if EV_EMBED_ENABLE 3756# if EV_EMBED_ENABLE
3705 if (ev_cb (prepares [i]) != embed_prepare_cb) 3757 if (ev_cb (prepares [i]) != embed_prepare_cb)
3706#endif 3758# endif
3707 cb (EV_A_ EV_PREPARE, prepares [i]); 3759 cb (EV_A_ EV_PREPARE, prepares [i]);
3760#endif
3708 3761
3762#if EV_CHECK_ENABLE
3709 if (types & EV_CHECK) 3763 if (types & EV_CHECK)
3710 for (i = checkcnt; i--; ) 3764 for (i = checkcnt; i--; )
3711 cb (EV_A_ EV_CHECK, checks [i]); 3765 cb (EV_A_ EV_CHECK, checks [i]);
3766#endif
3712 3767
3768#if EV_SIGNAL_ENABLE
3713 if (types & EV_SIGNAL) 3769 if (types & EV_SIGNAL)
3714 for (i = 0; i < EV_NSIG - 1; ++i) 3770 for (i = 0; i < EV_NSIG - 1; ++i)
3715 for (wl = signals [i].head; wl; ) 3771 for (wl = signals [i].head; wl; )
3716 { 3772 {
3717 wn = wl->next; 3773 wn = wl->next;
3718 cb (EV_A_ EV_SIGNAL, wl); 3774 cb (EV_A_ EV_SIGNAL, wl);
3719 wl = wn; 3775 wl = wn;
3720 } 3776 }
3777#endif
3721 3778
3779#if EV_CHILD_ENABLE
3722 if (types & EV_CHILD) 3780 if (types & EV_CHILD)
3723 for (i = EV_PID_HASHSIZE; i--; ) 3781 for (i = (EV_PID_HASHSIZE); i--; )
3724 for (wl = childs [i]; wl; ) 3782 for (wl = childs [i]; wl; )
3725 { 3783 {
3726 wn = wl->next; 3784 wn = wl->next;
3727 cb (EV_A_ EV_CHILD, wl); 3785 cb (EV_A_ EV_CHILD, wl);
3728 wl = wn; 3786 wl = wn;
3729 } 3787 }
3788#endif
3730/* EV_STAT 0x00001000 /* stat data changed */ 3789/* EV_STAT 0x00001000 /* stat data changed */
3731/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3790/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3732} 3791}
3733#endif 3792#endif
3734 3793
3735#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3736 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3737#endif 3796#endif
3738 3797
3739#ifdef __cplusplus 3798EV_CPP(})
3740}
3741#endif
3742 3799

Diff Legend

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