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

Comparing libev/ev.c (file contents):
Revision 1.348 by root, Fri Oct 15 22:48:25 2010 UTC vs.
Revision 1.359 by root, Sun Oct 24 17:58:41 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
… …
384# include <sys/select.h> 382# include <sys/select.h>
385# endif 383# endif
386#endif 384#endif
387 385
388#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 387# include <sys/statfs.h>
391# include <sys/inotify.h> 388# include <sys/inotify.h>
392/* 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 */
393# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
412# else 409# else
413# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
414# endif 411# endif
415# endif 412# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 414#endif
424 415
425#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
426/* 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 */
427# include <stdint.h> 418# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
434# else 425# else
435# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
436# endif 427# endif
437# endif 428# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 430
443struct signalfd_siginfo 431struct signalfd_siginfo
444{ 432{
445 uint32_t ssi_signo; 433 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
447}; 435};
448# ifdef __cplusplus
449}
450# endif
451#endif 436#endif
452 437
453/**/ 438/**/
454 439
455#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
… …
537# include "ev_win32.c" 522# include "ev_win32.c"
538#endif 523#endif
539 524
540/*****************************************************************************/ 525/*****************************************************************************/
541 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 unsigned int v = 0;
536 struct utsname buf;
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}
566
567/*****************************************************************************/
568
542#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
543static void noinline 570static void noinline
544ev_printerr (const char *msg) 571ev_printerr (const char *msg)
545{ 572{
546 write (STDERR_FILENO, msg, strlen (msg)); 573 write (STDERR_FILENO, msg, strlen (msg));
… …
641 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 */
642 unsigned char unused; 669 unsigned char unused;
643#if EV_USE_EPOLL 670#if EV_USE_EPOLL
644 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
645#endif 672#endif
646#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
647 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
648#endif 678#endif
649} ANFD; 679} ANFD;
650 680
651/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
652typedef struct 682typedef struct
… …
717# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
718# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
720#endif 750#endif
721 751
722#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
723 753
724/*****************************************************************************/ 754/*****************************************************************************/
725 755
726#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
727ev_tstamp 757ev_tstamp
… …
781 struct timeval tv; 811 struct timeval tv;
782 812
783 /* 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 */
784 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
785 /* by older ones */ 815 /* by older ones */
786 EV_TS_SET (tv, delay); 816 EV_TV_SET (tv, delay);
787 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
788#endif 818#endif
789 } 819 }
790} 820}
791 821
… …
943 { 973 {
944 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
945 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
946 ev_io *w; 976 ev_io *w;
947 977
948 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
949 980
950 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
951 events |= (unsigned char)w->events;
952 982
953#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
954 if (events) 984 if (o_reify & EV__IOFDSET)
955 { 985 {
956 unsigned long arg; 986 unsigned long arg;
957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
958 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
959 } 990 }
960#endif 991#endif
961 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
962 { 994 {
963 unsigned char o_events = anfd->events;
964 unsigned char o_reify = anfd->reify;
965
966 anfd->reify = 0;
967 anfd->events = events; 995 anfd->events = 0;
968 996
969 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)
970 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
971 }
972 } 1006 }
973 1007
974 fdchangecnt = 0; 1008 fdchangecnt = 0;
975} 1009}
976 1010
… …
1459 1493
1460#endif 1494#endif
1461 1495
1462/*****************************************************************************/ 1496/*****************************************************************************/
1463 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1464#if EV_USE_PORT 1501#if EV_USE_PORT
1465# include "ev_port.c" 1502# include "ev_port.c"
1466#endif 1503#endif
1467#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1468# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1541ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1542{ 1579{
1543 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1544 1581
1545 /* 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 */
1546 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1547 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1548 1585
1549 return flags; 1586 return flags;
1550} 1587}
1551 1588
1552unsigned int 1589unsigned int
… …
1665#endif 1702#endif
1666 1703
1667 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1668 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1669 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1670#if EV_USE_PORT 1710#if EV_USE_PORT
1671 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1672#endif 1712#endif
1673#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1674 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1691#endif 1731#endif
1692 } 1732 }
1693} 1733}
1694 1734
1695/* free up a loop structure */ 1735/* free up a loop structure */
1696static void noinline 1736void
1697loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1698{ 1738{
1699 int i; 1739 int i;
1740
1741#if EV_CHILD_ENABLE
1742 if (ev_is_active (&childev))
1743 {
1744 ev_ref (EV_A); /* child watcher */
1745 ev_signal_stop (EV_A_ &childev);
1746 }
1747#endif
1700 1748
1701 if (ev_is_active (&pipe_w)) 1749 if (ev_is_active (&pipe_w))
1702 { 1750 {
1703 /*ev_ref (EV_A);*/ 1751 /*ev_ref (EV_A);*/
1704 /*ev_io_stop (EV_A_ &pipe_w);*/ 1752 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1726#endif 1774#endif
1727 1775
1728 if (backend_fd >= 0) 1776 if (backend_fd >= 0)
1729 close (backend_fd); 1777 close (backend_fd);
1730 1778
1779#if EV_USE_IOCP
1780 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1781#endif
1731#if EV_USE_PORT 1782#if EV_USE_PORT
1732 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1783 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1733#endif 1784#endif
1734#if EV_USE_KQUEUE 1785#if EV_USE_KQUEUE
1735 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1786 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1769#if EV_ASYNC_ENABLE 1820#if EV_ASYNC_ENABLE
1770 array_free (async, EMPTY); 1821 array_free (async, EMPTY);
1771#endif 1822#endif
1772 1823
1773 backend = 0; 1824 backend = 0;
1825
1826#if EV_MULTIPLICITY
1827 if (ev_is_default_loop (EV_A))
1828#endif
1829 ev_default_loop_ptr = 0;
1830#if EV_MULTIPLICITY
1831 else
1832 ev_free (EV_A);
1833#endif
1774} 1834}
1775 1835
1776#if EV_USE_INOTIFY 1836#if EV_USE_INOTIFY
1777inline_size void infy_fork (EV_P); 1837inline_size void infy_fork (EV_P);
1778#endif 1838#endif
… …
1837 loop_init (EV_A_ flags); 1897 loop_init (EV_A_ flags);
1838 1898
1839 if (ev_backend (EV_A)) 1899 if (ev_backend (EV_A))
1840 return EV_A; 1900 return EV_A;
1841 1901
1902 ev_free (EV_A);
1842 return 0; 1903 return 0;
1843} 1904}
1844 1905
1845void
1846ev_loop_destroy (EV_P)
1847{
1848 loop_destroy (EV_A);
1849 ev_free (loop);
1850}
1851
1852void
1853ev_loop_fork (EV_P)
1854{
1855 postfork = 1; /* must be in line with ev_default_fork */
1856}
1857#endif /* multiplicity */ 1906#endif /* multiplicity */
1858 1907
1859#if EV_VERIFY 1908#if EV_VERIFY
1860static void noinline 1909static void noinline
1861verify_watcher (EV_P_ W w) 1910verify_watcher (EV_P_ W w)
… …
1963} 2012}
1964#endif 2013#endif
1965 2014
1966#if EV_MULTIPLICITY 2015#if EV_MULTIPLICITY
1967struct ev_loop * 2016struct ev_loop *
1968ev_default_loop_init (unsigned int flags)
1969#else 2017#else
1970int 2018int
2019#endif
1971ev_default_loop (unsigned int flags) 2020ev_default_loop (unsigned int flags)
1972#endif
1973{ 2021{
1974 if (!ev_default_loop_ptr) 2022 if (!ev_default_loop_ptr)
1975 { 2023 {
1976#if EV_MULTIPLICITY 2024#if EV_MULTIPLICITY
1977 EV_P = ev_default_loop_ptr = &default_loop_struct; 2025 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1996 2044
1997 return ev_default_loop_ptr; 2045 return ev_default_loop_ptr;
1998} 2046}
1999 2047
2000void 2048void
2001ev_default_destroy (void) 2049ev_loop_fork (EV_P)
2002{ 2050{
2003#if EV_MULTIPLICITY
2004 EV_P = ev_default_loop_ptr;
2005#endif
2006
2007 ev_default_loop_ptr = 0;
2008
2009#if EV_CHILD_ENABLE
2010 ev_ref (EV_A); /* child watcher */
2011 ev_signal_stop (EV_A_ &childev);
2012#endif
2013
2014 loop_destroy (EV_A);
2015}
2016
2017void
2018ev_default_fork (void)
2019{
2020#if EV_MULTIPLICITY
2021 EV_P = ev_default_loop_ptr;
2022#endif
2023
2024 postfork = 1; /* must be in line with ev_loop_fork */ 2051 postfork = 1; /* must be in line with ev_default_fork */
2025} 2052}
2026 2053
2027/*****************************************************************************/ 2054/*****************************************************************************/
2028 2055
2029void 2056void
… …
2289 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2290 } 2317 }
2291} 2318}
2292 2319
2293void 2320void
2294ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2295{ 2322{
2296#if EV_FEATURE_API 2323#if EV_FEATURE_API
2297 ++loop_depth; 2324 ++loop_depth;
2298#endif 2325#endif
2299 2326
2300 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2327 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2301 2328
2302 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2303 2330
2304 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2331 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2305 2332
2306 do 2333 do
2307 { 2334 {
… …
2350 /* calculate blocking time */ 2377 /* calculate blocking time */
2351 { 2378 {
2352 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2353 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2354 2381
2382 /* remember old timestamp for io_blocktime calculation */
2383 ev_tstamp prev_mn_now = mn_now;
2384
2385 /* update time to cancel out callback processing overhead */
2386 time_update (EV_A_ 1e100);
2387
2355 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2356 { 2389 {
2357 /* remember old timestamp for io_blocktime calculation */
2358 ev_tstamp prev_mn_now = mn_now;
2359
2360 /* update time to cancel out callback processing overhead */
2361 time_update (EV_A_ 1e100);
2362
2363 waittime = MAX_BLOCKTIME; 2390 waittime = MAX_BLOCKTIME;
2364 2391
2365 if (timercnt) 2392 if (timercnt)
2366 { 2393 {
2367 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2397 } 2424 }
2398 2425
2399#if EV_FEATURE_API 2426#if EV_FEATURE_API
2400 ++loop_count; 2427 ++loop_count;
2401#endif 2428#endif
2402 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2403 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2404 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2405 2432
2406 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2407 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2408 } 2435 }
2409 2436
… …
2427 EV_INVOKE_PENDING; 2454 EV_INVOKE_PENDING;
2428 } 2455 }
2429 while (expect_true ( 2456 while (expect_true (
2430 activecnt 2457 activecnt
2431 && !loop_done 2458 && !loop_done
2432 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2433 )); 2460 ));
2434 2461
2435 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2436 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2437 2464
2438#if EV_FEATURE_API 2465#if EV_FEATURE_API
2439 --loop_depth; 2466 --loop_depth;
2440#endif 2467#endif
2441} 2468}
2442 2469
2443void 2470void
2444ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2445{ 2472{
2446 loop_done = how; 2473 loop_done = how;
2447} 2474}
2448 2475
2449void 2476void
… …
2597 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2598 2625
2599 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2600 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2601 2628
2602 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2603 2630
2604 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2605} 2632}
2606 2633
2607void noinline 2634void noinline
… …
3059 { 3086 {
3060 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3087 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3061 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3088 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3062 ofs += sizeof (struct inotify_event) + ev->len; 3089 ofs += sizeof (struct inotify_event) + ev->len;
3063 } 3090 }
3064}
3065
3066inline_size unsigned int
3067ev_linux_version (void)
3068{
3069 struct utsname buf;
3070 unsigned int v;
3071 int i;
3072 char *p = buf.release;
3073
3074 if (uname (&buf))
3075 return 0;
3076
3077 for (i = 3+1; --i; )
3078 {
3079 unsigned int c = 0;
3080
3081 for (;;)
3082 {
3083 if (*p >= '0' && *p <= '9')
3084 c = c * 10 + *p++ - '0';
3085 else
3086 {
3087 p += *p == '.';
3088 break;
3089 }
3090 }
3091
3092 v = (v << 8) | c;
3093 }
3094
3095 return v;
3096} 3091}
3097 3092
3098inline_size void 3093inline_size void
3099ev_check_2625 (EV_P) 3094ev_check_2625 (EV_P)
3100{ 3095{
… …
3424 3419
3425#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
3426void noinline 3421void noinline
3427ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
3428{ 3423{
3429 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
3430} 3425}
3431 3426
3432static void 3427static void
3433embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
3434{ 3429{
3435 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3436 3431
3437 if (ev_cb (w)) 3432 if (ev_cb (w))
3438 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3439 else 3434 else
3440 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3441} 3436}
3442 3437
3443static void 3438static void
3444embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3445{ 3440{
… …
3449 EV_P = w->other; 3444 EV_P = w->other;
3450 3445
3451 while (fdchangecnt) 3446 while (fdchangecnt)
3452 { 3447 {
3453 fd_reify (EV_A); 3448 fd_reify (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3455 } 3450 }
3456 } 3451 }
3457} 3452}
3458 3453
3459static void 3454static void
… …
3465 3460
3466 { 3461 {
3467 EV_P = w->other; 3462 EV_P = w->other;
3468 3463
3469 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3470 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3471 } 3466 }
3472 3467
3473 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3474} 3469}
3475 3470
… …
3573void 3568void
3574ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3575{ 3570{
3576 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3577 return; 3572 return;
3573
3574 w->sent = 0;
3578 3575
3579 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3580 3577
3581 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3582 3579
… …
3802 3799
3803#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3804 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3805#endif 3802#endif
3806 3803
3807#ifdef __cplusplus 3804EV_CPP(})
3808}
3809#endif
3810 3805

Diff Legend

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