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

Comparing libev/ev.c (file contents):
Revision 1.346 by root, Thu Oct 14 05:07:04 2010 UTC vs.
Revision 1.360 by root, Sun Oct 24 18:12: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 436#endif
451#endif
452
453 437
454/**/ 438/**/
455 439
456#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
457# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
471 455
472#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) */
473#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) */
474 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
475#if __GNUC__ >= 4 462#if __GNUC__ >= 4
476# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
477# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
478#else 465#else
479# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
535# include "ev_win32.c" 522# include "ev_win32.c"
536#endif 523#endif
537 524
538/*****************************************************************************/ 525/*****************************************************************************/
539 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
540#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
541static void noinline 570static void noinline
542ev_printerr (const char *msg) 571ev_printerr (const char *msg)
543{ 572{
544 write (STDERR_FILENO, msg, strlen (msg)); 573 write (STDERR_FILENO, msg, strlen (msg));
… …
639 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 */
640 unsigned char unused; 669 unsigned char unused;
641#if EV_USE_EPOLL 670#if EV_USE_EPOLL
642 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
643#endif 672#endif
644#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
645 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
646#endif 678#endif
647} ANFD; 679} ANFD;
648 680
649/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
650typedef struct 682typedef struct
… …
715# define EV_RELEASE_CB (void)0 747# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0 748# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 749# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif 750#endif
719 751
720#define EVUNLOOP_RECURSE 0x80 752#define EVBREAK_RECURSE 0x80
721 753
722/*****************************************************************************/ 754/*****************************************************************************/
723 755
724#ifndef EV_HAVE_EV_TIME 756#ifndef EV_HAVE_EV_TIME
725ev_tstamp 757ev_tstamp
… …
769 if (delay > 0.) 801 if (delay > 0.)
770 { 802 {
771#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
772 struct timespec ts; 804 struct timespec ts;
773 805
774 ts.tv_sec = (time_t)delay; 806 EV_TS_SET (ts, delay);
775 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
776
777 nanosleep (&ts, 0); 807 nanosleep (&ts, 0);
778#elif defined(_WIN32) 808#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 809 Sleep ((unsigned long)(delay * 1e3));
780#else 810#else
781 struct timeval tv; 811 struct timeval tv;
782 812
783 tv.tv_sec = (time_t)delay;
784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
785
786 /* 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 */
787 /* something not guaranteed by newer posix versions, but guaranteed */ 814 /* something not guaranteed by newer posix versions, but guaranteed */
788 /* by older ones */ 815 /* by older ones */
816 EV_TV_SET (tv, delay);
789 select (0, 0, 0, 0, &tv); 817 select (0, 0, 0, 0, &tv);
790#endif 818#endif
791 } 819 }
792} 820}
793 821
… …
945 { 973 {
946 int fd = fdchanges [i]; 974 int fd = fdchanges [i];
947 ANFD *anfd = anfds + fd; 975 ANFD *anfd = anfds + fd;
948 ev_io *w; 976 ev_io *w;
949 977
950 unsigned char events = 0; 978 unsigned char o_events = anfd->events;
979 unsigned char o_reify = anfd->reify;
951 980
952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 981 anfd->reify = 0;
953 events |= (unsigned char)w->events;
954 982
955#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
956 if (events) 984 if (o_reify & EV__IOFDSET)
957 { 985 {
958 unsigned long arg; 986 unsigned long arg;
959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
960 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
961 } 990 }
962#endif 991#endif
963 992
993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
964 { 994 {
965 unsigned char o_events = anfd->events;
966 unsigned char o_reify = anfd->reify;
967
968 anfd->reify = 0;
969 anfd->events = events; 995 anfd->events = 0;
970 996
971 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)
972 backend_modify (EV_A_ fd, o_events, events); 1005 backend_modify (EV_A_ fd, o_events, anfd->events);
973 }
974 } 1006 }
975 1007
976 fdchangecnt = 0; 1008 fdchangecnt = 0;
977} 1009}
978 1010
… …
1461 1493
1462#endif 1494#endif
1463 1495
1464/*****************************************************************************/ 1496/*****************************************************************************/
1465 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1466#if EV_USE_PORT 1501#if EV_USE_PORT
1467# include "ev_port.c" 1502# include "ev_port.c"
1468#endif 1503#endif
1469#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1470# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1543ev_embeddable_backends (void) 1578ev_embeddable_backends (void)
1544{ 1579{
1545 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1580 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1546 1581
1547 /* 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 */
1548 /* please fix it and tell me how to detect the fix */ 1583 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1549 flags &= ~EVBACKEND_EPOLL; 1584 flags &= ~EVBACKEND_EPOLL;
1550 1585
1551 return flags; 1586 return flags;
1552} 1587}
1553 1588
1554unsigned int 1589unsigned int
… …
1667#endif 1702#endif
1668 1703
1669 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1670 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1671 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1672#if EV_USE_PORT 1710#if EV_USE_PORT
1673 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1674#endif 1712#endif
1675#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1676 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1693#endif 1731#endif
1694 } 1732 }
1695} 1733}
1696 1734
1697/* free up a loop structure */ 1735/* free up a loop structure */
1698static void noinline 1736void
1699loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1700{ 1738{
1701 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
1702 1748
1703 if (ev_is_active (&pipe_w)) 1749 if (ev_is_active (&pipe_w))
1704 { 1750 {
1705 /*ev_ref (EV_A);*/ 1751 /*ev_ref (EV_A);*/
1706 /*ev_io_stop (EV_A_ &pipe_w);*/ 1752 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1728#endif 1774#endif
1729 1775
1730 if (backend_fd >= 0) 1776 if (backend_fd >= 0)
1731 close (backend_fd); 1777 close (backend_fd);
1732 1778
1779#if EV_USE_IOCP
1780 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1781#endif
1733#if EV_USE_PORT 1782#if EV_USE_PORT
1734 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1783 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1735#endif 1784#endif
1736#if EV_USE_KQUEUE 1785#if EV_USE_KQUEUE
1737 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1786 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1764 array_free (periodic, EMPTY); 1813 array_free (periodic, EMPTY);
1765#endif 1814#endif
1766#if EV_FORK_ENABLE 1815#if EV_FORK_ENABLE
1767 array_free (fork, EMPTY); 1816 array_free (fork, EMPTY);
1768#endif 1817#endif
1818#if EV_CLEANUP_ENABLE
1819 array_free (cleanup, EMPTY);
1820#endif
1769 array_free (prepare, EMPTY); 1821 array_free (prepare, EMPTY);
1770 array_free (check, EMPTY); 1822 array_free (check, EMPTY);
1771#if EV_ASYNC_ENABLE 1823#if EV_ASYNC_ENABLE
1772 array_free (async, EMPTY); 1824 array_free (async, EMPTY);
1773#endif 1825#endif
1774 1826
1775 backend = 0; 1827 backend = 0;
1828
1829#if EV_MULTIPLICITY
1830 if (ev_is_default_loop (EV_A))
1831#endif
1832 ev_default_loop_ptr = 0;
1833#if EV_MULTIPLICITY
1834 else
1835 ev_free (EV_A);
1836#endif
1776} 1837}
1777 1838
1778#if EV_USE_INOTIFY 1839#if EV_USE_INOTIFY
1779inline_size void infy_fork (EV_P); 1840inline_size void infy_fork (EV_P);
1780#endif 1841#endif
… …
1839 loop_init (EV_A_ flags); 1900 loop_init (EV_A_ flags);
1840 1901
1841 if (ev_backend (EV_A)) 1902 if (ev_backend (EV_A))
1842 return EV_A; 1903 return EV_A;
1843 1904
1905 ev_free (EV_A);
1844 return 0; 1906 return 0;
1845} 1907}
1846 1908
1847void
1848ev_loop_destroy (EV_P)
1849{
1850 loop_destroy (EV_A);
1851 ev_free (loop);
1852}
1853
1854void
1855ev_loop_fork (EV_P)
1856{
1857 postfork = 1; /* must be in line with ev_default_fork */
1858}
1859#endif /* multiplicity */ 1909#endif /* multiplicity */
1860 1910
1861#if EV_VERIFY 1911#if EV_VERIFY
1862static void noinline 1912static void noinline
1863verify_watcher (EV_P_ W w) 1913verify_watcher (EV_P_ W w)
… …
1938#if EV_FORK_ENABLE 1988#if EV_FORK_ENABLE
1939 assert (forkmax >= forkcnt); 1989 assert (forkmax >= forkcnt);
1940 array_verify (EV_A_ (W *)forks, forkcnt); 1990 array_verify (EV_A_ (W *)forks, forkcnt);
1941#endif 1991#endif
1942 1992
1993#if EV_CLEANUP_ENABLE
1994 assert (cleanupmax >= cleanupcnt);
1995 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
1996#endif
1997
1943#if EV_ASYNC_ENABLE 1998#if EV_ASYNC_ENABLE
1944 assert (asyncmax >= asynccnt); 1999 assert (asyncmax >= asynccnt);
1945 array_verify (EV_A_ (W *)asyncs, asynccnt); 2000 array_verify (EV_A_ (W *)asyncs, asynccnt);
1946#endif 2001#endif
1947 2002
… …
1965} 2020}
1966#endif 2021#endif
1967 2022
1968#if EV_MULTIPLICITY 2023#if EV_MULTIPLICITY
1969struct ev_loop * 2024struct ev_loop *
1970ev_default_loop_init (unsigned int flags)
1971#else 2025#else
1972int 2026int
2027#endif
1973ev_default_loop (unsigned int flags) 2028ev_default_loop (unsigned int flags)
1974#endif
1975{ 2029{
1976 if (!ev_default_loop_ptr) 2030 if (!ev_default_loop_ptr)
1977 { 2031 {
1978#if EV_MULTIPLICITY 2032#if EV_MULTIPLICITY
1979 EV_P = ev_default_loop_ptr = &default_loop_struct; 2033 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1998 2052
1999 return ev_default_loop_ptr; 2053 return ev_default_loop_ptr;
2000} 2054}
2001 2055
2002void 2056void
2003ev_default_destroy (void) 2057ev_loop_fork (EV_P)
2004{ 2058{
2005#if EV_MULTIPLICITY
2006 EV_P = ev_default_loop_ptr;
2007#endif
2008
2009 ev_default_loop_ptr = 0;
2010
2011#if EV_CHILD_ENABLE
2012 ev_ref (EV_A); /* child watcher */
2013 ev_signal_stop (EV_A_ &childev);
2014#endif
2015
2016 loop_destroy (EV_A);
2017}
2018
2019void
2020ev_default_fork (void)
2021{
2022#if EV_MULTIPLICITY
2023 EV_P = ev_default_loop_ptr;
2024#endif
2025
2026 postfork = 1; /* must be in line with ev_loop_fork */ 2059 postfork = 1; /* must be in line with ev_default_fork */
2027} 2060}
2028 2061
2029/*****************************************************************************/ 2062/*****************************************************************************/
2030 2063
2031void 2064void
… …
2291 mn_now = ev_rt_now; 2324 mn_now = ev_rt_now;
2292 } 2325 }
2293} 2326}
2294 2327
2295void 2328void
2296ev_loop (EV_P_ int flags) 2329ev_run (EV_P_ int flags)
2297{ 2330{
2298#if EV_FEATURE_API 2331#if EV_FEATURE_API
2299 ++loop_depth; 2332 ++loop_depth;
2300#endif 2333#endif
2301 2334
2302 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2335 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2303 2336
2304 loop_done = EVUNLOOP_CANCEL; 2337 loop_done = EVBREAK_CANCEL;
2305 2338
2306 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2339 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2307 2340
2308 do 2341 do
2309 { 2342 {
… …
2352 /* calculate blocking time */ 2385 /* calculate blocking time */
2353 { 2386 {
2354 ev_tstamp waittime = 0.; 2387 ev_tstamp waittime = 0.;
2355 ev_tstamp sleeptime = 0.; 2388 ev_tstamp sleeptime = 0.;
2356 2389
2390 /* remember old timestamp for io_blocktime calculation */
2391 ev_tstamp prev_mn_now = mn_now;
2392
2393 /* update time to cancel out callback processing overhead */
2394 time_update (EV_A_ 1e100);
2395
2357 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2396 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2358 { 2397 {
2359 /* remember old timestamp for io_blocktime calculation */
2360 ev_tstamp prev_mn_now = mn_now;
2361
2362 /* update time to cancel out callback processing overhead */
2363 time_update (EV_A_ 1e100);
2364
2365 waittime = MAX_BLOCKTIME; 2398 waittime = MAX_BLOCKTIME;
2366 2399
2367 if (timercnt) 2400 if (timercnt)
2368 { 2401 {
2369 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2402 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2399 } 2432 }
2400 2433
2401#if EV_FEATURE_API 2434#if EV_FEATURE_API
2402 ++loop_count; 2435 ++loop_count;
2403#endif 2436#endif
2404 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2437 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2405 backend_poll (EV_A_ waittime); 2438 backend_poll (EV_A_ waittime);
2406 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2439 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2407 2440
2408 /* update ev_rt_now, do magic */ 2441 /* update ev_rt_now, do magic */
2409 time_update (EV_A_ waittime + sleeptime); 2442 time_update (EV_A_ waittime + sleeptime);
2410 } 2443 }
2411 2444
… …
2429 EV_INVOKE_PENDING; 2462 EV_INVOKE_PENDING;
2430 } 2463 }
2431 while (expect_true ( 2464 while (expect_true (
2432 activecnt 2465 activecnt
2433 && !loop_done 2466 && !loop_done
2434 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2467 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2435 )); 2468 ));
2436 2469
2437 if (loop_done == EVUNLOOP_ONE) 2470 if (loop_done == EVBREAK_ONE)
2438 loop_done = EVUNLOOP_CANCEL; 2471 loop_done = EVBREAK_CANCEL;
2439 2472
2440#if EV_FEATURE_API 2473#if EV_FEATURE_API
2441 --loop_depth; 2474 --loop_depth;
2442#endif 2475#endif
2443} 2476}
2444 2477
2445void 2478void
2446ev_unloop (EV_P_ int how) 2479ev_break (EV_P_ int how)
2447{ 2480{
2448 loop_done = how; 2481 loop_done = how;
2449} 2482}
2450 2483
2451void 2484void
… …
2599 EV_FREQUENT_CHECK; 2632 EV_FREQUENT_CHECK;
2600 2633
2601 wlist_del (&anfds[w->fd].head, (WL)w); 2634 wlist_del (&anfds[w->fd].head, (WL)w);
2602 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2603 2636
2604 fd_change (EV_A_ w->fd, 1); 2637 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2605 2638
2606 EV_FREQUENT_CHECK; 2639 EV_FREQUENT_CHECK;
2607} 2640}
2608 2641
2609void noinline 2642void noinline
… …
3061 { 3094 {
3062 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3095 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3063 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3096 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3064 ofs += sizeof (struct inotify_event) + ev->len; 3097 ofs += sizeof (struct inotify_event) + ev->len;
3065 } 3098 }
3066}
3067
3068inline_size unsigned int
3069ev_linux_version (void)
3070{
3071 struct utsname buf;
3072 unsigned int v;
3073 int i;
3074 char *p = buf.release;
3075
3076 if (uname (&buf))
3077 return 0;
3078
3079 for (i = 3+1; --i; )
3080 {
3081 unsigned int c = 0;
3082
3083 for (;;)
3084 {
3085 if (*p >= '0' && *p <= '9')
3086 c = c * 10 + *p++ - '0';
3087 else
3088 {
3089 p += *p == '.';
3090 break;
3091 }
3092 }
3093
3094 v = (v << 8) | c;
3095 }
3096
3097 return v;
3098} 3099}
3099 3100
3100inline_size void 3101inline_size void
3101ev_check_2625 (EV_P) 3102ev_check_2625 (EV_P)
3102{ 3103{
… …
3426 3427
3427#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
3428void noinline 3429void noinline
3429ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
3430{ 3431{
3431 ev_loop (w->other, EVLOOP_NONBLOCK); 3432 ev_run (w->other, EVRUN_NOWAIT);
3432} 3433}
3433 3434
3434static void 3435static void
3435embed_io_cb (EV_P_ ev_io *io, int revents) 3436embed_io_cb (EV_P_ ev_io *io, int revents)
3436{ 3437{
3437 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3438 3439
3439 if (ev_cb (w)) 3440 if (ev_cb (w))
3440 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3441 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3441 else 3442 else
3442 ev_loop (w->other, EVLOOP_NONBLOCK); 3443 ev_run (w->other, EVRUN_NOWAIT);
3443} 3444}
3444 3445
3445static void 3446static void
3446embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3447{ 3448{
… …
3451 EV_P = w->other; 3452 EV_P = w->other;
3452 3453
3453 while (fdchangecnt) 3454 while (fdchangecnt)
3454 { 3455 {
3455 fd_reify (EV_A); 3456 fd_reify (EV_A);
3456 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3457 ev_run (EV_A_ EVRUN_NOWAIT);
3457 } 3458 }
3458 } 3459 }
3459} 3460}
3460 3461
3461static void 3462static void
… …
3467 3468
3468 { 3469 {
3469 EV_P = w->other; 3470 EV_P = w->other;
3470 3471
3471 ev_loop_fork (EV_A); 3472 ev_loop_fork (EV_A);
3472 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3473 ev_run (EV_A_ EVRUN_NOWAIT);
3473 } 3474 }
3474 3475
3475 ev_embed_start (EV_A_ w); 3476 ev_embed_start (EV_A_ w);
3476} 3477}
3477 3478
… …
3569 3570
3570 EV_FREQUENT_CHECK; 3571 EV_FREQUENT_CHECK;
3571} 3572}
3572#endif 3573#endif
3573 3574
3574#if EV_ASYNC_ENABLE 3575#if EV_CLEANUP_ENABLE
3575void 3576void
3576ev_async_start (EV_P_ ev_async *w) 3577ev_cleanup_start (EV_P_ ev_cleanup *w)
3577{ 3578{
3578 if (expect_false (ev_is_active (w))) 3579 if (expect_false (ev_is_active (w)))
3579 return; 3580 return;
3581
3582 EV_FREQUENT_CHECK;
3583
3584 ev_start (EV_A_ (W)w, ++cleanupcnt);
3585 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3586 cleanups [cleanupcnt - 1] = w;
3587
3588 EV_FREQUENT_CHECK;
3589}
3590
3591void
3592ev_cleanup_stop (EV_P_ ev_cleanup *w)
3593{
3594 clear_pending (EV_A_ (W)w);
3595 if (expect_false (!ev_is_active (w)))
3596 return;
3597
3598 EV_FREQUENT_CHECK;
3599
3600 {
3601 int active = ev_active (w);
3602
3603 cleanups [active - 1] = cleanups [--cleanupcnt];
3604 ev_active (cleanups [active - 1]) = active;
3605 }
3606
3607 ev_stop (EV_A_ (W)w);
3608
3609 EV_FREQUENT_CHECK;
3610}
3611#endif
3612
3613#if EV_ASYNC_ENABLE
3614void
3615ev_async_start (EV_P_ ev_async *w)
3616{
3617 if (expect_false (ev_is_active (w)))
3618 return;
3619
3620 w->sent = 0;
3580 3621
3581 evpipe_init (EV_A); 3622 evpipe_init (EV_A);
3582 3623
3583 EV_FREQUENT_CHECK; 3624 EV_FREQUENT_CHECK;
3584 3625
… …
3804 3845
3805#if EV_MULTIPLICITY 3846#if EV_MULTIPLICITY
3806 #include "ev_wrap.h" 3847 #include "ev_wrap.h"
3807#endif 3848#endif
3808 3849
3809#ifdef __cplusplus 3850EV_CPP(})
3810}
3811#endif
3812 3851

Diff Legend

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