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

Comparing libev/ev.c (file contents):
Revision 1.333 by root, Tue Mar 9 08:58:22 2010 UTC vs.
Revision 1.357 by root, Sat Oct 23 22:25:44 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 115# ifndef EV_USE_KQUEUE
117# else 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 142# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 143# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
… …
172#ifdef EV_H 177#ifdef EV_H
173# include EV_H 178# include EV_H
174#else 179#else
175# include "ev.h" 180# include "ev.h"
176#endif 181#endif
182
183EV_CPP(extern "C" {)
177 184
178#ifndef _WIN32 185#ifndef _WIN32
179# include <sys/time.h> 186# include <sys/time.h>
180# include <sys/wait.h> 187# include <sys/wait.h>
181# include <unistd.h> 188# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
188# endif 195# endif
189# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
190#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
191 206
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
193 208
194/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
207#elif defined (MAXSIG) 222#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1) 223# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG) 224#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1) 225# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE) 226#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig) 228#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else 230#else
216# error "unable to find value for NSIG, please report" 231# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */ 232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
218# define EV_NSIG 65 234# define EV_NSIG 65
219#endif 235#endif
220 236
221#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
222# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
223# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
224# else 240# else
225# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
226# endif 242# endif
227#endif 243#endif
228 244
229#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
230# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
231# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
232# else 248# else
233# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
234# endif 250# endif
235#endif 251#endif
236 252
… …
238# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
239#endif 255#endif
240 256
241#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
242# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
243# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
244# else 260# else
245# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
246# endif 262# endif
247#endif 263#endif
248 264
249#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
250# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
251#endif 267#endif
252 268
253#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
254# ifdef _WIN32 270# ifdef _WIN32
255# define EV_USE_POLL 0 271# define EV_USE_POLL 0
256# else 272# else
257# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
258# endif 274# endif
259#endif 275#endif
260 276
261#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
263# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
264# else 280# else
265# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
266# endif 282# endif
267#endif 283#endif
268 284
… …
274# define EV_USE_PORT 0 290# define EV_USE_PORT 0
275#endif 291#endif
276 292
277#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
279# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
280# else 296# else
281# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
282# endif 298# endif
283#endif 299#endif
284 300
285#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
286# if EV_MINIMAL 302# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
287# define EV_PID_HASHSIZE 1
288# else
289# define EV_PID_HASHSIZE 16
290# endif
291#endif 303#endif
292 304
293#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
294# if EV_MINIMAL 306# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
295# define EV_INOTIFY_HASHSIZE 1
296# else
297# define EV_INOTIFY_HASHSIZE 16
298# endif
299#endif 307#endif
300 308
301#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
302# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
303# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
304# else 312# else
305# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
306# endif 314# endif
307#endif 315#endif
308 316
309#ifndef EV_USE_SIGNALFD 317#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1 319# define EV_USE_SIGNALFD EV_FEATURE_OS
312# else 320# else
313# define EV_USE_SIGNALFD 0 321# define EV_USE_SIGNALFD 0
314# endif 322# endif
315#endif 323#endif
316 324
… …
319# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
320# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
321#endif 329#endif
322 330
323#ifndef EV_VERIFY 331#ifndef EV_VERIFY
324# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
325#endif 333#endif
326 334
327#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
328# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
329#endif 337#endif
330 338
331#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
332# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
333#endif 341#endif
334 342
335/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
336/* which makes programs even slower. might work on other unices, too. */ 344/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
374# include <sys/select.h> 382# include <sys/select.h>
375# endif 383# endif
376#endif 384#endif
377 385
378#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
379# include <sys/utsname.h>
380# include <sys/statfs.h> 387# include <sys/statfs.h>
381# include <sys/inotify.h> 388# include <sys/inotify.h>
382/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
383# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
384# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
401# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
402# else 409# else
403# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
404# endif 411# endif
405# endif 412# endif
406# ifdef __cplusplus
407extern "C" {
408# endif
409int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
410# ifdef __cplusplus
411}
412# endif
413#endif 414#endif
414 415
415#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h> 418# include <stdint.h>
… …
423# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
424# else 425# else
425# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
426# endif 427# endif
427# endif 428# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
432 430
433struct signalfd_siginfo 431struct signalfd_siginfo
434{ 432{
435 uint32_t ssi_signo; 433 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
437}; 435};
438# ifdef __cplusplus
439}
440# endif 436#endif
441#endif
442
443 437
444/**/ 438/**/
445 439
446#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
448#else 442#else
449# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
450#endif 444#endif
451 445
452/* 446/*
… …
460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
461 455
462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
464 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
465#if __GNUC__ >= 4 462#if __GNUC__ >= 4
466# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
467# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
468#else 465#else
469# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
475 472
476#define expect_false(expr) expect ((expr) != 0, 0) 473#define expect_false(expr) expect ((expr) != 0, 0)
477#define expect_true(expr) expect ((expr) != 0, 1) 474#define expect_true(expr) expect ((expr) != 0, 1)
478#define inline_size static inline 475#define inline_size static inline
479 476
480#if EV_MINIMAL 477#if EV_FEATURE_CODE
478# define inline_speed static inline
479#else
481# define inline_speed static noinline 480# define inline_speed static noinline
482#else
483# define inline_speed static inline
484#endif 481#endif
485 482
486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 483#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487 484
488#if EV_MINPRI == EV_MAXPRI 485#if EV_MINPRI == EV_MAXPRI
… …
501#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
502#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
503 500
504#if EV_USE_REALTIME 501#if EV_USE_REALTIME
505/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
506/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
507static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
508#endif 505#endif
509 506
510#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
522#endif 519#endif
523 520
524#ifdef _WIN32 521#ifdef _WIN32
525# include "ev_win32.c" 522# include "ev_win32.c"
526#endif 523#endif
524
525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 struct utsname buf;
536 unsigned int v;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
527 566
528/*****************************************************************************/ 567/*****************************************************************************/
529 568
530#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
531static void noinline 570static void noinline
… …
568} 607}
569 608
570static void * 609static void *
571ev_realloc_emul (void *ptr, long size) 610ev_realloc_emul (void *ptr, long size)
572{ 611{
612#if __GLIBC__
613 return realloc (ptr, size);
614#else
573 /* some systems, notably openbsd and darwin, fail to properly 615 /* some systems, notably openbsd and darwin, fail to properly
574 * implement realloc (x, 0) (as required by both ansi c-98 and 616 * implement realloc (x, 0) (as required by both ansi c-89 and
575 * the single unix specification, so work around them here. 617 * the single unix specification, so work around them here.
576 */ 618 */
577 619
578 if (size) 620 if (size)
579 return realloc (ptr, size); 621 return realloc (ptr, size);
580 622
581 free (ptr); 623 free (ptr);
582 return 0; 624 return 0;
625#endif
583} 626}
584 627
585static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 628static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
586 629
587void 630void
… …
625 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
626 unsigned char unused; 669 unsigned char unused;
627#if EV_USE_EPOLL 670#if EV_USE_EPOLL
628 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
629#endif 672#endif
630#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
631 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
632#endif 678#endif
633} ANFD; 679} ANFD;
634 680
635/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
636typedef struct 682typedef struct
… …
691 737
692 static int ev_default_loop_ptr; 738 static int ev_default_loop_ptr;
693 739
694#endif 740#endif
695 741
696#if EV_MINIMAL < 2 742#if EV_FEATURE_API
697# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 743# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
698# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 744# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
699# define EV_INVOKE_PENDING invoke_cb (EV_A) 745# define EV_INVOKE_PENDING invoke_cb (EV_A)
700#else 746#else
701# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
702# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
703# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
704#endif 750#endif
705 751
706#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
707 753
708/*****************************************************************************/ 754/*****************************************************************************/
709 755
710#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
711ev_tstamp 757ev_tstamp
… …
755 if (delay > 0.) 801 if (delay > 0.)
756 { 802 {
757#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
758 struct timespec ts; 804 struct timespec ts;
759 805
760 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
761 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
762
763 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
764#elif defined(_WIN32) 808#elif defined(_WIN32)
765 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
766#else 810#else
767 struct timeval tv; 811 struct timeval tv;
768 812
769 tv.tv_sec = (time_t)delay;
770 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
771
772 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
773 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
774 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
775 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
776#endif 818#endif
777 } 819 }
778} 820}
779 821
780/*****************************************************************************/ 822/*****************************************************************************/
781 823
782#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 824#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
783 825
784/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
785/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
786inline_size int 828inline_size int
787array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
788{ 830{
789 int ncur = cur + 1; 831 int ncur = cur + 1;
790 832
… …
886} 928}
887 929
888/*****************************************************************************/ 930/*****************************************************************************/
889 931
890inline_speed void 932inline_speed void
891fd_event_nc (EV_P_ int fd, int revents) 933fd_event_nocheck (EV_P_ int fd, int revents)
892{ 934{
893 ANFD *anfd = anfds + fd; 935 ANFD *anfd = anfds + fd;
894 ev_io *w; 936 ev_io *w;
895 937
896 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
908fd_event (EV_P_ int fd, int revents) 950fd_event (EV_P_ int fd, int revents)
909{ 951{
910 ANFD *anfd = anfds + fd; 952 ANFD *anfd = anfds + fd;
911 953
912 if (expect_true (!anfd->reify)) 954 if (expect_true (!anfd->reify))
913 fd_event_nc (EV_A_ fd, revents); 955 fd_event_nocheck (EV_A_ fd, revents);
914} 956}
915 957
916void 958void
917ev_feed_fd_event (EV_P_ int fd, int revents) 959ev_feed_fd_event (EV_P_ int fd, int revents)
918{ 960{
919 if (fd >= 0 && fd < anfdmax) 961 if (fd >= 0 && fd < anfdmax)
920 fd_event_nc (EV_A_ fd, revents); 962 fd_event_nocheck (EV_A_ fd, revents);
921} 963}
922 964
923/* make sure the external fd watch events are in-sync */ 965/* make sure the external fd watch events are in-sync */
924/* with the kernel/libev internal state */ 966/* with the kernel/libev internal state */
925inline_size void 967inline_size void
… …
931 { 973 {
932 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
933 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
934 ev_io *w; 976 ev_io *w;
935 977
936 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
937 980
938 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
939 events |= (unsigned char)w->events;
940 982
941#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
942 if (events) 984 if (o_reify & EV__IOFDSET)
943 { 985 {
944 unsigned long arg; 986 unsigned long arg;
945 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
947 } 990 }
948#endif 991#endif
949 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
950 { 994 {
951 unsigned char o_events = anfd->events;
952 unsigned char o_reify = anfd->reify;
953
954 anfd->reify = 0;
955 anfd->events = events; 995 anfd->events = 0;
956 996
957 if (o_events != events || o_reify & EV__IOFDSET) 997 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
998 anfd->events |= (unsigned char)w->events;
999
1000 if (o_events != anfd->events)
1001 o_reify = EV__IOFDSET; /* actually |= */
1002 }
1003
1004 if (o_reify & EV__IOFDSET)
958 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
959 }
960 } 1006 }
961 1007
962 fdchangecnt = 0; 1008 fdchangecnt = 0;
963} 1009}
964 1010
… …
988 ev_io_stop (EV_A_ w); 1034 ev_io_stop (EV_A_ w);
989 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1035 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
990 } 1036 }
991} 1037}
992 1038
993/* check whether the given fd is atcually valid, for error recovery */ 1039/* check whether the given fd is actually valid, for error recovery */
994inline_size int 1040inline_size int
995fd_valid (int fd) 1041fd_valid (int fd)
996{ 1042{
997#ifdef _WIN32 1043#ifdef _WIN32
998 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1044 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
… …
1040 anfds [fd].emask = 0; 1086 anfds [fd].emask = 0;
1041 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1087 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1042 } 1088 }
1043} 1089}
1044 1090
1091/* used to prepare libev internal fd's */
1092/* this is not fork-safe */
1093inline_speed void
1094fd_intern (int fd)
1095{
1096#ifdef _WIN32
1097 unsigned long arg = 1;
1098 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1099#else
1100 fcntl (fd, F_SETFD, FD_CLOEXEC);
1101 fcntl (fd, F_SETFL, O_NONBLOCK);
1102#endif
1103}
1104
1045/*****************************************************************************/ 1105/*****************************************************************************/
1046 1106
1047/* 1107/*
1048 * the heap functions want a real array index. array index 0 uis guaranteed to not 1108 * the heap functions want a real array index. array index 0 is guaranteed to not
1049 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1109 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1050 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
1051 */ 1111 */
1052 1112
1053/* 1113/*
… …
1201 1261
1202static ANSIG signals [EV_NSIG - 1]; 1262static ANSIG signals [EV_NSIG - 1];
1203 1263
1204/*****************************************************************************/ 1264/*****************************************************************************/
1205 1265
1206/* used to prepare libev internal fd's */ 1266#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1207/* this is not fork-safe */
1208inline_speed void
1209fd_intern (int fd)
1210{
1211#ifdef _WIN32
1212 unsigned long arg = 1;
1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1214#else
1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1217#endif
1218}
1219 1267
1220static void noinline 1268static void noinline
1221evpipe_init (EV_P) 1269evpipe_init (EV_P)
1222{ 1270{
1223 if (!ev_is_active (&pipe_w)) 1271 if (!ev_is_active (&pipe_w))
1224 { 1272 {
1225#if EV_USE_EVENTFD 1273# if EV_USE_EVENTFD
1226 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1274 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1227 if (evfd < 0 && errno == EINVAL) 1275 if (evfd < 0 && errno == EINVAL)
1228 evfd = eventfd (0, 0); 1276 evfd = eventfd (0, 0);
1229 1277
1230 if (evfd >= 0) 1278 if (evfd >= 0)
… …
1232 evpipe [0] = -1; 1280 evpipe [0] = -1;
1233 fd_intern (evfd); /* doing it twice doesn't hurt */ 1281 fd_intern (evfd); /* doing it twice doesn't hurt */
1234 ev_io_set (&pipe_w, evfd, EV_READ); 1282 ev_io_set (&pipe_w, evfd, EV_READ);
1235 } 1283 }
1236 else 1284 else
1237#endif 1285# endif
1238 { 1286 {
1239 while (pipe (evpipe)) 1287 while (pipe (evpipe))
1240 ev_syserr ("(libev) error creating signal/async pipe"); 1288 ev_syserr ("(libev) error creating signal/async pipe");
1241 1289
1242 fd_intern (evpipe [0]); 1290 fd_intern (evpipe [0]);
… …
1253evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1301evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1254{ 1302{
1255 if (!*flag) 1303 if (!*flag)
1256 { 1304 {
1257 int old_errno = errno; /* save errno because write might clobber it */ 1305 int old_errno = errno; /* save errno because write might clobber it */
1306 char dummy;
1258 1307
1259 *flag = 1; 1308 *flag = 1;
1260 1309
1261#if EV_USE_EVENTFD 1310#if EV_USE_EVENTFD
1262 if (evfd >= 0) 1311 if (evfd >= 0)
… …
1264 uint64_t counter = 1; 1313 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1266 } 1315 }
1267 else 1316 else
1268#endif 1317#endif
1318 /* win32 people keep sending patches that change this write() to send() */
1319 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1320 /* so when you think this write should be a send instead, please find out */
1321 /* where your send() is from - it's definitely not the microsoft send, and */
1322 /* tell me. thank you. */
1269 write (evpipe [1], &old_errno, 1); 1323 write (evpipe [1], &dummy, 1);
1270 1324
1271 errno = old_errno; 1325 errno = old_errno;
1272 } 1326 }
1273} 1327}
1274 1328
… …
1287 } 1341 }
1288 else 1342 else
1289#endif 1343#endif
1290 { 1344 {
1291 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1292 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1293 } 1348 }
1294 1349
1295 if (sig_pending) 1350 if (sig_pending)
1296 { 1351 {
… …
1375 break; 1430 break;
1376 } 1431 }
1377} 1432}
1378#endif 1433#endif
1379 1434
1435#endif
1436
1380/*****************************************************************************/ 1437/*****************************************************************************/
1381 1438
1439#if EV_CHILD_ENABLE
1382static WL childs [EV_PID_HASHSIZE]; 1440static WL childs [EV_PID_HASHSIZE];
1383
1384#ifndef _WIN32
1385 1441
1386static ev_signal childev; 1442static ev_signal childev;
1387 1443
1388#ifndef WIFCONTINUED 1444#ifndef WIFCONTINUED
1389# define WIFCONTINUED(status) 0 1445# define WIFCONTINUED(status) 0
… …
1394child_reap (EV_P_ int chain, int pid, int status) 1450child_reap (EV_P_ int chain, int pid, int status)
1395{ 1451{
1396 ev_child *w; 1452 ev_child *w;
1397 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1453 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1398 1454
1399 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1455 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1400 { 1456 {
1401 if ((w->pid == pid || !w->pid) 1457 if ((w->pid == pid || !w->pid)
1402 && (!traced || (w->flags & 1))) 1458 && (!traced || (w->flags & 1)))
1403 { 1459 {
1404 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1460 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1429 /* make sure we are called again until all children have been reaped */ 1485 /* make sure we are called again until all children have been reaped */
1430 /* we need to do it this way so that the callback gets called before we continue */ 1486 /* we need to do it this way so that the callback gets called before we continue */
1431 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1487 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1432 1488
1433 child_reap (EV_A_ pid, pid, status); 1489 child_reap (EV_A_ pid, pid, status);
1434 if (EV_PID_HASHSIZE > 1) 1490 if ((EV_PID_HASHSIZE) > 1)
1435 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1491 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1436} 1492}
1437 1493
1438#endif 1494#endif
1439 1495
1440/*****************************************************************************/ 1496/*****************************************************************************/
1441 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1442#if EV_USE_PORT 1501#if EV_USE_PORT
1443# include "ev_port.c" 1502# include "ev_port.c"
1444#endif 1503#endif
1445#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1446# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1506#ifdef __APPLE__ 1565#ifdef __APPLE__
1507 /* only select works correctly on that "unix-certified" platform */ 1566 /* only select works correctly on that "unix-certified" platform */
1508 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1567 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1509 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1568 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1510#endif 1569#endif
1570#ifdef __FreeBSD__
1571 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1572#endif
1511 1573
1512 return flags; 1574 return flags;
1513} 1575}
1514 1576
1515unsigned int 1577unsigned int
1516ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1517{ 1579{
1518 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1519 1581
1520 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1582 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1521 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1522 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1523 1585
1524 return flags; 1586 return flags;
1525} 1587}
1526 1588
1527unsigned int 1589unsigned int
1528ev_backend (EV_P) 1590ev_backend (EV_P)
1529{ 1591{
1530 return backend; 1592 return backend;
1531} 1593}
1532 1594
1533#if EV_MINIMAL < 2 1595#if EV_FEATURE_API
1534unsigned int 1596unsigned int
1535ev_loop_count (EV_P) 1597ev_iteration (EV_P)
1536{ 1598{
1537 return loop_count; 1599 return loop_count;
1538} 1600}
1539 1601
1540unsigned int 1602unsigned int
1541ev_loop_depth (EV_P) 1603ev_depth (EV_P)
1542{ 1604{
1543 return loop_depth; 1605 return loop_depth;
1544} 1606}
1545 1607
1546void 1608void
… …
1618 1680
1619 ev_rt_now = ev_time (); 1681 ev_rt_now = ev_time ();
1620 mn_now = get_clock (); 1682 mn_now = get_clock ();
1621 now_floor = mn_now; 1683 now_floor = mn_now;
1622 rtmn_diff = ev_rt_now - mn_now; 1684 rtmn_diff = ev_rt_now - mn_now;
1623#if EV_MINIMAL < 2 1685#if EV_FEATURE_API
1624 invoke_cb = ev_invoke_pending; 1686 invoke_cb = ev_invoke_pending;
1625#endif 1687#endif
1626 1688
1627 io_blocktime = 0.; 1689 io_blocktime = 0.;
1628 timeout_blocktime = 0.; 1690 timeout_blocktime = 0.;
… …
1640#endif 1702#endif
1641 1703
1642 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1643 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1644 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1645#if EV_USE_PORT 1710#if EV_USE_PORT
1646 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1647#endif 1712#endif
1648#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1649 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1658 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1659#endif 1724#endif
1660 1725
1661 ev_prepare_init (&pending_w, pendingcb); 1726 ev_prepare_init (&pending_w, pendingcb);
1662 1727
1728#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1663 ev_init (&pipe_w, pipecb); 1729 ev_init (&pipe_w, pipecb);
1664 ev_set_priority (&pipe_w, EV_MAXPRI); 1730 ev_set_priority (&pipe_w, EV_MAXPRI);
1731#endif
1665 } 1732 }
1666} 1733}
1667 1734
1668/* free up a loop structure */ 1735/* free up a loop structure */
1669static void noinline 1736static void noinline
… …
1699#endif 1766#endif
1700 1767
1701 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1702 close (backend_fd); 1769 close (backend_fd);
1703 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1704#if EV_USE_PORT 1774#if EV_USE_PORT
1705 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1706#endif 1776#endif
1707#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1708 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1787 { 1857 {
1788 EV_WIN32_CLOSE_FD (evpipe [0]); 1858 EV_WIN32_CLOSE_FD (evpipe [0]);
1789 EV_WIN32_CLOSE_FD (evpipe [1]); 1859 EV_WIN32_CLOSE_FD (evpipe [1]);
1790 } 1860 }
1791 1861
1862#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1792 evpipe_init (EV_A); 1863 evpipe_init (EV_A);
1793 /* now iterate over everything, in case we missed something */ 1864 /* now iterate over everything, in case we missed something */
1794 pipecb (EV_A_ &pipe_w, EV_READ); 1865 pipecb (EV_A_ &pipe_w, EV_READ);
1866#endif
1795 } 1867 }
1796 1868
1797 postfork = 0; 1869 postfork = 0;
1798} 1870}
1799 1871
… …
1861 verify_watcher (EV_A_ ws [cnt]); 1933 verify_watcher (EV_A_ ws [cnt]);
1862 } 1934 }
1863} 1935}
1864#endif 1936#endif
1865 1937
1866#if EV_MINIMAL < 2 1938#if EV_FEATURE_API
1867void 1939void
1868ev_loop_verify (EV_P) 1940ev_verify (EV_P)
1869{ 1941{
1870#if EV_VERIFY 1942#if EV_VERIFY
1871 int i; 1943 int i;
1872 WL w; 1944 WL w;
1873 1945
… …
1912#if EV_ASYNC_ENABLE 1984#if EV_ASYNC_ENABLE
1913 assert (asyncmax >= asynccnt); 1985 assert (asyncmax >= asynccnt);
1914 array_verify (EV_A_ (W *)asyncs, asynccnt); 1986 array_verify (EV_A_ (W *)asyncs, asynccnt);
1915#endif 1987#endif
1916 1988
1989#if EV_PREPARE_ENABLE
1917 assert (preparemax >= preparecnt); 1990 assert (preparemax >= preparecnt);
1918 array_verify (EV_A_ (W *)prepares, preparecnt); 1991 array_verify (EV_A_ (W *)prepares, preparecnt);
1992#endif
1919 1993
1994#if EV_CHECK_ENABLE
1920 assert (checkmax >= checkcnt); 1995 assert (checkmax >= checkcnt);
1921 array_verify (EV_A_ (W *)checks, checkcnt); 1996 array_verify (EV_A_ (W *)checks, checkcnt);
1997#endif
1922 1998
1923# if 0 1999# if 0
2000#if EV_CHILD_ENABLE
1924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 2001 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 2002 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
2003#endif
1926# endif 2004# endif
1927#endif 2005#endif
1928} 2006}
1929#endif 2007#endif
1930 2008
… …
1946 2024
1947 loop_init (EV_A_ flags); 2025 loop_init (EV_A_ flags);
1948 2026
1949 if (ev_backend (EV_A)) 2027 if (ev_backend (EV_A))
1950 { 2028 {
1951#ifndef _WIN32 2029#if EV_CHILD_ENABLE
1952 ev_signal_init (&childev, childcb, SIGCHLD); 2030 ev_signal_init (&childev, childcb, SIGCHLD);
1953 ev_set_priority (&childev, EV_MAXPRI); 2031 ev_set_priority (&childev, EV_MAXPRI);
1954 ev_signal_start (EV_A_ &childev); 2032 ev_signal_start (EV_A_ &childev);
1955 ev_unref (EV_A); /* child watcher should not keep loop alive */ 2033 ev_unref (EV_A); /* child watcher should not keep loop alive */
1956#endif 2034#endif
… …
1969 EV_P = ev_default_loop_ptr; 2047 EV_P = ev_default_loop_ptr;
1970#endif 2048#endif
1971 2049
1972 ev_default_loop_ptr = 0; 2050 ev_default_loop_ptr = 0;
1973 2051
1974#ifndef _WIN32 2052#if EV_CHILD_ENABLE
1975 ev_ref (EV_A); /* child watcher */ 2053 ev_ref (EV_A); /* child watcher */
1976 ev_signal_stop (EV_A_ &childev); 2054 ev_signal_stop (EV_A_ &childev);
1977#endif 2055#endif
1978 2056
1979 loop_destroy (EV_A); 2057 loop_destroy (EV_A);
… …
2085 EV_FREQUENT_CHECK; 2163 EV_FREQUENT_CHECK;
2086 feed_reverse (EV_A_ (W)w); 2164 feed_reverse (EV_A_ (W)w);
2087 } 2165 }
2088 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2166 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2089 2167
2090 feed_reverse_done (EV_A_ EV_TIMEOUT); 2168 feed_reverse_done (EV_A_ EV_TIMER);
2091 } 2169 }
2092} 2170}
2093 2171
2094#if EV_PERIODIC_ENABLE 2172#if EV_PERIODIC_ENABLE
2095/* make periodics pending */ 2173/* make periodics pending */
… …
2148 feed_reverse_done (EV_A_ EV_PERIODIC); 2226 feed_reverse_done (EV_A_ EV_PERIODIC);
2149 } 2227 }
2150} 2228}
2151 2229
2152/* simply recalculate all periodics */ 2230/* simply recalculate all periodics */
2153/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2231/* TODO: maybe ensure that at least one event happens when jumping forward? */
2154static void noinline 2232static void noinline
2155periodics_reschedule (EV_P) 2233periodics_reschedule (EV_P)
2156{ 2234{
2157 int i; 2235 int i;
2158 2236
… …
2254 mn_now = ev_rt_now; 2332 mn_now = ev_rt_now;
2255 } 2333 }
2256} 2334}
2257 2335
2258void 2336void
2259ev_loop (EV_P_ int flags) 2337ev_run (EV_P_ int flags)
2260{ 2338{
2261#if EV_MINIMAL < 2 2339#if EV_FEATURE_API
2262 ++loop_depth; 2340 ++loop_depth;
2263#endif 2341#endif
2264 2342
2265 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2343 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2266 2344
2267 loop_done = EVUNLOOP_CANCEL; 2345 loop_done = EVBREAK_CANCEL;
2268 2346
2269 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2347 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2270 2348
2271 do 2349 do
2272 { 2350 {
2273#if EV_VERIFY >= 2 2351#if EV_VERIFY >= 2
2274 ev_loop_verify (EV_A); 2352 ev_verify (EV_A);
2275#endif 2353#endif
2276 2354
2277#ifndef _WIN32 2355#ifndef _WIN32
2278 if (expect_false (curpid)) /* penalise the forking check even more */ 2356 if (expect_false (curpid)) /* penalise the forking check even more */
2279 if (expect_false (getpid () != curpid)) 2357 if (expect_false (getpid () != curpid))
… …
2291 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2292 EV_INVOKE_PENDING; 2370 EV_INVOKE_PENDING;
2293 } 2371 }
2294#endif 2372#endif
2295 2373
2374#if EV_PREPARE_ENABLE
2296 /* queue prepare watchers (and execute them) */ 2375 /* queue prepare watchers (and execute them) */
2297 if (expect_false (preparecnt)) 2376 if (expect_false (preparecnt))
2298 { 2377 {
2299 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2378 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2300 EV_INVOKE_PENDING; 2379 EV_INVOKE_PENDING;
2301 } 2380 }
2381#endif
2302 2382
2303 if (expect_false (loop_done)) 2383 if (expect_false (loop_done))
2304 break; 2384 break;
2305 2385
2306 /* we might have forked, so reify kernel state if necessary */ 2386 /* we might have forked, so reify kernel state if necessary */
… …
2313 /* calculate blocking time */ 2393 /* calculate blocking time */
2314 { 2394 {
2315 ev_tstamp waittime = 0.; 2395 ev_tstamp waittime = 0.;
2316 ev_tstamp sleeptime = 0.; 2396 ev_tstamp sleeptime = 0.;
2317 2397
2398 /* remember old timestamp for io_blocktime calculation */
2399 ev_tstamp prev_mn_now = mn_now;
2400
2401 /* update time to cancel out callback processing overhead */
2402 time_update (EV_A_ 1e100);
2403
2318 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2404 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2319 { 2405 {
2320 /* remember old timestamp for io_blocktime calculation */
2321 ev_tstamp prev_mn_now = mn_now;
2322
2323 /* update time to cancel out callback processing overhead */
2324 time_update (EV_A_ 1e100);
2325
2326 waittime = MAX_BLOCKTIME; 2406 waittime = MAX_BLOCKTIME;
2327 2407
2328 if (timercnt) 2408 if (timercnt)
2329 { 2409 {
2330 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2410 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2357 waittime -= sleeptime; 2437 waittime -= sleeptime;
2358 } 2438 }
2359 } 2439 }
2360 } 2440 }
2361 2441
2362#if EV_MINIMAL < 2 2442#if EV_FEATURE_API
2363 ++loop_count; 2443 ++loop_count;
2364#endif 2444#endif
2365 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2445 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2366 backend_poll (EV_A_ waittime); 2446 backend_poll (EV_A_ waittime);
2367 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2447 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2368 2448
2369 /* update ev_rt_now, do magic */ 2449 /* update ev_rt_now, do magic */
2370 time_update (EV_A_ waittime + sleeptime); 2450 time_update (EV_A_ waittime + sleeptime);
2371 } 2451 }
2372 2452
… …
2379#if EV_IDLE_ENABLE 2459#if EV_IDLE_ENABLE
2380 /* queue idle watchers unless other events are pending */ 2460 /* queue idle watchers unless other events are pending */
2381 idle_reify (EV_A); 2461 idle_reify (EV_A);
2382#endif 2462#endif
2383 2463
2464#if EV_CHECK_ENABLE
2384 /* queue check watchers, to be executed first */ 2465 /* queue check watchers, to be executed first */
2385 if (expect_false (checkcnt)) 2466 if (expect_false (checkcnt))
2386 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2467 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2468#endif
2387 2469
2388 EV_INVOKE_PENDING; 2470 EV_INVOKE_PENDING;
2389 } 2471 }
2390 while (expect_true ( 2472 while (expect_true (
2391 activecnt 2473 activecnt
2392 && !loop_done 2474 && !loop_done
2393 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2475 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2394 )); 2476 ));
2395 2477
2396 if (loop_done == EVUNLOOP_ONE) 2478 if (loop_done == EVBREAK_ONE)
2397 loop_done = EVUNLOOP_CANCEL; 2479 loop_done = EVBREAK_CANCEL;
2398 2480
2399#if EV_MINIMAL < 2 2481#if EV_FEATURE_API
2400 --loop_depth; 2482 --loop_depth;
2401#endif 2483#endif
2402} 2484}
2403 2485
2404void 2486void
2405ev_unloop (EV_P_ int how) 2487ev_break (EV_P_ int how)
2406{ 2488{
2407 loop_done = how; 2489 loop_done = how;
2408} 2490}
2409 2491
2410void 2492void
… …
2558 EV_FREQUENT_CHECK; 2640 EV_FREQUENT_CHECK;
2559 2641
2560 wlist_del (&anfds[w->fd].head, (WL)w); 2642 wlist_del (&anfds[w->fd].head, (WL)w);
2561 ev_stop (EV_A_ (W)w); 2643 ev_stop (EV_A_ (W)w);
2562 2644
2563 fd_change (EV_A_ w->fd, 1); 2645 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2564 2646
2565 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2566} 2648}
2567 2649
2568void noinline 2650void noinline
… …
2721 2803
2722#ifndef SA_RESTART 2804#ifndef SA_RESTART
2723# define SA_RESTART 0 2805# define SA_RESTART 0
2724#endif 2806#endif
2725 2807
2808#if EV_SIGNAL_ENABLE
2809
2726void noinline 2810void noinline
2727ev_signal_start (EV_P_ ev_signal *w) 2811ev_signal_start (EV_P_ ev_signal *w)
2728{ 2812{
2729 if (expect_false (ev_is_active (w))) 2813 if (expect_false (ev_is_active (w)))
2730 return; 2814 return;
… …
2836 } 2920 }
2837 2921
2838 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2839} 2923}
2840 2924
2925#endif
2926
2927#if EV_CHILD_ENABLE
2928
2841void 2929void
2842ev_child_start (EV_P_ ev_child *w) 2930ev_child_start (EV_P_ ev_child *w)
2843{ 2931{
2844#if EV_MULTIPLICITY 2932#if EV_MULTIPLICITY
2845 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2933 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2848 return; 2936 return;
2849 2937
2850 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2851 2939
2852 ev_start (EV_A_ (W)w, 1); 2940 ev_start (EV_A_ (W)w, 1);
2853 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2941 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2854 2942
2855 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2856} 2944}
2857 2945
2858void 2946void
… …
2862 if (expect_false (!ev_is_active (w))) 2950 if (expect_false (!ev_is_active (w)))
2863 return; 2951 return;
2864 2952
2865 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
2866 2954
2867 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2955 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2868 ev_stop (EV_A_ (W)w); 2956 ev_stop (EV_A_ (W)w);
2869 2957
2870 EV_FREQUENT_CHECK; 2958 EV_FREQUENT_CHECK;
2871} 2959}
2960
2961#endif
2872 2962
2873#if EV_STAT_ENABLE 2963#if EV_STAT_ENABLE
2874 2964
2875# ifdef _WIN32 2965# ifdef _WIN32
2876# undef lstat 2966# undef lstat
… …
2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3033 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2944 } 3034 }
2945 } 3035 }
2946 3036
2947 if (w->wd >= 0) 3037 if (w->wd >= 0)
2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3038 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2949 3039
2950 /* now re-arm timer, if required */ 3040 /* now re-arm timer, if required */
2951 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3041 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2952 ev_timer_again (EV_A_ &w->timer); 3042 ev_timer_again (EV_A_ &w->timer);
2953 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3043 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2961 3051
2962 if (wd < 0) 3052 if (wd < 0)
2963 return; 3053 return;
2964 3054
2965 w->wd = -2; 3055 w->wd = -2;
2966 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3056 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2967 wlist_del (&fs_hash [slot].head, (WL)w); 3057 wlist_del (&fs_hash [slot].head, (WL)w);
2968 3058
2969 /* remove this watcher, if others are watching it, they will rearm */ 3059 /* remove this watcher, if others are watching it, they will rearm */
2970 inotify_rm_watch (fs_fd, wd); 3060 inotify_rm_watch (fs_fd, wd);
2971} 3061}
… …
2973static void noinline 3063static void noinline
2974infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3064infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2975{ 3065{
2976 if (slot < 0) 3066 if (slot < 0)
2977 /* overflow, need to check for all hash slots */ 3067 /* overflow, need to check for all hash slots */
2978 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2979 infy_wd (EV_A_ slot, wd, ev); 3069 infy_wd (EV_A_ slot, wd, ev);
2980 else 3070 else
2981 { 3071 {
2982 WL w_; 3072 WL w_;
2983 3073
2984 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3074 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2985 { 3075 {
2986 ev_stat *w = (ev_stat *)w_; 3076 ev_stat *w = (ev_stat *)w_;
2987 w_ = w_->next; /* lets us remove this watcher and all before it */ 3077 w_ = w_->next; /* lets us remove this watcher and all before it */
2988 3078
2989 if (w->wd == wd || wd == -1) 3079 if (w->wd == wd || wd == -1)
2990 { 3080 {
2991 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3081 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2992 { 3082 {
2993 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3083 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2994 w->wd = -1; 3084 w->wd = -1;
2995 infy_add (EV_A_ w); /* re-add, no matter what */ 3085 infy_add (EV_A_ w); /* re-add, no matter what */
2996 } 3086 }
2997 3087
2998 stat_timer_cb (EV_A_ &w->timer, 0); 3088 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3012 { 3102 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3103 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3014 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3104 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len; 3105 ofs += sizeof (struct inotify_event) + ev->len;
3016 } 3106 }
3017}
3018
3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
3049} 3107}
3050 3108
3051inline_size void 3109inline_size void
3052ev_check_2625 (EV_P) 3110ev_check_2625 (EV_P)
3053{ 3111{
… …
3112 ev_io_set (&fs_w, fs_fd, EV_READ); 3170 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w); 3171 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A); 3172 ev_unref (EV_A);
3115 } 3173 }
3116 3174
3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3175 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3118 { 3176 {
3119 WL w_ = fs_hash [slot].head; 3177 WL w_ = fs_hash [slot].head;
3120 fs_hash [slot].head = 0; 3178 fs_hash [slot].head = 0;
3121 3179
3122 while (w_) 3180 while (w_)
… …
3297 3355
3298 EV_FREQUENT_CHECK; 3356 EV_FREQUENT_CHECK;
3299} 3357}
3300#endif 3358#endif
3301 3359
3360#if EV_PREPARE_ENABLE
3302void 3361void
3303ev_prepare_start (EV_P_ ev_prepare *w) 3362ev_prepare_start (EV_P_ ev_prepare *w)
3304{ 3363{
3305 if (expect_false (ev_is_active (w))) 3364 if (expect_false (ev_is_active (w)))
3306 return; 3365 return;
… …
3332 3391
3333 ev_stop (EV_A_ (W)w); 3392 ev_stop (EV_A_ (W)w);
3334 3393
3335 EV_FREQUENT_CHECK; 3394 EV_FREQUENT_CHECK;
3336} 3395}
3396#endif
3337 3397
3398#if EV_CHECK_ENABLE
3338void 3399void
3339ev_check_start (EV_P_ ev_check *w) 3400ev_check_start (EV_P_ ev_check *w)
3340{ 3401{
3341 if (expect_false (ev_is_active (w))) 3402 if (expect_false (ev_is_active (w)))
3342 return; 3403 return;
… …
3368 3429
3369 ev_stop (EV_A_ (W)w); 3430 ev_stop (EV_A_ (W)w);
3370 3431
3371 EV_FREQUENT_CHECK; 3432 EV_FREQUENT_CHECK;
3372} 3433}
3434#endif
3373 3435
3374#if EV_EMBED_ENABLE 3436#if EV_EMBED_ENABLE
3375void noinline 3437void noinline
3376ev_embed_sweep (EV_P_ ev_embed *w) 3438ev_embed_sweep (EV_P_ ev_embed *w)
3377{ 3439{
3378 ev_loop (w->other, EVLOOP_NONBLOCK); 3440 ev_run (w->other, EVRUN_NOWAIT);
3379} 3441}
3380 3442
3381static void 3443static void
3382embed_io_cb (EV_P_ ev_io *io, int revents) 3444embed_io_cb (EV_P_ ev_io *io, int revents)
3383{ 3445{
3384 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3446 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3385 3447
3386 if (ev_cb (w)) 3448 if (ev_cb (w))
3387 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3449 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3388 else 3450 else
3389 ev_loop (w->other, EVLOOP_NONBLOCK); 3451 ev_run (w->other, EVRUN_NOWAIT);
3390} 3452}
3391 3453
3392static void 3454static void
3393embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3455embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3394{ 3456{
… …
3398 EV_P = w->other; 3460 EV_P = w->other;
3399 3461
3400 while (fdchangecnt) 3462 while (fdchangecnt)
3401 { 3463 {
3402 fd_reify (EV_A); 3464 fd_reify (EV_A);
3403 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3404 } 3466 }
3405 } 3467 }
3406} 3468}
3407 3469
3408static void 3470static void
… …
3414 3476
3415 { 3477 {
3416 EV_P = w->other; 3478 EV_P = w->other;
3417 3479
3418 ev_loop_fork (EV_A); 3480 ev_loop_fork (EV_A);
3419 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
3420 } 3482 }
3421 3483
3422 ev_embed_start (EV_A_ w); 3484 ev_embed_start (EV_A_ w);
3423} 3485}
3424 3486
… …
3523ev_async_start (EV_P_ ev_async *w) 3585ev_async_start (EV_P_ ev_async *w)
3524{ 3586{
3525 if (expect_false (ev_is_active (w))) 3587 if (expect_false (ev_is_active (w)))
3526 return; 3588 return;
3527 3589
3590 w->sent = 0;
3591
3528 evpipe_init (EV_A); 3592 evpipe_init (EV_A);
3529 3593
3530 EV_FREQUENT_CHECK; 3594 EV_FREQUENT_CHECK;
3531 3595
3532 ev_start (EV_A_ (W)w, ++asynccnt); 3596 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3609{ 3673{
3610 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3674 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3611 3675
3612 if (expect_false (!once)) 3676 if (expect_false (!once))
3613 { 3677 {
3614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3678 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3615 return; 3679 return;
3616 } 3680 }
3617 3681
3618 once->cb = cb; 3682 once->cb = cb;
3619 once->arg = arg; 3683 once->arg = arg;
… …
3706 if (types & EV_ASYNC) 3770 if (types & EV_ASYNC)
3707 for (i = asynccnt; i--; ) 3771 for (i = asynccnt; i--; )
3708 cb (EV_A_ EV_ASYNC, asyncs [i]); 3772 cb (EV_A_ EV_ASYNC, asyncs [i]);
3709#endif 3773#endif
3710 3774
3775#if EV_PREPARE_ENABLE
3711 if (types & EV_PREPARE) 3776 if (types & EV_PREPARE)
3712 for (i = preparecnt; i--; ) 3777 for (i = preparecnt; i--; )
3713#if EV_EMBED_ENABLE 3778# if EV_EMBED_ENABLE
3714 if (ev_cb (prepares [i]) != embed_prepare_cb) 3779 if (ev_cb (prepares [i]) != embed_prepare_cb)
3715#endif 3780# endif
3716 cb (EV_A_ EV_PREPARE, prepares [i]); 3781 cb (EV_A_ EV_PREPARE, prepares [i]);
3782#endif
3717 3783
3784#if EV_CHECK_ENABLE
3718 if (types & EV_CHECK) 3785 if (types & EV_CHECK)
3719 for (i = checkcnt; i--; ) 3786 for (i = checkcnt; i--; )
3720 cb (EV_A_ EV_CHECK, checks [i]); 3787 cb (EV_A_ EV_CHECK, checks [i]);
3788#endif
3721 3789
3790#if EV_SIGNAL_ENABLE
3722 if (types & EV_SIGNAL) 3791 if (types & EV_SIGNAL)
3723 for (i = 0; i < EV_NSIG - 1; ++i) 3792 for (i = 0; i < EV_NSIG - 1; ++i)
3724 for (wl = signals [i].head; wl; ) 3793 for (wl = signals [i].head; wl; )
3725 { 3794 {
3726 wn = wl->next; 3795 wn = wl->next;
3727 cb (EV_A_ EV_SIGNAL, wl); 3796 cb (EV_A_ EV_SIGNAL, wl);
3728 wl = wn; 3797 wl = wn;
3729 } 3798 }
3799#endif
3730 3800
3801#if EV_CHILD_ENABLE
3731 if (types & EV_CHILD) 3802 if (types & EV_CHILD)
3732 for (i = EV_PID_HASHSIZE; i--; ) 3803 for (i = (EV_PID_HASHSIZE); i--; )
3733 for (wl = childs [i]; wl; ) 3804 for (wl = childs [i]; wl; )
3734 { 3805 {
3735 wn = wl->next; 3806 wn = wl->next;
3736 cb (EV_A_ EV_CHILD, wl); 3807 cb (EV_A_ EV_CHILD, wl);
3737 wl = wn; 3808 wl = wn;
3738 } 3809 }
3810#endif
3739/* EV_STAT 0x00001000 /* stat data changed */ 3811/* EV_STAT 0x00001000 /* stat data changed */
3740/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3812/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3741} 3813}
3742#endif 3814#endif
3743 3815
3744#if EV_MULTIPLICITY 3816#if EV_MULTIPLICITY
3745 #include "ev_wrap.h" 3817 #include "ev_wrap.h"
3746#endif 3818#endif
3747 3819
3748#ifdef __cplusplus 3820EV_CPP(})
3749}
3750#endif
3751 3821

Diff Legend

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