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

Comparing libev/ev.c (file contents):
Revision 1.326 by root, Tue Jan 26 04:19:37 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))
… …
542 549
543 if (syserr_cb) 550 if (syserr_cb)
544 syserr_cb (msg); 551 syserr_cb (msg);
545 else 552 else
546 { 553 {
554#if EV_AVOID_STDIO
555 const char *err = strerror (errno);
556
557 ev_printerr (msg);
558 ev_printerr (": ");
559 ev_printerr (err);
560 ev_printerr ("\n");
561#else
547 perror (msg); 562 perror (msg);
563#endif
548 abort (); 564 abort ();
549 } 565 }
550} 566}
551 567
552static void * 568static void *
553ev_realloc_emul (void *ptr, long size) 569ev_realloc_emul (void *ptr, long size)
554{ 570{
571#if __GLIBC__
572 return realloc (ptr, size);
573#else
555 /* some systems, notably openbsd and darwin, fail to properly 574 /* some systems, notably openbsd and darwin, fail to properly
556 * 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
557 * the single unix specification, so work around them here. 576 * the single unix specification, so work around them here.
558 */ 577 */
559 578
560 if (size) 579 if (size)
561 return realloc (ptr, size); 580 return realloc (ptr, size);
562 581
563 free (ptr); 582 free (ptr);
564 return 0; 583 return 0;
584#endif
565} 585}
566 586
567static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 587static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
568 588
569void 589void
… …
577{ 597{
578 ptr = alloc (ptr, size); 598 ptr = alloc (ptr, size);
579 599
580 if (!ptr && size) 600 if (!ptr && size)
581 { 601 {
602#if EV_AVOID_STDIO
603 ev_printerr ("libev: memory allocation failed, aborting.\n");
604#else
582 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 605 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
606#endif
583 abort (); 607 abort ();
584 } 608 }
585 609
586 return ptr; 610 return ptr;
587} 611}
… …
669 693
670 static int ev_default_loop_ptr; 694 static int ev_default_loop_ptr;
671 695
672#endif 696#endif
673 697
674#if EV_MINIMAL < 2 698#if EV_FEATURE_API
675# 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)
676# 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)
677# define EV_INVOKE_PENDING invoke_cb (EV_A) 701# define EV_INVOKE_PENDING invoke_cb (EV_A)
678#else 702#else
679# define EV_RELEASE_CB (void)0 703# define EV_RELEASE_CB (void)0
680# define EV_ACQUIRE_CB (void)0 704# define EV_ACQUIRE_CB (void)0
681# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
682#endif 706#endif
683 707
684#define EVUNLOOP_RECURSE 0x80 708#define EVBREAK_RECURSE 0x80
685 709
686/*****************************************************************************/ 710/*****************************************************************************/
687 711
688#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
689ev_tstamp 713ev_tstamp
… …
733 if (delay > 0.) 757 if (delay > 0.)
734 { 758 {
735#if EV_USE_NANOSLEEP 759#if EV_USE_NANOSLEEP
736 struct timespec ts; 760 struct timespec ts;
737 761
738 ts.tv_sec = (time_t)delay; 762 EV_TS_SET (ts, delay);
739 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
740
741 nanosleep (&ts, 0); 763 nanosleep (&ts, 0);
742#elif defined(_WIN32) 764#elif defined(_WIN32)
743 Sleep ((unsigned long)(delay * 1e3)); 765 Sleep ((unsigned long)(delay * 1e3));
744#else 766#else
745 struct timeval tv; 767 struct timeval tv;
746 768
747 tv.tv_sec = (time_t)delay;
748 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
749
750 /* 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 */
751 /* something not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
752 /* by older ones */ 771 /* by older ones */
772 EV_TV_SET (tv, delay);
753 select (0, 0, 0, 0, &tv); 773 select (0, 0, 0, 0, &tv);
754#endif 774#endif
755 } 775 }
756} 776}
757 777
758/*****************************************************************************/ 778/*****************************************************************************/
759 779
760#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 */
761 781
762/* find a suitable new size for the given array, */ 782/* find a suitable new size for the given array, */
763/* hopefully by rounding to a ncie-to-malloc size */ 783/* hopefully by rounding to a nice-to-malloc size */
764inline_size int 784inline_size int
765array_nextsize (int elem, int cur, int cnt) 785array_nextsize (int elem, int cur, int cnt)
766{ 786{
767 int ncur = cur + 1; 787 int ncur = cur + 1;
768 788
… …
864} 884}
865 885
866/*****************************************************************************/ 886/*****************************************************************************/
867 887
868inline_speed void 888inline_speed void
869fd_event_nc (EV_P_ int fd, int revents) 889fd_event_nocheck (EV_P_ int fd, int revents)
870{ 890{
871 ANFD *anfd = anfds + fd; 891 ANFD *anfd = anfds + fd;
872 ev_io *w; 892 ev_io *w;
873 893
874 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)
… …
886fd_event (EV_P_ int fd, int revents) 906fd_event (EV_P_ int fd, int revents)
887{ 907{
888 ANFD *anfd = anfds + fd; 908 ANFD *anfd = anfds + fd;
889 909
890 if (expect_true (!anfd->reify)) 910 if (expect_true (!anfd->reify))
891 fd_event_nc (EV_A_ fd, revents); 911 fd_event_nocheck (EV_A_ fd, revents);
892} 912}
893 913
894void 914void
895ev_feed_fd_event (EV_P_ int fd, int revents) 915ev_feed_fd_event (EV_P_ int fd, int revents)
896{ 916{
897 if (fd >= 0 && fd < anfdmax) 917 if (fd >= 0 && fd < anfdmax)
898 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
899} 919}
900 920
901/* make sure the external fd watch events are in-sync */ 921/* make sure the external fd watch events are in-sync */
902/* with the kernel/libev internal state */ 922/* with the kernel/libev internal state */
903inline_size void 923inline_size void
… …
909 { 929 {
910 int fd = fdchanges [i]; 930 int fd = fdchanges [i];
911 ANFD *anfd = anfds + fd; 931 ANFD *anfd = anfds + fd;
912 ev_io *w; 932 ev_io *w;
913 933
914 unsigned char events = 0; 934 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify;
915 936
916 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 937 anfd->reify = 0;
917 events |= (unsigned char)w->events;
918 938
919#if EV_SELECT_IS_WINSOCKET 939#if EV_SELECT_IS_WINSOCKET
920 if (events) 940 if (o_reify & EV__IOFDSET)
921 { 941 {
922 unsigned long arg; 942 unsigned long arg;
923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 943 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
924 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));
925 } 945 }
926#endif 946#endif
927 947
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
928 { 949 {
929 unsigned char o_events = anfd->events;
930 unsigned char o_reify = anfd->reify;
931
932 anfd->reify = 0;
933 anfd->events = events; 950 anfd->events = 0;
934 951
935 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)
936 backend_modify (EV_A_ fd, o_events, events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
937 }
938 } 961 }
939 962
940 fdchangecnt = 0; 963 fdchangecnt = 0;
941} 964}
942 965
… …
966 ev_io_stop (EV_A_ w); 989 ev_io_stop (EV_A_ w);
967 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);
968 } 991 }
969} 992}
970 993
971/* check whether the given fd is atcually valid, for error recovery */ 994/* check whether the given fd is actually valid, for error recovery */
972inline_size int 995inline_size int
973fd_valid (int fd) 996fd_valid (int fd)
974{ 997{
975#ifdef _WIN32 998#ifdef _WIN32
976 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 999 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1018 anfds [fd].emask = 0; 1041 anfds [fd].emask = 0;
1019 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1042 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1020 } 1043 }
1021} 1044}
1022 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
1023/*****************************************************************************/ 1060/*****************************************************************************/
1024 1061
1025/* 1062/*
1026 * 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
1027 * 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
1028 * the branching factor of the d-tree. 1065 * the branching factor of the d-tree.
1029 */ 1066 */
1030 1067
1031/* 1068/*
… …
1179 1216
1180static ANSIG signals [EV_NSIG - 1]; 1217static ANSIG signals [EV_NSIG - 1];
1181 1218
1182/*****************************************************************************/ 1219/*****************************************************************************/
1183 1220
1184/* used to prepare libev internal fd's */ 1221#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1185/* this is not fork-safe */
1186inline_speed void
1187fd_intern (int fd)
1188{
1189#ifdef _WIN32
1190 unsigned long arg = 1;
1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1192#else
1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1195#endif
1196}
1197 1222
1198static void noinline 1223static void noinline
1199evpipe_init (EV_P) 1224evpipe_init (EV_P)
1200{ 1225{
1201 if (!ev_is_active (&pipe_w)) 1226 if (!ev_is_active (&pipe_w))
1202 { 1227 {
1203#if EV_USE_EVENTFD 1228# if EV_USE_EVENTFD
1204 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1229 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1205 if (evfd < 0 && errno == EINVAL) 1230 if (evfd < 0 && errno == EINVAL)
1206 evfd = eventfd (0, 0); 1231 evfd = eventfd (0, 0);
1207 1232
1208 if (evfd >= 0) 1233 if (evfd >= 0)
… …
1210 evpipe [0] = -1; 1235 evpipe [0] = -1;
1211 fd_intern (evfd); /* doing it twice doesn't hurt */ 1236 fd_intern (evfd); /* doing it twice doesn't hurt */
1212 ev_io_set (&pipe_w, evfd, EV_READ); 1237 ev_io_set (&pipe_w, evfd, EV_READ);
1213 } 1238 }
1214 else 1239 else
1215#endif 1240# endif
1216 { 1241 {
1217 while (pipe (evpipe)) 1242 while (pipe (evpipe))
1218 ev_syserr ("(libev) error creating signal/async pipe"); 1243 ev_syserr ("(libev) error creating signal/async pipe");
1219 1244
1220 fd_intern (evpipe [0]); 1245 fd_intern (evpipe [0]);
… …
1231evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1256evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1232{ 1257{
1233 if (!*flag) 1258 if (!*flag)
1234 { 1259 {
1235 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;
1236 1262
1237 *flag = 1; 1263 *flag = 1;
1238 1264
1239#if EV_USE_EVENTFD 1265#if EV_USE_EVENTFD
1240 if (evfd >= 0) 1266 if (evfd >= 0)
… …
1242 uint64_t counter = 1; 1268 uint64_t counter = 1;
1243 write (evfd, &counter, sizeof (uint64_t)); 1269 write (evfd, &counter, sizeof (uint64_t));
1244 } 1270 }
1245 else 1271 else
1246#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. */
1247 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1248 1279
1249 errno = old_errno; 1280 errno = old_errno;
1250 } 1281 }
1251} 1282}
1252 1283
… …
1265 } 1296 }
1266 else 1297 else
1267#endif 1298#endif
1268 { 1299 {
1269 char dummy; 1300 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1270 read (evpipe [0], &dummy, 1); 1302 read (evpipe [0], &dummy, 1);
1271 } 1303 }
1272 1304
1273 if (sig_pending) 1305 if (sig_pending)
1274 { 1306 {
… …
1353 break; 1385 break;
1354 } 1386 }
1355} 1387}
1356#endif 1388#endif
1357 1389
1390#endif
1391
1358/*****************************************************************************/ 1392/*****************************************************************************/
1359 1393
1394#if EV_CHILD_ENABLE
1360static WL childs [EV_PID_HASHSIZE]; 1395static WL childs [EV_PID_HASHSIZE];
1361
1362#ifndef _WIN32
1363 1396
1364static ev_signal childev; 1397static ev_signal childev;
1365 1398
1366#ifndef WIFCONTINUED 1399#ifndef WIFCONTINUED
1367# define WIFCONTINUED(status) 0 1400# define WIFCONTINUED(status) 0
… …
1372child_reap (EV_P_ int chain, int pid, int status) 1405child_reap (EV_P_ int chain, int pid, int status)
1373{ 1406{
1374 ev_child *w; 1407 ev_child *w;
1375 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1408 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1376 1409
1377 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)
1378 { 1411 {
1379 if ((w->pid == pid || !w->pid) 1412 if ((w->pid == pid || !w->pid)
1380 && (!traced || (w->flags & 1))) 1413 && (!traced || (w->flags & 1)))
1381 { 1414 {
1382 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 */
… …
1407 /* 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 */
1408 /* 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 */
1409 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1442 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1410 1443
1411 child_reap (EV_A_ pid, pid, status); 1444 child_reap (EV_A_ pid, pid, status);
1412 if (EV_PID_HASHSIZE > 1) 1445 if ((EV_PID_HASHSIZE) > 1)
1413 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 */
1414} 1447}
1415 1448
1416#endif 1449#endif
1417 1450
… …
1484#ifdef __APPLE__ 1517#ifdef __APPLE__
1485 /* only select works correctly on that "unix-certified" platform */ 1518 /* only select works correctly on that "unix-certified" platform */
1486 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1519 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1487 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 */
1488#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
1489 1525
1490 return flags; 1526 return flags;
1491} 1527}
1492 1528
1493unsigned int 1529unsigned int
… …
1506ev_backend (EV_P) 1542ev_backend (EV_P)
1507{ 1543{
1508 return backend; 1544 return backend;
1509} 1545}
1510 1546
1511#if EV_MINIMAL < 2 1547#if EV_FEATURE_API
1512unsigned int 1548unsigned int
1513ev_loop_count (EV_P) 1549ev_iteration (EV_P)
1514{ 1550{
1515 return loop_count; 1551 return loop_count;
1516} 1552}
1517 1553
1518unsigned int 1554unsigned int
1519ev_loop_depth (EV_P) 1555ev_depth (EV_P)
1520{ 1556{
1521 return loop_depth; 1557 return loop_depth;
1522} 1558}
1523 1559
1524void 1560void
… …
1596 1632
1597 ev_rt_now = ev_time (); 1633 ev_rt_now = ev_time ();
1598 mn_now = get_clock (); 1634 mn_now = get_clock ();
1599 now_floor = mn_now; 1635 now_floor = mn_now;
1600 rtmn_diff = ev_rt_now - mn_now; 1636 rtmn_diff = ev_rt_now - mn_now;
1601#if EV_MINIMAL < 2 1637#if EV_FEATURE_API
1602 invoke_cb = ev_invoke_pending; 1638 invoke_cb = ev_invoke_pending;
1603#endif 1639#endif
1604 1640
1605 io_blocktime = 0.; 1641 io_blocktime = 0.;
1606 timeout_blocktime = 0.; 1642 timeout_blocktime = 0.;
… …
1636 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1672 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1637#endif 1673#endif
1638 1674
1639 ev_prepare_init (&pending_w, pendingcb); 1675 ev_prepare_init (&pending_w, pendingcb);
1640 1676
1677#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1641 ev_init (&pipe_w, pipecb); 1678 ev_init (&pipe_w, pipecb);
1642 ev_set_priority (&pipe_w, EV_MAXPRI); 1679 ev_set_priority (&pipe_w, EV_MAXPRI);
1680#endif
1643 } 1681 }
1644} 1682}
1645 1683
1646/* free up a loop structure */ 1684/* free up a loop structure */
1647static void noinline 1685static void noinline
… …
1765 { 1803 {
1766 EV_WIN32_CLOSE_FD (evpipe [0]); 1804 EV_WIN32_CLOSE_FD (evpipe [0]);
1767 EV_WIN32_CLOSE_FD (evpipe [1]); 1805 EV_WIN32_CLOSE_FD (evpipe [1]);
1768 } 1806 }
1769 1807
1808#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1770 evpipe_init (EV_A); 1809 evpipe_init (EV_A);
1771 /* now iterate over everything, in case we missed something */ 1810 /* now iterate over everything, in case we missed something */
1772 pipecb (EV_A_ &pipe_w, EV_READ); 1811 pipecb (EV_A_ &pipe_w, EV_READ);
1812#endif
1773 } 1813 }
1774 1814
1775 postfork = 0; 1815 postfork = 0;
1776} 1816}
1777 1817
… …
1839 verify_watcher (EV_A_ ws [cnt]); 1879 verify_watcher (EV_A_ ws [cnt]);
1840 } 1880 }
1841} 1881}
1842#endif 1882#endif
1843 1883
1844#if EV_MINIMAL < 2 1884#if EV_FEATURE_API
1845void 1885void
1846ev_loop_verify (EV_P) 1886ev_verify (EV_P)
1847{ 1887{
1848#if EV_VERIFY 1888#if EV_VERIFY
1849 int i; 1889 int i;
1850 WL w; 1890 WL w;
1851 1891
… …
1890#if EV_ASYNC_ENABLE 1930#if EV_ASYNC_ENABLE
1891 assert (asyncmax >= asynccnt); 1931 assert (asyncmax >= asynccnt);
1892 array_verify (EV_A_ (W *)asyncs, asynccnt); 1932 array_verify (EV_A_ (W *)asyncs, asynccnt);
1893#endif 1933#endif
1894 1934
1935#if EV_PREPARE_ENABLE
1895 assert (preparemax >= preparecnt); 1936 assert (preparemax >= preparecnt);
1896 array_verify (EV_A_ (W *)prepares, preparecnt); 1937 array_verify (EV_A_ (W *)prepares, preparecnt);
1938#endif
1897 1939
1940#if EV_CHECK_ENABLE
1898 assert (checkmax >= checkcnt); 1941 assert (checkmax >= checkcnt);
1899 array_verify (EV_A_ (W *)checks, checkcnt); 1942 array_verify (EV_A_ (W *)checks, checkcnt);
1943#endif
1900 1944
1901# if 0 1945# if 0
1946#if EV_CHILD_ENABLE
1902 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)
1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1948 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1949#endif
1904# endif 1950# endif
1905#endif 1951#endif
1906} 1952}
1907#endif 1953#endif
1908 1954
… …
1924 1970
1925 loop_init (EV_A_ flags); 1971 loop_init (EV_A_ flags);
1926 1972
1927 if (ev_backend (EV_A)) 1973 if (ev_backend (EV_A))
1928 { 1974 {
1929#ifndef _WIN32 1975#if EV_CHILD_ENABLE
1930 ev_signal_init (&childev, childcb, SIGCHLD); 1976 ev_signal_init (&childev, childcb, SIGCHLD);
1931 ev_set_priority (&childev, EV_MAXPRI); 1977 ev_set_priority (&childev, EV_MAXPRI);
1932 ev_signal_start (EV_A_ &childev); 1978 ev_signal_start (EV_A_ &childev);
1933 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1979 ev_unref (EV_A); /* child watcher should not keep loop alive */
1934#endif 1980#endif
… …
1947 EV_P = ev_default_loop_ptr; 1993 EV_P = ev_default_loop_ptr;
1948#endif 1994#endif
1949 1995
1950 ev_default_loop_ptr = 0; 1996 ev_default_loop_ptr = 0;
1951 1997
1952#ifndef _WIN32 1998#if EV_CHILD_ENABLE
1953 ev_ref (EV_A); /* child watcher */ 1999 ev_ref (EV_A); /* child watcher */
1954 ev_signal_stop (EV_A_ &childev); 2000 ev_signal_stop (EV_A_ &childev);
1955#endif 2001#endif
1956 2002
1957 loop_destroy (EV_A); 2003 loop_destroy (EV_A);
… …
2063 EV_FREQUENT_CHECK; 2109 EV_FREQUENT_CHECK;
2064 feed_reverse (EV_A_ (W)w); 2110 feed_reverse (EV_A_ (W)w);
2065 } 2111 }
2066 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2112 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2067 2113
2068 feed_reverse_done (EV_A_ EV_TIMEOUT); 2114 feed_reverse_done (EV_A_ EV_TIMER);
2069 } 2115 }
2070} 2116}
2071 2117
2072#if EV_PERIODIC_ENABLE 2118#if EV_PERIODIC_ENABLE
2073/* make periodics pending */ 2119/* make periodics pending */
… …
2126 feed_reverse_done (EV_A_ EV_PERIODIC); 2172 feed_reverse_done (EV_A_ EV_PERIODIC);
2127 } 2173 }
2128} 2174}
2129 2175
2130/* simply recalculate all periodics */ 2176/* simply recalculate all periodics */
2131/* 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? */
2132static void noinline 2178static void noinline
2133periodics_reschedule (EV_P) 2179periodics_reschedule (EV_P)
2134{ 2180{
2135 int i; 2181 int i;
2136 2182
… …
2232 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2233 } 2279 }
2234} 2280}
2235 2281
2236void 2282void
2237ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2238{ 2284{
2239#if EV_MINIMAL < 2 2285#if EV_FEATURE_API
2240 ++loop_depth; 2286 ++loop_depth;
2241#endif 2287#endif
2242 2288
2243 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));
2244 2290
2245 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2246 2292
2247 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 */
2248 2294
2249 do 2295 do
2250 { 2296 {
2251#if EV_VERIFY >= 2 2297#if EV_VERIFY >= 2
2252 ev_loop_verify (EV_A); 2298 ev_verify (EV_A);
2253#endif 2299#endif
2254 2300
2255#ifndef _WIN32 2301#ifndef _WIN32
2256 if (expect_false (curpid)) /* penalise the forking check even more */ 2302 if (expect_false (curpid)) /* penalise the forking check even more */
2257 if (expect_false (getpid () != curpid)) 2303 if (expect_false (getpid () != curpid))
… …
2269 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2315 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2270 EV_INVOKE_PENDING; 2316 EV_INVOKE_PENDING;
2271 } 2317 }
2272#endif 2318#endif
2273 2319
2320#if EV_PREPARE_ENABLE
2274 /* queue prepare watchers (and execute them) */ 2321 /* queue prepare watchers (and execute them) */
2275 if (expect_false (preparecnt)) 2322 if (expect_false (preparecnt))
2276 { 2323 {
2277 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2324 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2278 EV_INVOKE_PENDING; 2325 EV_INVOKE_PENDING;
2279 } 2326 }
2327#endif
2280 2328
2281 if (expect_false (loop_done)) 2329 if (expect_false (loop_done))
2282 break; 2330 break;
2283 2331
2284 /* we might have forked, so reify kernel state if necessary */ 2332 /* we might have forked, so reify kernel state if necessary */
… …
2291 /* calculate blocking time */ 2339 /* calculate blocking time */
2292 { 2340 {
2293 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2294 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2295 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
2296 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2297 { 2351 {
2298 /* remember old timestamp for io_blocktime calculation */
2299 ev_tstamp prev_mn_now = mn_now;
2300
2301 /* update time to cancel out callback processing overhead */
2302 time_update (EV_A_ 1e100);
2303
2304 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2305 2353
2306 if (timercnt) 2354 if (timercnt)
2307 { 2355 {
2308 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2335 waittime -= sleeptime; 2383 waittime -= sleeptime;
2336 } 2384 }
2337 } 2385 }
2338 } 2386 }
2339 2387
2340#if EV_MINIMAL < 2 2388#if EV_FEATURE_API
2341 ++loop_count; 2389 ++loop_count;
2342#endif 2390#endif
2343 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2344 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2345 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2346 2394
2347 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2348 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2349 } 2397 }
2350 2398
… …
2357#if EV_IDLE_ENABLE 2405#if EV_IDLE_ENABLE
2358 /* queue idle watchers unless other events are pending */ 2406 /* queue idle watchers unless other events are pending */
2359 idle_reify (EV_A); 2407 idle_reify (EV_A);
2360#endif 2408#endif
2361 2409
2410#if EV_CHECK_ENABLE
2362 /* queue check watchers, to be executed first */ 2411 /* queue check watchers, to be executed first */
2363 if (expect_false (checkcnt)) 2412 if (expect_false (checkcnt))
2364 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2413 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2414#endif
2365 2415
2366 EV_INVOKE_PENDING; 2416 EV_INVOKE_PENDING;
2367 } 2417 }
2368 while (expect_true ( 2418 while (expect_true (
2369 activecnt 2419 activecnt
2370 && !loop_done 2420 && !loop_done
2371 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2372 )); 2422 ));
2373 2423
2374 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2375 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2376 2426
2377#if EV_MINIMAL < 2 2427#if EV_FEATURE_API
2378 --loop_depth; 2428 --loop_depth;
2379#endif 2429#endif
2380} 2430}
2381 2431
2382void 2432void
2383ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2384{ 2434{
2385 loop_done = how; 2435 loop_done = how;
2386} 2436}
2387 2437
2388void 2438void
… …
2508 2558
2509 if (expect_false (ev_is_active (w))) 2559 if (expect_false (ev_is_active (w)))
2510 return; 2560 return;
2511 2561
2512 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2562 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2513 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2563 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2514 2564
2515 EV_FREQUENT_CHECK; 2565 EV_FREQUENT_CHECK;
2516 2566
2517 ev_start (EV_A_ (W)w, 1); 2567 ev_start (EV_A_ (W)w, 1);
2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2568 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2536 EV_FREQUENT_CHECK; 2586 EV_FREQUENT_CHECK;
2537 2587
2538 wlist_del (&anfds[w->fd].head, (WL)w); 2588 wlist_del (&anfds[w->fd].head, (WL)w);
2539 ev_stop (EV_A_ (W)w); 2589 ev_stop (EV_A_ (W)w);
2540 2590
2541 fd_change (EV_A_ w->fd, 1); 2591 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2542 2592
2543 EV_FREQUENT_CHECK; 2593 EV_FREQUENT_CHECK;
2544} 2594}
2545 2595
2546void noinline 2596void noinline
… …
2588 timers [active] = timers [timercnt + HEAP0]; 2638 timers [active] = timers [timercnt + HEAP0];
2589 adjustheap (timers, timercnt, active); 2639 adjustheap (timers, timercnt, active);
2590 } 2640 }
2591 } 2641 }
2592 2642
2593 EV_FREQUENT_CHECK;
2594
2595 ev_at (w) -= mn_now; 2643 ev_at (w) -= mn_now;
2596 2644
2597 ev_stop (EV_A_ (W)w); 2645 ev_stop (EV_A_ (W)w);
2646
2647 EV_FREQUENT_CHECK;
2598} 2648}
2599 2649
2600void noinline 2650void noinline
2601ev_timer_again (EV_P_ ev_timer *w) 2651ev_timer_again (EV_P_ ev_timer *w)
2602{ 2652{
… …
2681 periodics [active] = periodics [periodiccnt + HEAP0]; 2731 periodics [active] = periodics [periodiccnt + HEAP0];
2682 adjustheap (periodics, periodiccnt, active); 2732 adjustheap (periodics, periodiccnt, active);
2683 } 2733 }
2684 } 2734 }
2685 2735
2686 EV_FREQUENT_CHECK;
2687
2688 ev_stop (EV_A_ (W)w); 2736 ev_stop (EV_A_ (W)w);
2737
2738 EV_FREQUENT_CHECK;
2689} 2739}
2690 2740
2691void noinline 2741void noinline
2692ev_periodic_again (EV_P_ ev_periodic *w) 2742ev_periodic_again (EV_P_ ev_periodic *w)
2693{ 2743{
… …
2698#endif 2748#endif
2699 2749
2700#ifndef SA_RESTART 2750#ifndef SA_RESTART
2701# define SA_RESTART 0 2751# define SA_RESTART 0
2702#endif 2752#endif
2753
2754#if EV_SIGNAL_ENABLE
2703 2755
2704void noinline 2756void noinline
2705ev_signal_start (EV_P_ ev_signal *w) 2757ev_signal_start (EV_P_ ev_signal *w)
2706{ 2758{
2707 if (expect_false (ev_is_active (w))) 2759 if (expect_false (ev_is_active (w)))
… …
2814 } 2866 }
2815 2867
2816 EV_FREQUENT_CHECK; 2868 EV_FREQUENT_CHECK;
2817} 2869}
2818 2870
2871#endif
2872
2873#if EV_CHILD_ENABLE
2874
2819void 2875void
2820ev_child_start (EV_P_ ev_child *w) 2876ev_child_start (EV_P_ ev_child *w)
2821{ 2877{
2822#if EV_MULTIPLICITY 2878#if EV_MULTIPLICITY
2823 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));
… …
2826 return; 2882 return;
2827 2883
2828 EV_FREQUENT_CHECK; 2884 EV_FREQUENT_CHECK;
2829 2885
2830 ev_start (EV_A_ (W)w, 1); 2886 ev_start (EV_A_ (W)w, 1);
2831 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2887 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2832 2888
2833 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2834} 2890}
2835 2891
2836void 2892void
… …
2840 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2841 return; 2897 return;
2842 2898
2843 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2844 2900
2845 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2846 ev_stop (EV_A_ (W)w); 2902 ev_stop (EV_A_ (W)w);
2847 2903
2848 EV_FREQUENT_CHECK; 2904 EV_FREQUENT_CHECK;
2849} 2905}
2906
2907#endif
2850 2908
2851#if EV_STAT_ENABLE 2909#if EV_STAT_ENABLE
2852 2910
2853# ifdef _WIN32 2911# ifdef _WIN32
2854# undef lstat 2912# undef lstat
… …
2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2979 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2922 } 2980 }
2923 } 2981 }
2924 2982
2925 if (w->wd >= 0) 2983 if (w->wd >= 0)
2926 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);
2927 2985
2928 /* now re-arm timer, if required */ 2986 /* now re-arm timer, if required */
2929 if (ev_is_active (&w->timer)) ev_ref (EV_A); 2987 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2930 ev_timer_again (EV_A_ &w->timer); 2988 ev_timer_again (EV_A_ &w->timer);
2931 if (ev_is_active (&w->timer)) ev_unref (EV_A); 2989 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2939 2997
2940 if (wd < 0) 2998 if (wd < 0)
2941 return; 2999 return;
2942 3000
2943 w->wd = -2; 3001 w->wd = -2;
2944 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3002 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2945 wlist_del (&fs_hash [slot].head, (WL)w); 3003 wlist_del (&fs_hash [slot].head, (WL)w);
2946 3004
2947 /* remove this watcher, if others are watching it, they will rearm */ 3005 /* remove this watcher, if others are watching it, they will rearm */
2948 inotify_rm_watch (fs_fd, wd); 3006 inotify_rm_watch (fs_fd, wd);
2949} 3007}
… …
2951static void noinline 3009static void noinline
2952infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3010infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2953{ 3011{
2954 if (slot < 0) 3012 if (slot < 0)
2955 /* overflow, need to check for all hash slots */ 3013 /* overflow, need to check for all hash slots */
2956 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3014 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2957 infy_wd (EV_A_ slot, wd, ev); 3015 infy_wd (EV_A_ slot, wd, ev);
2958 else 3016 else
2959 { 3017 {
2960 WL w_; 3018 WL w_;
2961 3019
2962 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3020 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2963 { 3021 {
2964 ev_stat *w = (ev_stat *)w_; 3022 ev_stat *w = (ev_stat *)w_;
2965 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 */
2966 3024
2967 if (w->wd == wd || wd == -1) 3025 if (w->wd == wd || wd == -1)
2968 { 3026 {
2969 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3027 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2970 { 3028 {
2971 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);
2972 w->wd = -1; 3030 w->wd = -1;
2973 infy_add (EV_A_ w); /* re-add, no matter what */ 3031 infy_add (EV_A_ w); /* re-add, no matter what */
2974 } 3032 }
2975 3033
2976 stat_timer_cb (EV_A_ &w->timer, 0); 3034 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2992 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3050 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len; 3051 ofs += sizeof (struct inotify_event) + ev->len;
2994 } 3052 }
2995} 3053}
2996 3054
3055inline_size unsigned int
3056ev_linux_version (void)
3057{
3058 struct utsname buf;
3059 unsigned int v;
3060 int i;
3061 char *p = buf.release;
3062
3063 if (uname (&buf))
3064 return 0;
3065
3066 for (i = 3+1; --i; )
3067 {
3068 unsigned int c = 0;
3069
3070 for (;;)
3071 {
3072 if (*p >= '0' && *p <= '9')
3073 c = c * 10 + *p++ - '0';
3074 else
3075 {
3076 p += *p == '.';
3077 break;
3078 }
3079 }
3080
3081 v = (v << 8) | c;
3082 }
3083
3084 return v;
3085}
3086
2997inline_size void 3087inline_size void
2998check_2625 (EV_P) 3088ev_check_2625 (EV_P)
2999{ 3089{
3000 /* kernels < 2.6.25 are borked 3090 /* kernels < 2.6.25 are borked
3001 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3091 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3002 */ 3092 */
3003 struct utsname buf; 3093 if (ev_linux_version () < 0x020619)
3004 int major, minor, micro;
3005
3006 if (uname (&buf))
3007 return;
3008
3009 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
3010 return;
3011
3012 if (major < 2
3013 || (major == 2 && minor < 6)
3014 || (major == 2 && minor == 6 && micro < 25))
3015 return; 3094 return;
3016 3095
3017 fs_2625 = 1; 3096 fs_2625 = 1;
3018} 3097}
3019 3098
… …
3034 if (fs_fd != -2) 3113 if (fs_fd != -2)
3035 return; 3114 return;
3036 3115
3037 fs_fd = -1; 3116 fs_fd = -1;
3038 3117
3039 check_2625 (EV_A); 3118 ev_check_2625 (EV_A);
3040 3119
3041 fs_fd = infy_newfd (); 3120 fs_fd = infy_newfd ();
3042 3121
3043 if (fs_fd >= 0) 3122 if (fs_fd >= 0)
3044 { 3123 {
… …
3069 ev_io_set (&fs_w, fs_fd, EV_READ); 3148 ev_io_set (&fs_w, fs_fd, EV_READ);
3070 ev_io_start (EV_A_ &fs_w); 3149 ev_io_start (EV_A_ &fs_w);
3071 ev_unref (EV_A); 3150 ev_unref (EV_A);
3072 } 3151 }
3073 3152
3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3153 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3075 { 3154 {
3076 WL w_ = fs_hash [slot].head; 3155 WL w_ = fs_hash [slot].head;
3077 fs_hash [slot].head = 0; 3156 fs_hash [slot].head = 0;
3078 3157
3079 while (w_) 3158 while (w_)
… …
3254 3333
3255 EV_FREQUENT_CHECK; 3334 EV_FREQUENT_CHECK;
3256} 3335}
3257#endif 3336#endif
3258 3337
3338#if EV_PREPARE_ENABLE
3259void 3339void
3260ev_prepare_start (EV_P_ ev_prepare *w) 3340ev_prepare_start (EV_P_ ev_prepare *w)
3261{ 3341{
3262 if (expect_false (ev_is_active (w))) 3342 if (expect_false (ev_is_active (w)))
3263 return; 3343 return;
… …
3289 3369
3290 ev_stop (EV_A_ (W)w); 3370 ev_stop (EV_A_ (W)w);
3291 3371
3292 EV_FREQUENT_CHECK; 3372 EV_FREQUENT_CHECK;
3293} 3373}
3374#endif
3294 3375
3376#if EV_CHECK_ENABLE
3295void 3377void
3296ev_check_start (EV_P_ ev_check *w) 3378ev_check_start (EV_P_ ev_check *w)
3297{ 3379{
3298 if (expect_false (ev_is_active (w))) 3380 if (expect_false (ev_is_active (w)))
3299 return; 3381 return;
… …
3325 3407
3326 ev_stop (EV_A_ (W)w); 3408 ev_stop (EV_A_ (W)w);
3327 3409
3328 EV_FREQUENT_CHECK; 3410 EV_FREQUENT_CHECK;
3329} 3411}
3412#endif
3330 3413
3331#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3332void noinline 3415void noinline
3333ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3334{ 3417{
3335 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3336} 3419}
3337 3420
3338static void 3421static void
3339embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3340{ 3423{
3341 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3342 3425
3343 if (ev_cb (w)) 3426 if (ev_cb (w))
3344 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3345 else 3428 else
3346 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3347} 3430}
3348 3431
3349static void 3432static void
3350embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3351{ 3434{
… …
3355 EV_P = w->other; 3438 EV_P = w->other;
3356 3439
3357 while (fdchangecnt) 3440 while (fdchangecnt)
3358 { 3441 {
3359 fd_reify (EV_A); 3442 fd_reify (EV_A);
3360 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3361 } 3444 }
3362 } 3445 }
3363} 3446}
3364 3447
3365static void 3448static void
… …
3371 3454
3372 { 3455 {
3373 EV_P = w->other; 3456 EV_P = w->other;
3374 3457
3375 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3376 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3377 } 3460 }
3378 3461
3379 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3380} 3463}
3381 3464
… …
3429 3512
3430 ev_io_stop (EV_A_ &w->io); 3513 ev_io_stop (EV_A_ &w->io);
3431 ev_prepare_stop (EV_A_ &w->prepare); 3514 ev_prepare_stop (EV_A_ &w->prepare);
3432 ev_fork_stop (EV_A_ &w->fork); 3515 ev_fork_stop (EV_A_ &w->fork);
3433 3516
3517 ev_stop (EV_A_ (W)w);
3518
3434 EV_FREQUENT_CHECK; 3519 EV_FREQUENT_CHECK;
3435} 3520}
3436#endif 3521#endif
3437 3522
3438#if EV_FORK_ENABLE 3523#if EV_FORK_ENABLE
… …
3477void 3562void
3478ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3479{ 3564{
3480 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3481 return; 3566 return;
3567
3568 w->sent = 0;
3482 3569
3483 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3484 3571
3485 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3486 3573
… …
3564{ 3651{
3565 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));
3566 3653
3567 if (expect_false (!once)) 3654 if (expect_false (!once))
3568 { 3655 {
3569 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3656 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3570 return; 3657 return;
3571 } 3658 }
3572 3659
3573 once->cb = cb; 3660 once->cb = cb;
3574 once->arg = arg; 3661 once->arg = arg;
… …
3661 if (types & EV_ASYNC) 3748 if (types & EV_ASYNC)
3662 for (i = asynccnt; i--; ) 3749 for (i = asynccnt; i--; )
3663 cb (EV_A_ EV_ASYNC, asyncs [i]); 3750 cb (EV_A_ EV_ASYNC, asyncs [i]);
3664#endif 3751#endif
3665 3752
3753#if EV_PREPARE_ENABLE
3666 if (types & EV_PREPARE) 3754 if (types & EV_PREPARE)
3667 for (i = preparecnt; i--; ) 3755 for (i = preparecnt; i--; )
3668#if EV_EMBED_ENABLE 3756# if EV_EMBED_ENABLE
3669 if (ev_cb (prepares [i]) != embed_prepare_cb) 3757 if (ev_cb (prepares [i]) != embed_prepare_cb)
3670#endif 3758# endif
3671 cb (EV_A_ EV_PREPARE, prepares [i]); 3759 cb (EV_A_ EV_PREPARE, prepares [i]);
3760#endif
3672 3761
3762#if EV_CHECK_ENABLE
3673 if (types & EV_CHECK) 3763 if (types & EV_CHECK)
3674 for (i = checkcnt; i--; ) 3764 for (i = checkcnt; i--; )
3675 cb (EV_A_ EV_CHECK, checks [i]); 3765 cb (EV_A_ EV_CHECK, checks [i]);
3766#endif
3676 3767
3768#if EV_SIGNAL_ENABLE
3677 if (types & EV_SIGNAL) 3769 if (types & EV_SIGNAL)
3678 for (i = 0; i < EV_NSIG - 1; ++i) 3770 for (i = 0; i < EV_NSIG - 1; ++i)
3679 for (wl = signals [i].head; wl; ) 3771 for (wl = signals [i].head; wl; )
3680 { 3772 {
3681 wn = wl->next; 3773 wn = wl->next;
3682 cb (EV_A_ EV_SIGNAL, wl); 3774 cb (EV_A_ EV_SIGNAL, wl);
3683 wl = wn; 3775 wl = wn;
3684 } 3776 }
3777#endif
3685 3778
3779#if EV_CHILD_ENABLE
3686 if (types & EV_CHILD) 3780 if (types & EV_CHILD)
3687 for (i = EV_PID_HASHSIZE; i--; ) 3781 for (i = (EV_PID_HASHSIZE); i--; )
3688 for (wl = childs [i]; wl; ) 3782 for (wl = childs [i]; wl; )
3689 { 3783 {
3690 wn = wl->next; 3784 wn = wl->next;
3691 cb (EV_A_ EV_CHILD, wl); 3785 cb (EV_A_ EV_CHILD, wl);
3692 wl = wn; 3786 wl = wn;
3693 } 3787 }
3788#endif
3694/* EV_STAT 0x00001000 /* stat data changed */ 3789/* EV_STAT 0x00001000 /* stat data changed */
3695/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3790/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3696} 3791}
3697#endif 3792#endif
3698 3793
3699#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3700 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3701#endif 3796#endif
3702 3797
3703#ifdef __cplusplus 3798EV_CPP(})
3704}
3705#endif
3706 3799

Diff Legend

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