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

Comparing libev/ev.c (file contents):
Revision 1.343 by root, Fri Apr 2 21:03:46 2010 UTC vs.
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
182# include EV_H 178# include EV_H
183#else 179#else
184# include "ev.h" 180# include "ev.h"
185#endif 181#endif
186 182
183EV_CPP(extern "C" {)
184
187#ifndef _WIN32 185#ifndef _WIN32
188# include <sys/time.h> 186# include <sys/time.h>
189# include <sys/wait.h> 187# include <sys/wait.h>
190# include <unistd.h> 188# include <unistd.h>
191#else 189#else
… …
195# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
196# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
197# endif 195# endif
198# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
199#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
200 206
201/* 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 */
202 208
203/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
204#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
376# include <sys/select.h> 382# include <sys/select.h>
377# endif 383# endif
378#endif 384#endif
379 385
380#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
381# include <sys/utsname.h>
382# include <sys/statfs.h> 387# include <sys/statfs.h>
383# include <sys/inotify.h> 388# include <sys/inotify.h>
384/* 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 */
385# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
386# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
403# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
404# else 409# else
405# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
406# endif 411# endif
407# endif 412# endif
408# ifdef __cplusplus
409extern "C" {
410# endif
411int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
412# ifdef __cplusplus
413}
414# endif
415#endif 414#endif
416 415
417#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
418/* 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 */
419# include <stdint.h> 418# include <stdint.h>
… …
425# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
426# else 425# else
427# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
428# endif 427# endif
429# endif 428# endif
430# ifdef __cplusplus
431extern "C" {
432# endif
433int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
434 430
435struct signalfd_siginfo 431struct signalfd_siginfo
436{ 432{
437 uint32_t ssi_signo; 433 uint32_t ssi_signo;
438 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
439}; 435};
440# ifdef __cplusplus
441}
442# endif 436#endif
443#endif
444
445 437
446/**/ 438/**/
447 439
448#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
449# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
463 455
464#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) */
465#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) */
466 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
467#if __GNUC__ >= 4 462#if __GNUC__ >= 4
468# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
469# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
470#else 465#else
471# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
503#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
504#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
505 500
506#if EV_USE_REALTIME 501#if EV_USE_REALTIME
507/* 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 */
508/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
509static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
510#endif 505#endif
511 506
512#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
524#endif 519#endif
525 520
526#ifdef _WIN32 521#ifdef _WIN32
527# include "ev_win32.c" 522# include "ev_win32.c"
528#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}
529 566
530/*****************************************************************************/ 567/*****************************************************************************/
531 568
532#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
533static void noinline 570static void noinline
… …
707# define EV_RELEASE_CB (void)0 744# define EV_RELEASE_CB (void)0
708# define EV_ACQUIRE_CB (void)0 745# define EV_ACQUIRE_CB (void)0
709# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 746# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
710#endif 747#endif
711 748
712#define EVUNLOOP_RECURSE 0x80 749#define EVBREAK_RECURSE 0x80
713 750
714/*****************************************************************************/ 751/*****************************************************************************/
715 752
716#ifndef EV_HAVE_EV_TIME 753#ifndef EV_HAVE_EV_TIME
717ev_tstamp 754ev_tstamp
… …
761 if (delay > 0.) 798 if (delay > 0.)
762 { 799 {
763#if EV_USE_NANOSLEEP 800#if EV_USE_NANOSLEEP
764 struct timespec ts; 801 struct timespec ts;
765 802
766 ts.tv_sec = (time_t)delay; 803 EV_TS_SET (ts, delay);
767 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
768
769 nanosleep (&ts, 0); 804 nanosleep (&ts, 0);
770#elif defined(_WIN32) 805#elif defined(_WIN32)
771 Sleep ((unsigned long)(delay * 1e3)); 806 Sleep ((unsigned long)(delay * 1e3));
772#else 807#else
773 struct timeval tv; 808 struct timeval tv;
774 809
775 tv.tv_sec = (time_t)delay;
776 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
777
778 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 810 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
779 /* something not guaranteed by newer posix versions, but guaranteed */ 811 /* something not guaranteed by newer posix versions, but guaranteed */
780 /* by older ones */ 812 /* by older ones */
813 EV_TV_SET (tv, delay);
781 select (0, 0, 0, 0, &tv); 814 select (0, 0, 0, 0, &tv);
782#endif 815#endif
783 } 816 }
784} 817}
785 818
786/*****************************************************************************/ 819/*****************************************************************************/
787 820
788#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 821#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
789 822
790/* find a suitable new size for the given array, */ 823/* find a suitable new size for the given array, */
791/* hopefully by rounding to a ncie-to-malloc size */ 824/* hopefully by rounding to a nice-to-malloc size */
792inline_size int 825inline_size int
793array_nextsize (int elem, int cur, int cnt) 826array_nextsize (int elem, int cur, int cnt)
794{ 827{
795 int ncur = cur + 1; 828 int ncur = cur + 1;
796 829
… …
937 { 970 {
938 int fd = fdchanges [i]; 971 int fd = fdchanges [i];
939 ANFD *anfd = anfds + fd; 972 ANFD *anfd = anfds + fd;
940 ev_io *w; 973 ev_io *w;
941 974
942 unsigned char events = 0; 975 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify;
943 977
944 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 978 anfd->reify = 0;
945 events |= (unsigned char)w->events;
946 979
947#if EV_SELECT_IS_WINSOCKET 980#if EV_SELECT_IS_WINSOCKET
948 if (events) 981 if (o_reify & EV__IOFDSET)
949 { 982 {
950 unsigned long arg; 983 unsigned long arg;
951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
952 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 985 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
953 } 986 }
954#endif 987#endif
955 988
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
956 { 990 {
957 unsigned char o_events = anfd->events;
958 unsigned char o_reify = anfd->reify;
959
960 anfd->reify = 0;
961 anfd->events = events; 991 anfd->events = 0;
962 992
963 if (o_events != events || o_reify & EV__IOFDSET) 993 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
994 anfd->events |= (unsigned char)w->events;
995
996 if (o_events != anfd->events)
997 o_reify = EV__IOFDSET; /* actually |= */
998 }
999
1000 if (o_reify & EV__IOFDSET)
964 backend_modify (EV_A_ fd, o_events, events); 1001 backend_modify (EV_A_ fd, o_events, anfd->events);
965 }
966 } 1002 }
967 1003
968 fdchangecnt = 0; 1004 fdchangecnt = 0;
969} 1005}
970 1006
… …
1063} 1099}
1064 1100
1065/*****************************************************************************/ 1101/*****************************************************************************/
1066 1102
1067/* 1103/*
1068 * the heap functions want a real array index. array index 0 uis guaranteed to not 1104 * the heap functions want a real array index. array index 0 is guaranteed to not
1069 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1105 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1070 * the branching factor of the d-tree. 1106 * the branching factor of the d-tree.
1071 */ 1107 */
1072 1108
1073/* 1109/*
… …
1273 uint64_t counter = 1; 1309 uint64_t counter = 1;
1274 write (evfd, &counter, sizeof (uint64_t)); 1310 write (evfd, &counter, sizeof (uint64_t));
1275 } 1311 }
1276 else 1312 else
1277#endif 1313#endif
1314 /* win32 people keep sending patches that change this write() to send() */
1315 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1316 /* so when you think this write should be a send instead, please find out */
1317 /* where your send() is from - it's definitely not the microsoft send, and */
1318 /* tell me. thank you. */
1278 write (evpipe [1], &dummy, 1); 1319 write (evpipe [1], &dummy, 1);
1279 1320
1280 errno = old_errno; 1321 errno = old_errno;
1281 } 1322 }
1282} 1323}
… …
1296 } 1337 }
1297 else 1338 else
1298#endif 1339#endif
1299 { 1340 {
1300 char dummy; 1341 char dummy;
1342 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1301 read (evpipe [0], &dummy, 1); 1343 read (evpipe [0], &dummy, 1);
1302 } 1344 }
1303 1345
1304 if (sig_pending) 1346 if (sig_pending)
1305 { 1347 {
… …
1529ev_embeddable_backends (void) 1571ev_embeddable_backends (void)
1530{ 1572{
1531 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1573 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1532 1574
1533 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1575 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1534 /* please fix it and tell me how to detect the fix */ 1576 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1535 flags &= ~EVBACKEND_EPOLL; 1577 flags &= ~EVBACKEND_EPOLL;
1536 1578
1537 return flags; 1579 return flags;
1538} 1580}
1539 1581
1540unsigned int 1582unsigned int
… …
2171 feed_reverse_done (EV_A_ EV_PERIODIC); 2213 feed_reverse_done (EV_A_ EV_PERIODIC);
2172 } 2214 }
2173} 2215}
2174 2216
2175/* simply recalculate all periodics */ 2217/* simply recalculate all periodics */
2176/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2218/* TODO: maybe ensure that at least one event happens when jumping forward? */
2177static void noinline 2219static void noinline
2178periodics_reschedule (EV_P) 2220periodics_reschedule (EV_P)
2179{ 2221{
2180 int i; 2222 int i;
2181 2223
… …
2277 mn_now = ev_rt_now; 2319 mn_now = ev_rt_now;
2278 } 2320 }
2279} 2321}
2280 2322
2281void 2323void
2282ev_loop (EV_P_ int flags) 2324ev_run (EV_P_ int flags)
2283{ 2325{
2284#if EV_FEATURE_API 2326#if EV_FEATURE_API
2285 ++loop_depth; 2327 ++loop_depth;
2286#endif 2328#endif
2287 2329
2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2330 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2289 2331
2290 loop_done = EVUNLOOP_CANCEL; 2332 loop_done = EVBREAK_CANCEL;
2291 2333
2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2334 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2293 2335
2294 do 2336 do
2295 { 2337 {
… …
2338 /* calculate blocking time */ 2380 /* calculate blocking time */
2339 { 2381 {
2340 ev_tstamp waittime = 0.; 2382 ev_tstamp waittime = 0.;
2341 ev_tstamp sleeptime = 0.; 2383 ev_tstamp sleeptime = 0.;
2342 2384
2385 /* remember old timestamp for io_blocktime calculation */
2386 ev_tstamp prev_mn_now = mn_now;
2387
2388 /* update time to cancel out callback processing overhead */
2389 time_update (EV_A_ 1e100);
2390
2343 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2391 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2344 { 2392 {
2345 /* remember old timestamp for io_blocktime calculation */
2346 ev_tstamp prev_mn_now = mn_now;
2347
2348 /* update time to cancel out callback processing overhead */
2349 time_update (EV_A_ 1e100);
2350
2351 waittime = MAX_BLOCKTIME; 2393 waittime = MAX_BLOCKTIME;
2352 2394
2353 if (timercnt) 2395 if (timercnt)
2354 { 2396 {
2355 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2397 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2385 } 2427 }
2386 2428
2387#if EV_FEATURE_API 2429#if EV_FEATURE_API
2388 ++loop_count; 2430 ++loop_count;
2389#endif 2431#endif
2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2432 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2391 backend_poll (EV_A_ waittime); 2433 backend_poll (EV_A_ waittime);
2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2434 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2393 2435
2394 /* update ev_rt_now, do magic */ 2436 /* update ev_rt_now, do magic */
2395 time_update (EV_A_ waittime + sleeptime); 2437 time_update (EV_A_ waittime + sleeptime);
2396 } 2438 }
2397 2439
… …
2415 EV_INVOKE_PENDING; 2457 EV_INVOKE_PENDING;
2416 } 2458 }
2417 while (expect_true ( 2459 while (expect_true (
2418 activecnt 2460 activecnt
2419 && !loop_done 2461 && !loop_done
2420 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2462 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2421 )); 2463 ));
2422 2464
2423 if (loop_done == EVUNLOOP_ONE) 2465 if (loop_done == EVBREAK_ONE)
2424 loop_done = EVUNLOOP_CANCEL; 2466 loop_done = EVBREAK_CANCEL;
2425 2467
2426#if EV_FEATURE_API 2468#if EV_FEATURE_API
2427 --loop_depth; 2469 --loop_depth;
2428#endif 2470#endif
2429} 2471}
2430 2472
2431void 2473void
2432ev_unloop (EV_P_ int how) 2474ev_break (EV_P_ int how)
2433{ 2475{
2434 loop_done = how; 2476 loop_done = how;
2435} 2477}
2436 2478
2437void 2479void
… …
2585 EV_FREQUENT_CHECK; 2627 EV_FREQUENT_CHECK;
2586 2628
2587 wlist_del (&anfds[w->fd].head, (WL)w); 2629 wlist_del (&anfds[w->fd].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2630 ev_stop (EV_A_ (W)w);
2589 2631
2590 fd_change (EV_A_ w->fd, 1); 2632 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2591 2633
2592 EV_FREQUENT_CHECK; 2634 EV_FREQUENT_CHECK;
2593} 2635}
2594 2636
2595void noinline 2637void noinline
… …
3047 { 3089 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3090 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3049 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3091 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len; 3092 ofs += sizeof (struct inotify_event) + ev->len;
3051 } 3093 }
3052}
3053
3054inline_size unsigned int
3055ev_linux_version (void)
3056{
3057 struct utsname buf;
3058 unsigned int v;
3059 int i;
3060 char *p = buf.release;
3061
3062 if (uname (&buf))
3063 return 0;
3064
3065 for (i = 3+1; --i; )
3066 {
3067 unsigned int c = 0;
3068
3069 for (;;)
3070 {
3071 if (*p >= '0' && *p <= '9')
3072 c = c * 10 + *p++ - '0';
3073 else
3074 {
3075 p += *p == '.';
3076 break;
3077 }
3078 }
3079
3080 v = (v << 8) | c;
3081 }
3082
3083 return v;
3084} 3094}
3085 3095
3086inline_size void 3096inline_size void
3087ev_check_2625 (EV_P) 3097ev_check_2625 (EV_P)
3088{ 3098{
… …
3412 3422
3413#if EV_EMBED_ENABLE 3423#if EV_EMBED_ENABLE
3414void noinline 3424void noinline
3415ev_embed_sweep (EV_P_ ev_embed *w) 3425ev_embed_sweep (EV_P_ ev_embed *w)
3416{ 3426{
3417 ev_loop (w->other, EVLOOP_NONBLOCK); 3427 ev_run (w->other, EVRUN_NOWAIT);
3418} 3428}
3419 3429
3420static void 3430static void
3421embed_io_cb (EV_P_ ev_io *io, int revents) 3431embed_io_cb (EV_P_ ev_io *io, int revents)
3422{ 3432{
3423 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3433 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3424 3434
3425 if (ev_cb (w)) 3435 if (ev_cb (w))
3426 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3436 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3427 else 3437 else
3428 ev_loop (w->other, EVLOOP_NONBLOCK); 3438 ev_run (w->other, EVRUN_NOWAIT);
3429} 3439}
3430 3440
3431static void 3441static void
3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3442embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3433{ 3443{
… …
3437 EV_P = w->other; 3447 EV_P = w->other;
3438 3448
3439 while (fdchangecnt) 3449 while (fdchangecnt)
3440 { 3450 {
3441 fd_reify (EV_A); 3451 fd_reify (EV_A);
3442 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3452 ev_run (EV_A_ EVRUN_NOWAIT);
3443 } 3453 }
3444 } 3454 }
3445} 3455}
3446 3456
3447static void 3457static void
… …
3453 3463
3454 { 3464 {
3455 EV_P = w->other; 3465 EV_P = w->other;
3456 3466
3457 ev_loop_fork (EV_A); 3467 ev_loop_fork (EV_A);
3458 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3468 ev_run (EV_A_ EVRUN_NOWAIT);
3459 } 3469 }
3460 3470
3461 ev_embed_start (EV_A_ w); 3471 ev_embed_start (EV_A_ w);
3462} 3472}
3463 3473
… …
3561void 3571void
3562ev_async_start (EV_P_ ev_async *w) 3572ev_async_start (EV_P_ ev_async *w)
3563{ 3573{
3564 if (expect_false (ev_is_active (w))) 3574 if (expect_false (ev_is_active (w)))
3565 return; 3575 return;
3576
3577 w->sent = 0;
3566 3578
3567 evpipe_init (EV_A); 3579 evpipe_init (EV_A);
3568 3580
3569 EV_FREQUENT_CHECK; 3581 EV_FREQUENT_CHECK;
3570 3582
… …
3790 3802
3791#if EV_MULTIPLICITY 3803#if EV_MULTIPLICITY
3792 #include "ev_wrap.h" 3804 #include "ev_wrap.h"
3793#endif 3805#endif
3794 3806
3795#ifdef __cplusplus 3807EV_CPP(})
3796}
3797#endif
3798 3808

Diff Legend

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