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.358 by root, Sun Oct 24 14:44:40 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
… …
631 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 */
632 unsigned char unused; 669 unsigned char unused;
633#if EV_USE_EPOLL 670#if EV_USE_EPOLL
634 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
635#endif 672#endif
636#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
637 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
638#endif 678#endif
639} ANFD; 679} ANFD;
640 680
641/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
642typedef struct 682typedef struct
… …
707# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
708# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
709# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
710#endif 750#endif
711 751
712#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
713 753
714/*****************************************************************************/ 754/*****************************************************************************/
715 755
716#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
717ev_tstamp 757ev_tstamp
… …
761 if (delay > 0.) 801 if (delay > 0.)
762 { 802 {
763#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
764 struct timespec ts; 804 struct timespec ts;
765 805
766 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
767 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
768
769 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
770#elif defined(_WIN32) 808#elif defined(_WIN32)
771 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
772#else 810#else
773 struct timeval tv; 811 struct timeval tv;
774 812
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 */ 813 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
779 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
780 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
781 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
782#endif 818#endif
783 } 819 }
784} 820}
785 821
786/*****************************************************************************/ 822/*****************************************************************************/
787 823
788#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 */
789 825
790/* find a suitable new size for the given array, */ 826/* find a suitable new size for the given array, */
791/* hopefully by rounding to a ncie-to-malloc size */ 827/* hopefully by rounding to a nice-to-malloc size */
792inline_size int 828inline_size int
793array_nextsize (int elem, int cur, int cnt) 829array_nextsize (int elem, int cur, int cnt)
794{ 830{
795 int ncur = cur + 1; 831 int ncur = cur + 1;
796 832
… …
937 { 973 {
938 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
939 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
940 ev_io *w; 976 ev_io *w;
941 977
942 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
943 980
944 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
945 events |= (unsigned char)w->events;
946 982
947#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
948 if (events) 984 if (o_reify & EV__IOFDSET)
949 { 985 {
950 unsigned long arg; 986 unsigned long arg;
951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
952 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
953 } 990 }
954#endif 991#endif
955 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
956 { 994 {
957 unsigned char o_events = anfd->events;
958 unsigned char o_reify = anfd->reify;
959
960 anfd->reify = 0;
961 anfd->events = events; 995 anfd->events = 0;
962 996
963 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)
964 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
965 }
966 } 1006 }
967 1007
968 fdchangecnt = 0; 1008 fdchangecnt = 0;
969} 1009}
970 1010
… …
1063} 1103}
1064 1104
1065/*****************************************************************************/ 1105/*****************************************************************************/
1066 1106
1067/* 1107/*
1068 * 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
1069 * 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
1070 * the branching factor of the d-tree. 1110 * the branching factor of the d-tree.
1071 */ 1111 */
1072 1112
1073/* 1113/*
… …
1273 uint64_t counter = 1; 1313 uint64_t counter = 1;
1274 write (evfd, &counter, sizeof (uint64_t)); 1314 write (evfd, &counter, sizeof (uint64_t));
1275 } 1315 }
1276 else 1316 else
1277#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. */
1278 write (evpipe [1], &dummy, 1); 1323 write (evpipe [1], &dummy, 1);
1279 1324
1280 errno = old_errno; 1325 errno = old_errno;
1281 } 1326 }
1282} 1327}
… …
1296 } 1341 }
1297 else 1342 else
1298#endif 1343#endif
1299 { 1344 {
1300 char dummy; 1345 char dummy;
1346 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1301 read (evpipe [0], &dummy, 1); 1347 read (evpipe [0], &dummy, 1);
1302 } 1348 }
1303 1349
1304 if (sig_pending) 1350 if (sig_pending)
1305 { 1351 {
… …
1447 1493
1448#endif 1494#endif
1449 1495
1450/*****************************************************************************/ 1496/*****************************************************************************/
1451 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1452#if EV_USE_PORT 1501#if EV_USE_PORT
1453# include "ev_port.c" 1502# include "ev_port.c"
1454#endif 1503#endif
1455#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1456# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1529ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1530{ 1579{
1531 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1532 1581
1533 /* 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 */
1534 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1535 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1536 1585
1537 return flags; 1586 return flags;
1538} 1587}
1539 1588
1540unsigned int 1589unsigned int
… …
1653#endif 1702#endif
1654 1703
1655 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1656 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1657 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1658#if EV_USE_PORT 1710#if EV_USE_PORT
1659 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1660#endif 1712#endif
1661#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1662 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1714#endif 1766#endif
1715 1767
1716 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1717 close (backend_fd); 1769 close (backend_fd);
1718 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1719#if EV_USE_PORT 1774#if EV_USE_PORT
1720 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1721#endif 1776#endif
1722#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1723 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1951} 2006}
1952#endif 2007#endif
1953 2008
1954#if EV_MULTIPLICITY 2009#if EV_MULTIPLICITY
1955struct ev_loop * 2010struct ev_loop *
1956ev_default_loop_init (unsigned int flags)
1957#else 2011#else
1958int 2012int
2013#endif
1959ev_default_loop (unsigned int flags) 2014ev_default_loop (unsigned int flags)
1960#endif
1961{ 2015{
1962 if (!ev_default_loop_ptr) 2016 if (!ev_default_loop_ptr)
1963 { 2017 {
1964#if EV_MULTIPLICITY 2018#if EV_MULTIPLICITY
1965 EV_P = ev_default_loop_ptr = &default_loop_struct; 2019 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2171 feed_reverse_done (EV_A_ EV_PERIODIC); 2225 feed_reverse_done (EV_A_ EV_PERIODIC);
2172 } 2226 }
2173} 2227}
2174 2228
2175/* simply recalculate all periodics */ 2229/* simply recalculate all periodics */
2176/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2230/* TODO: maybe ensure that at least one event happens when jumping forward? */
2177static void noinline 2231static void noinline
2178periodics_reschedule (EV_P) 2232periodics_reschedule (EV_P)
2179{ 2233{
2180 int i; 2234 int i;
2181 2235
… …
2277 mn_now = ev_rt_now; 2331 mn_now = ev_rt_now;
2278 } 2332 }
2279} 2333}
2280 2334
2281void 2335void
2282ev_loop (EV_P_ int flags) 2336ev_run (EV_P_ int flags)
2283{ 2337{
2284#if EV_FEATURE_API 2338#if EV_FEATURE_API
2285 ++loop_depth; 2339 ++loop_depth;
2286#endif 2340#endif
2287 2341
2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2342 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2289 2343
2290 loop_done = EVUNLOOP_CANCEL; 2344 loop_done = EVBREAK_CANCEL;
2291 2345
2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2346 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2293 2347
2294 do 2348 do
2295 { 2349 {
… …
2338 /* calculate blocking time */ 2392 /* calculate blocking time */
2339 { 2393 {
2340 ev_tstamp waittime = 0.; 2394 ev_tstamp waittime = 0.;
2341 ev_tstamp sleeptime = 0.; 2395 ev_tstamp sleeptime = 0.;
2342 2396
2397 /* remember old timestamp for io_blocktime calculation */
2398 ev_tstamp prev_mn_now = mn_now;
2399
2400 /* update time to cancel out callback processing overhead */
2401 time_update (EV_A_ 1e100);
2402
2343 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2403 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2344 { 2404 {
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; 2405 waittime = MAX_BLOCKTIME;
2352 2406
2353 if (timercnt) 2407 if (timercnt)
2354 { 2408 {
2355 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2409 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2385 } 2439 }
2386 2440
2387#if EV_FEATURE_API 2441#if EV_FEATURE_API
2388 ++loop_count; 2442 ++loop_count;
2389#endif 2443#endif
2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2444 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2391 backend_poll (EV_A_ waittime); 2445 backend_poll (EV_A_ waittime);
2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2446 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2393 2447
2394 /* update ev_rt_now, do magic */ 2448 /* update ev_rt_now, do magic */
2395 time_update (EV_A_ waittime + sleeptime); 2449 time_update (EV_A_ waittime + sleeptime);
2396 } 2450 }
2397 2451
… …
2415 EV_INVOKE_PENDING; 2469 EV_INVOKE_PENDING;
2416 } 2470 }
2417 while (expect_true ( 2471 while (expect_true (
2418 activecnt 2472 activecnt
2419 && !loop_done 2473 && !loop_done
2420 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2474 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2421 )); 2475 ));
2422 2476
2423 if (loop_done == EVUNLOOP_ONE) 2477 if (loop_done == EVBREAK_ONE)
2424 loop_done = EVUNLOOP_CANCEL; 2478 loop_done = EVBREAK_CANCEL;
2425 2479
2426#if EV_FEATURE_API 2480#if EV_FEATURE_API
2427 --loop_depth; 2481 --loop_depth;
2428#endif 2482#endif
2429} 2483}
2430 2484
2431void 2485void
2432ev_unloop (EV_P_ int how) 2486ev_break (EV_P_ int how)
2433{ 2487{
2434 loop_done = how; 2488 loop_done = how;
2435} 2489}
2436 2490
2437void 2491void
… …
2585 EV_FREQUENT_CHECK; 2639 EV_FREQUENT_CHECK;
2586 2640
2587 wlist_del (&anfds[w->fd].head, (WL)w); 2641 wlist_del (&anfds[w->fd].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2642 ev_stop (EV_A_ (W)w);
2589 2643
2590 fd_change (EV_A_ w->fd, 1); 2644 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2591 2645
2592 EV_FREQUENT_CHECK; 2646 EV_FREQUENT_CHECK;
2593} 2647}
2594 2648
2595void noinline 2649void noinline
… …
3047 { 3101 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3102 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3049 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3103 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len; 3104 ofs += sizeof (struct inotify_event) + ev->len;
3051 } 3105 }
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} 3106}
3085 3107
3086inline_size void 3108inline_size void
3087ev_check_2625 (EV_P) 3109ev_check_2625 (EV_P)
3088{ 3110{
… …
3412 3434
3413#if EV_EMBED_ENABLE 3435#if EV_EMBED_ENABLE
3414void noinline 3436void noinline
3415ev_embed_sweep (EV_P_ ev_embed *w) 3437ev_embed_sweep (EV_P_ ev_embed *w)
3416{ 3438{
3417 ev_loop (w->other, EVLOOP_NONBLOCK); 3439 ev_run (w->other, EVRUN_NOWAIT);
3418} 3440}
3419 3441
3420static void 3442static void
3421embed_io_cb (EV_P_ ev_io *io, int revents) 3443embed_io_cb (EV_P_ ev_io *io, int revents)
3422{ 3444{
3423 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3445 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3424 3446
3425 if (ev_cb (w)) 3447 if (ev_cb (w))
3426 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3448 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3427 else 3449 else
3428 ev_loop (w->other, EVLOOP_NONBLOCK); 3450 ev_run (w->other, EVRUN_NOWAIT);
3429} 3451}
3430 3452
3431static void 3453static void
3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3454embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3433{ 3455{
… …
3437 EV_P = w->other; 3459 EV_P = w->other;
3438 3460
3439 while (fdchangecnt) 3461 while (fdchangecnt)
3440 { 3462 {
3441 fd_reify (EV_A); 3463 fd_reify (EV_A);
3442 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3464 ev_run (EV_A_ EVRUN_NOWAIT);
3443 } 3465 }
3444 } 3466 }
3445} 3467}
3446 3468
3447static void 3469static void
… …
3453 3475
3454 { 3476 {
3455 EV_P = w->other; 3477 EV_P = w->other;
3456 3478
3457 ev_loop_fork (EV_A); 3479 ev_loop_fork (EV_A);
3458 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3480 ev_run (EV_A_ EVRUN_NOWAIT);
3459 } 3481 }
3460 3482
3461 ev_embed_start (EV_A_ w); 3483 ev_embed_start (EV_A_ w);
3462} 3484}
3463 3485
… …
3561void 3583void
3562ev_async_start (EV_P_ ev_async *w) 3584ev_async_start (EV_P_ ev_async *w)
3563{ 3585{
3564 if (expect_false (ev_is_active (w))) 3586 if (expect_false (ev_is_active (w)))
3565 return; 3587 return;
3588
3589 w->sent = 0;
3566 3590
3567 evpipe_init (EV_A); 3591 evpipe_init (EV_A);
3568 3592
3569 EV_FREQUENT_CHECK; 3593 EV_FREQUENT_CHECK;
3570 3594
… …
3790 3814
3791#if EV_MULTIPLICITY 3815#if EV_MULTIPLICITY
3792 #include "ev_wrap.h" 3816 #include "ev_wrap.h"
3793#endif 3817#endif
3794 3818
3795#ifdef __cplusplus 3819EV_CPP(})
3796}
3797#endif
3798 3820

Diff Legend

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