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.355 by root, Fri Oct 22 10:09:12 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)
… …
403# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
404# else 410# else
405# define EFD_CLOEXEC 02000000 411# define EFD_CLOEXEC 02000000
406# endif 412# endif
407# endif 413# endif
408# ifdef __cplusplus
409extern "C" {
410# endif
411int (eventfd) (unsigned int initval, int flags); 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
412# ifdef __cplusplus
413}
414# endif
415#endif 415#endif
416 416
417#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h> 419# include <stdint.h>
… …
425# define SFD_CLOEXEC O_CLOEXEC 425# define SFD_CLOEXEC O_CLOEXEC
426# else 426# else
427# define SFD_CLOEXEC 02000000 427# define SFD_CLOEXEC 02000000
428# endif 428# endif
429# endif 429# endif
430# ifdef __cplusplus
431extern "C" {
432# endif
433int signalfd (int fd, const sigset_t *mask, int flags); 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
434 431
435struct signalfd_siginfo 432struct signalfd_siginfo
436{ 433{
437 uint32_t ssi_signo; 434 uint32_t ssi_signo;
438 char pad[128 - sizeof (uint32_t)]; 435 char pad[128 - sizeof (uint32_t)];
439}; 436};
440# ifdef __cplusplus
441}
442# endif 437#endif
443#endif
444
445 438
446/**/ 439/**/
447 440
448#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
449# define EV_FREQUENT_CHECK ev_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
463 456
464#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
465#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
466 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462
467#if __GNUC__ >= 4 463#if __GNUC__ >= 4
468# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
469# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
470#else 466#else
471# define expect(expr,value) (expr) 467# define expect(expr,value) (expr)
… …
503#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
504#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
505 501
506#if EV_USE_REALTIME 502#if EV_USE_REALTIME
507/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
508/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
509static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
510#endif 506#endif
511 507
512#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
524#endif 520#endif
525 521
526#ifdef _WIN32 522#ifdef _WIN32
527# include "ev_win32.c" 523# include "ev_win32.c"
528#endif 524#endif
525
526/*****************************************************************************/
527
528static unsigned int noinline
529ev_linux_version (void)
530{
531#ifdef __linux
532 struct utsname buf;
533 unsigned int v;
534 int i;
535 char *p = buf.release;
536
537 if (uname (&buf))
538 return 0;
539
540 for (i = 3+1; --i; )
541 {
542 unsigned int c = 0;
543
544 for (;;)
545 {
546 if (*p >= '0' && *p <= '9')
547 c = c * 10 + *p++ - '0';
548 else
549 {
550 p += *p == '.';
551 break;
552 }
553 }
554
555 v = (v << 8) | c;
556 }
557
558 return v;
559#else
560 return 0;
561#endif
562}
529 563
530/*****************************************************************************/ 564/*****************************************************************************/
531 565
532#if EV_AVOID_STDIO 566#if EV_AVOID_STDIO
533static void noinline 567static void noinline
… …
707# define EV_RELEASE_CB (void)0 741# define EV_RELEASE_CB (void)0
708# define EV_ACQUIRE_CB (void)0 742# define EV_ACQUIRE_CB (void)0
709# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 743# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
710#endif 744#endif
711 745
712#define EVUNLOOP_RECURSE 0x80 746#define EVBREAK_RECURSE 0x80
713 747
714/*****************************************************************************/ 748/*****************************************************************************/
715 749
716#ifndef EV_HAVE_EV_TIME 750#ifndef EV_HAVE_EV_TIME
717ev_tstamp 751ev_tstamp
… …
761 if (delay > 0.) 795 if (delay > 0.)
762 { 796 {
763#if EV_USE_NANOSLEEP 797#if EV_USE_NANOSLEEP
764 struct timespec ts; 798 struct timespec ts;
765 799
766 ts.tv_sec = (time_t)delay; 800 EV_TS_SET (ts, delay);
767 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
768
769 nanosleep (&ts, 0); 801 nanosleep (&ts, 0);
770#elif defined(_WIN32) 802#elif defined(_WIN32)
771 Sleep ((unsigned long)(delay * 1e3)); 803 Sleep ((unsigned long)(delay * 1e3));
772#else 804#else
773 struct timeval tv; 805 struct timeval tv;
774 806
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 */ 807 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
779 /* something not guaranteed by newer posix versions, but guaranteed */ 808 /* something not guaranteed by newer posix versions, but guaranteed */
780 /* by older ones */ 809 /* by older ones */
810 EV_TV_SET (tv, delay);
781 select (0, 0, 0, 0, &tv); 811 select (0, 0, 0, 0, &tv);
782#endif 812#endif
783 } 813 }
784} 814}
785 815
786/*****************************************************************************/ 816/*****************************************************************************/
787 817
788#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 818#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
789 819
790/* find a suitable new size for the given array, */ 820/* find a suitable new size for the given array, */
791/* hopefully by rounding to a ncie-to-malloc size */ 821/* hopefully by rounding to a nice-to-malloc size */
792inline_size int 822inline_size int
793array_nextsize (int elem, int cur, int cnt) 823array_nextsize (int elem, int cur, int cnt)
794{ 824{
795 int ncur = cur + 1; 825 int ncur = cur + 1;
796 826
… …
937 { 967 {
938 int fd = fdchanges [i]; 968 int fd = fdchanges [i];
939 ANFD *anfd = anfds + fd; 969 ANFD *anfd = anfds + fd;
940 ev_io *w; 970 ev_io *w;
941 971
942 unsigned char events = 0; 972 unsigned char o_events = anfd->events;
973 unsigned char o_reify = anfd->reify;
943 974
944 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 975 anfd->reify = 0;
945 events |= (unsigned char)w->events;
946 976
947#if EV_SELECT_IS_WINSOCKET 977#if EV_SELECT_IS_WINSOCKET
948 if (events) 978 if (o_reify & EV__IOFDSET)
949 { 979 {
950 unsigned long arg; 980 unsigned long arg;
951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 981 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
952 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 982 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
953 } 983 }
954#endif 984#endif
955 985
986 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
956 { 987 {
957 unsigned char o_events = anfd->events;
958 unsigned char o_reify = anfd->reify;
959
960 anfd->reify = 0;
961 anfd->events = events; 988 anfd->events = 0;
962 989
963 if (o_events != events || o_reify & EV__IOFDSET) 990 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
991 anfd->events |= (unsigned char)w->events;
992
993 if (o_events != anfd->events)
994 o_reify = EV__IOFDSET; /* actually |= */
995 }
996
997 if (o_reify & EV__IOFDSET)
964 backend_modify (EV_A_ fd, o_events, events); 998 backend_modify (EV_A_ fd, o_events, anfd->events);
965 }
966 } 999 }
967 1000
968 fdchangecnt = 0; 1001 fdchangecnt = 0;
969} 1002}
970 1003
… …
1063} 1096}
1064 1097
1065/*****************************************************************************/ 1098/*****************************************************************************/
1066 1099
1067/* 1100/*
1068 * the heap functions want a real array index. array index 0 uis guaranteed to not 1101 * 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 1102 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1070 * the branching factor of the d-tree. 1103 * the branching factor of the d-tree.
1071 */ 1104 */
1072 1105
1073/* 1106/*
… …
1273 uint64_t counter = 1; 1306 uint64_t counter = 1;
1274 write (evfd, &counter, sizeof (uint64_t)); 1307 write (evfd, &counter, sizeof (uint64_t));
1275 } 1308 }
1276 else 1309 else
1277#endif 1310#endif
1311 /* win32 people keep sending patches that change this write() to send() */
1312 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1313 /* so when you think this write should be a send instead, please find out */
1314 /* where your send() is from - it's definitely not the microsoft send, and */
1315 /* tell me. thank you. */
1278 write (evpipe [1], &dummy, 1); 1316 write (evpipe [1], &dummy, 1);
1279 1317
1280 errno = old_errno; 1318 errno = old_errno;
1281 } 1319 }
1282} 1320}
… …
1296 } 1334 }
1297 else 1335 else
1298#endif 1336#endif
1299 { 1337 {
1300 char dummy; 1338 char dummy;
1339 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1301 read (evpipe [0], &dummy, 1); 1340 read (evpipe [0], &dummy, 1);
1302 } 1341 }
1303 1342
1304 if (sig_pending) 1343 if (sig_pending)
1305 { 1344 {
… …
1529ev_embeddable_backends (void) 1568ev_embeddable_backends (void)
1530{ 1569{
1531 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1570 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1532 1571
1533 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1572 /* 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 */ 1573 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1535 flags &= ~EVBACKEND_EPOLL; 1574 flags &= ~EVBACKEND_EPOLL;
1536 1575
1537 return flags; 1576 return flags;
1538} 1577}
1539 1578
1540unsigned int 1579unsigned int
… …
2171 feed_reverse_done (EV_A_ EV_PERIODIC); 2210 feed_reverse_done (EV_A_ EV_PERIODIC);
2172 } 2211 }
2173} 2212}
2174 2213
2175/* simply recalculate all periodics */ 2214/* simply recalculate all periodics */
2176/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2215/* TODO: maybe ensure that at least one event happens when jumping forward? */
2177static void noinline 2216static void noinline
2178periodics_reschedule (EV_P) 2217periodics_reschedule (EV_P)
2179{ 2218{
2180 int i; 2219 int i;
2181 2220
… …
2277 mn_now = ev_rt_now; 2316 mn_now = ev_rt_now;
2278 } 2317 }
2279} 2318}
2280 2319
2281void 2320void
2282ev_loop (EV_P_ int flags) 2321ev_run (EV_P_ int flags)
2283{ 2322{
2284#if EV_FEATURE_API 2323#if EV_FEATURE_API
2285 ++loop_depth; 2324 ++loop_depth;
2286#endif 2325#endif
2287 2326
2288 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));
2289 2328
2290 loop_done = EVUNLOOP_CANCEL; 2329 loop_done = EVBREAK_CANCEL;
2291 2330
2292 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 */
2293 2332
2294 do 2333 do
2295 { 2334 {
… …
2338 /* calculate blocking time */ 2377 /* calculate blocking time */
2339 { 2378 {
2340 ev_tstamp waittime = 0.; 2379 ev_tstamp waittime = 0.;
2341 ev_tstamp sleeptime = 0.; 2380 ev_tstamp sleeptime = 0.;
2342 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
2343 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2388 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2344 { 2389 {
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; 2390 waittime = MAX_BLOCKTIME;
2352 2391
2353 if (timercnt) 2392 if (timercnt)
2354 { 2393 {
2355 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2394 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2385 } 2424 }
2386 2425
2387#if EV_FEATURE_API 2426#if EV_FEATURE_API
2388 ++loop_count; 2427 ++loop_count;
2389#endif 2428#endif
2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2429 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2391 backend_poll (EV_A_ waittime); 2430 backend_poll (EV_A_ waittime);
2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2431 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2393 2432
2394 /* update ev_rt_now, do magic */ 2433 /* update ev_rt_now, do magic */
2395 time_update (EV_A_ waittime + sleeptime); 2434 time_update (EV_A_ waittime + sleeptime);
2396 } 2435 }
2397 2436
… …
2415 EV_INVOKE_PENDING; 2454 EV_INVOKE_PENDING;
2416 } 2455 }
2417 while (expect_true ( 2456 while (expect_true (
2418 activecnt 2457 activecnt
2419 && !loop_done 2458 && !loop_done
2420 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2459 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2421 )); 2460 ));
2422 2461
2423 if (loop_done == EVUNLOOP_ONE) 2462 if (loop_done == EVBREAK_ONE)
2424 loop_done = EVUNLOOP_CANCEL; 2463 loop_done = EVBREAK_CANCEL;
2425 2464
2426#if EV_FEATURE_API 2465#if EV_FEATURE_API
2427 --loop_depth; 2466 --loop_depth;
2428#endif 2467#endif
2429} 2468}
2430 2469
2431void 2470void
2432ev_unloop (EV_P_ int how) 2471ev_break (EV_P_ int how)
2433{ 2472{
2434 loop_done = how; 2473 loop_done = how;
2435} 2474}
2436 2475
2437void 2476void
… …
2585 EV_FREQUENT_CHECK; 2624 EV_FREQUENT_CHECK;
2586 2625
2587 wlist_del (&anfds[w->fd].head, (WL)w); 2626 wlist_del (&anfds[w->fd].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2627 ev_stop (EV_A_ (W)w);
2589 2628
2590 fd_change (EV_A_ w->fd, 1); 2629 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2591 2630
2592 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2593} 2632}
2594 2633
2595void noinline 2634void noinline
… …
3047 { 3086 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3087 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3049 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3088 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len; 3089 ofs += sizeof (struct inotify_event) + ev->len;
3051 } 3090 }
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} 3091}
3085 3092
3086inline_size void 3093inline_size void
3087ev_check_2625 (EV_P) 3094ev_check_2625 (EV_P)
3088{ 3095{
… …
3412 3419
3413#if EV_EMBED_ENABLE 3420#if EV_EMBED_ENABLE
3414void noinline 3421void noinline
3415ev_embed_sweep (EV_P_ ev_embed *w) 3422ev_embed_sweep (EV_P_ ev_embed *w)
3416{ 3423{
3417 ev_loop (w->other, EVLOOP_NONBLOCK); 3424 ev_run (w->other, EVRUN_NOWAIT);
3418} 3425}
3419 3426
3420static void 3427static void
3421embed_io_cb (EV_P_ ev_io *io, int revents) 3428embed_io_cb (EV_P_ ev_io *io, int revents)
3422{ 3429{
3423 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3430 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3424 3431
3425 if (ev_cb (w)) 3432 if (ev_cb (w))
3426 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3433 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3427 else 3434 else
3428 ev_loop (w->other, EVLOOP_NONBLOCK); 3435 ev_run (w->other, EVRUN_NOWAIT);
3429} 3436}
3430 3437
3431static void 3438static void
3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3439embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3433{ 3440{
… …
3437 EV_P = w->other; 3444 EV_P = w->other;
3438 3445
3439 while (fdchangecnt) 3446 while (fdchangecnt)
3440 { 3447 {
3441 fd_reify (EV_A); 3448 fd_reify (EV_A);
3442 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_run (EV_A_ EVRUN_NOWAIT);
3443 } 3450 }
3444 } 3451 }
3445} 3452}
3446 3453
3447static void 3454static void
… …
3453 3460
3454 { 3461 {
3455 EV_P = w->other; 3462 EV_P = w->other;
3456 3463
3457 ev_loop_fork (EV_A); 3464 ev_loop_fork (EV_A);
3458 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3465 ev_run (EV_A_ EVRUN_NOWAIT);
3459 } 3466 }
3460 3467
3461 ev_embed_start (EV_A_ w); 3468 ev_embed_start (EV_A_ w);
3462} 3469}
3463 3470
… …
3561void 3568void
3562ev_async_start (EV_P_ ev_async *w) 3569ev_async_start (EV_P_ ev_async *w)
3563{ 3570{
3564 if (expect_false (ev_is_active (w))) 3571 if (expect_false (ev_is_active (w)))
3565 return; 3572 return;
3573
3574 w->sent = 0;
3566 3575
3567 evpipe_init (EV_A); 3576 evpipe_init (EV_A);
3568 3577
3569 EV_FREQUENT_CHECK; 3578 EV_FREQUENT_CHECK;
3570 3579
… …
3790 3799
3791#if EV_MULTIPLICITY 3800#if EV_MULTIPLICITY
3792 #include "ev_wrap.h" 3801 #include "ev_wrap.h"
3793#endif 3802#endif
3794 3803
3795#ifdef __cplusplus 3804EV_CPP(})
3796}
3797#endif
3798 3805

Diff Legend

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