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

Comparing libev/ev.c (file contents):
Revision 1.347 by root, Fri Oct 15 22:44:41 2010 UTC vs.
Revision 1.364 by root, Sun Oct 24 21:51:03 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
… …
470 455
471#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) */
472#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) */
473 458
474#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
475#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; tv.tv_nsec = (long)((t - tv.tv_sec) * 1e9); } 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)
476 461
477#if __GNUC__ >= 4 462#if __GNUC__ >= 4
478# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
479# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
480#else 465#else
… …
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
… …
771 if (delay > 0.) 801 if (delay > 0.)
772 { 802 {
773#if EV_USE_NANOSLEEP 803#if EV_USE_NANOSLEEP
774 struct timespec ts; 804 struct timespec ts;
775 805
776 EV_SET_TS (ts, delay); 806 EV_TS_SET (ts, delay);
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 /* 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_SET_TV (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_MULTIPLICITY
1742 /* mimic free (0) */
1743 if (!EV_A)
1744 return;
1745#endif
1746
1747#if EV_CLEANUP_ENABLE
1748 /* queue cleanup watchers (and execute them) */
1749 if (expect_false (cleanupcnt))
1750 {
1751 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1752 EV_INVOKE_PENDING;
1753 }
1754#endif
1755
1756#if EV_CHILD_ENABLE
1757 if (ev_is_active (&childev))
1758 {
1759 ev_ref (EV_A); /* child watcher */
1760 ev_signal_stop (EV_A_ &childev);
1761 }
1762#endif
1700 1763
1701 if (ev_is_active (&pipe_w)) 1764 if (ev_is_active (&pipe_w))
1702 { 1765 {
1703 /*ev_ref (EV_A);*/ 1766 /*ev_ref (EV_A);*/
1704 /*ev_io_stop (EV_A_ &pipe_w);*/ 1767 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1726#endif 1789#endif
1727 1790
1728 if (backend_fd >= 0) 1791 if (backend_fd >= 0)
1729 close (backend_fd); 1792 close (backend_fd);
1730 1793
1794#if EV_USE_IOCP
1795 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1796#endif
1731#if EV_USE_PORT 1797#if EV_USE_PORT
1732 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1798 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1733#endif 1799#endif
1734#if EV_USE_KQUEUE 1800#if EV_USE_KQUEUE
1735 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1801 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1762 array_free (periodic, EMPTY); 1828 array_free (periodic, EMPTY);
1763#endif 1829#endif
1764#if EV_FORK_ENABLE 1830#if EV_FORK_ENABLE
1765 array_free (fork, EMPTY); 1831 array_free (fork, EMPTY);
1766#endif 1832#endif
1833#if EV_CLEANUP_ENABLE
1834 array_free (cleanup, EMPTY);
1835#endif
1767 array_free (prepare, EMPTY); 1836 array_free (prepare, EMPTY);
1768 array_free (check, EMPTY); 1837 array_free (check, EMPTY);
1769#if EV_ASYNC_ENABLE 1838#if EV_ASYNC_ENABLE
1770 array_free (async, EMPTY); 1839 array_free (async, EMPTY);
1771#endif 1840#endif
1772 1841
1773 backend = 0; 1842 backend = 0;
1843
1844#if EV_MULTIPLICITY
1845 if (ev_is_default_loop (EV_A))
1846#endif
1847 ev_default_loop_ptr = 0;
1848#if EV_MULTIPLICITY
1849 else
1850 ev_free (EV_A);
1851#endif
1774} 1852}
1775 1853
1776#if EV_USE_INOTIFY 1854#if EV_USE_INOTIFY
1777inline_size void infy_fork (EV_P); 1855inline_size void infy_fork (EV_P);
1778#endif 1856#endif
… …
1837 loop_init (EV_A_ flags); 1915 loop_init (EV_A_ flags);
1838 1916
1839 if (ev_backend (EV_A)) 1917 if (ev_backend (EV_A))
1840 return EV_A; 1918 return EV_A;
1841 1919
1920 ev_free (EV_A);
1842 return 0; 1921 return 0;
1843} 1922}
1844 1923
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 */ 1924#endif /* multiplicity */
1858 1925
1859#if EV_VERIFY 1926#if EV_VERIFY
1860static void noinline 1927static void noinline
1861verify_watcher (EV_P_ W w) 1928verify_watcher (EV_P_ W w)
… …
1936#if EV_FORK_ENABLE 2003#if EV_FORK_ENABLE
1937 assert (forkmax >= forkcnt); 2004 assert (forkmax >= forkcnt);
1938 array_verify (EV_A_ (W *)forks, forkcnt); 2005 array_verify (EV_A_ (W *)forks, forkcnt);
1939#endif 2006#endif
1940 2007
2008#if EV_CLEANUP_ENABLE
2009 assert (cleanupmax >= cleanupcnt);
2010 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2011#endif
2012
1941#if EV_ASYNC_ENABLE 2013#if EV_ASYNC_ENABLE
1942 assert (asyncmax >= asynccnt); 2014 assert (asyncmax >= asynccnt);
1943 array_verify (EV_A_ (W *)asyncs, asynccnt); 2015 array_verify (EV_A_ (W *)asyncs, asynccnt);
1944#endif 2016#endif
1945 2017
… …
1963} 2035}
1964#endif 2036#endif
1965 2037
1966#if EV_MULTIPLICITY 2038#if EV_MULTIPLICITY
1967struct ev_loop * 2039struct ev_loop *
1968ev_default_loop_init (unsigned int flags)
1969#else 2040#else
1970int 2041int
2042#endif
1971ev_default_loop (unsigned int flags) 2043ev_default_loop (unsigned int flags)
1972#endif
1973{ 2044{
1974 if (!ev_default_loop_ptr) 2045 if (!ev_default_loop_ptr)
1975 { 2046 {
1976#if EV_MULTIPLICITY 2047#if EV_MULTIPLICITY
1977 EV_P = ev_default_loop_ptr = &default_loop_struct; 2048 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1996 2067
1997 return ev_default_loop_ptr; 2068 return ev_default_loop_ptr;
1998} 2069}
1999 2070
2000void 2071void
2001ev_default_destroy (void) 2072ev_loop_fork (EV_P)
2002{ 2073{
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 */ 2074 postfork = 1; /* must be in line with ev_default_fork */
2025} 2075}
2026 2076
2027/*****************************************************************************/ 2077/*****************************************************************************/
2028 2078
2029void 2079void
… …
2289 mn_now = ev_rt_now; 2339 mn_now = ev_rt_now;
2290 } 2340 }
2291} 2341}
2292 2342
2293void 2343void
2294ev_loop (EV_P_ int flags) 2344ev_run (EV_P_ int flags)
2295{ 2345{
2296#if EV_FEATURE_API 2346#if EV_FEATURE_API
2297 ++loop_depth; 2347 ++loop_depth;
2298#endif 2348#endif
2299 2349
2300 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2350 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2301 2351
2302 loop_done = EVUNLOOP_CANCEL; 2352 loop_done = EVBREAK_CANCEL;
2303 2353
2304 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2354 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2305 2355
2306 do 2356 do
2307 { 2357 {
… …
2350 /* calculate blocking time */ 2400 /* calculate blocking time */
2351 { 2401 {
2352 ev_tstamp waittime = 0.; 2402 ev_tstamp waittime = 0.;
2353 ev_tstamp sleeptime = 0.; 2403 ev_tstamp sleeptime = 0.;
2354 2404
2405 /* remember old timestamp for io_blocktime calculation */
2406 ev_tstamp prev_mn_now = mn_now;
2407
2408 /* update time to cancel out callback processing overhead */
2409 time_update (EV_A_ 1e100);
2410
2355 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2411 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2356 { 2412 {
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; 2413 waittime = MAX_BLOCKTIME;
2364 2414
2365 if (timercnt) 2415 if (timercnt)
2366 { 2416 {
2367 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2417 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2397 } 2447 }
2398 2448
2399#if EV_FEATURE_API 2449#if EV_FEATURE_API
2400 ++loop_count; 2450 ++loop_count;
2401#endif 2451#endif
2402 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2452 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2403 backend_poll (EV_A_ waittime); 2453 backend_poll (EV_A_ waittime);
2404 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2454 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2405 2455
2406 /* update ev_rt_now, do magic */ 2456 /* update ev_rt_now, do magic */
2407 time_update (EV_A_ waittime + sleeptime); 2457 time_update (EV_A_ waittime + sleeptime);
2408 } 2458 }
2409 2459
… …
2427 EV_INVOKE_PENDING; 2477 EV_INVOKE_PENDING;
2428 } 2478 }
2429 while (expect_true ( 2479 while (expect_true (
2430 activecnt 2480 activecnt
2431 && !loop_done 2481 && !loop_done
2432 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2482 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2433 )); 2483 ));
2434 2484
2435 if (loop_done == EVUNLOOP_ONE) 2485 if (loop_done == EVBREAK_ONE)
2436 loop_done = EVUNLOOP_CANCEL; 2486 loop_done = EVBREAK_CANCEL;
2437 2487
2438#if EV_FEATURE_API 2488#if EV_FEATURE_API
2439 --loop_depth; 2489 --loop_depth;
2440#endif 2490#endif
2441} 2491}
2442 2492
2443void 2493void
2444ev_unloop (EV_P_ int how) 2494ev_break (EV_P_ int how)
2445{ 2495{
2446 loop_done = how; 2496 loop_done = how;
2447} 2497}
2448 2498
2449void 2499void
… …
2597 EV_FREQUENT_CHECK; 2647 EV_FREQUENT_CHECK;
2598 2648
2599 wlist_del (&anfds[w->fd].head, (WL)w); 2649 wlist_del (&anfds[w->fd].head, (WL)w);
2600 ev_stop (EV_A_ (W)w); 2650 ev_stop (EV_A_ (W)w);
2601 2651
2602 fd_change (EV_A_ w->fd, 1); 2652 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2603 2653
2604 EV_FREQUENT_CHECK; 2654 EV_FREQUENT_CHECK;
2605} 2655}
2606 2656
2607void noinline 2657void noinline
… …
3059 { 3109 {
3060 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3110 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3061 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3111 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3062 ofs += sizeof (struct inotify_event) + ev->len; 3112 ofs += sizeof (struct inotify_event) + ev->len;
3063 } 3113 }
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} 3114}
3097 3115
3098inline_size void 3116inline_size void
3099ev_check_2625 (EV_P) 3117ev_check_2625 (EV_P)
3100{ 3118{
… …
3424 3442
3425#if EV_EMBED_ENABLE 3443#if EV_EMBED_ENABLE
3426void noinline 3444void noinline
3427ev_embed_sweep (EV_P_ ev_embed *w) 3445ev_embed_sweep (EV_P_ ev_embed *w)
3428{ 3446{
3429 ev_loop (w->other, EVLOOP_NONBLOCK); 3447 ev_run (w->other, EVRUN_NOWAIT);
3430} 3448}
3431 3449
3432static void 3450static void
3433embed_io_cb (EV_P_ ev_io *io, int revents) 3451embed_io_cb (EV_P_ ev_io *io, int revents)
3434{ 3452{
3435 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3453 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3436 3454
3437 if (ev_cb (w)) 3455 if (ev_cb (w))
3438 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3456 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3439 else 3457 else
3440 ev_loop (w->other, EVLOOP_NONBLOCK); 3458 ev_run (w->other, EVRUN_NOWAIT);
3441} 3459}
3442 3460
3443static void 3461static void
3444embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3462embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3445{ 3463{
… …
3449 EV_P = w->other; 3467 EV_P = w->other;
3450 3468
3451 while (fdchangecnt) 3469 while (fdchangecnt)
3452 { 3470 {
3453 fd_reify (EV_A); 3471 fd_reify (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3472 ev_run (EV_A_ EVRUN_NOWAIT);
3455 } 3473 }
3456 } 3474 }
3457} 3475}
3458 3476
3459static void 3477static void
… …
3465 3483
3466 { 3484 {
3467 EV_P = w->other; 3485 EV_P = w->other;
3468 3486
3469 ev_loop_fork (EV_A); 3487 ev_loop_fork (EV_A);
3470 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3488 ev_run (EV_A_ EVRUN_NOWAIT);
3471 } 3489 }
3472 3490
3473 ev_embed_start (EV_A_ w); 3491 ev_embed_start (EV_A_ w);
3474} 3492}
3475 3493
… …
3567 3585
3568 EV_FREQUENT_CHECK; 3586 EV_FREQUENT_CHECK;
3569} 3587}
3570#endif 3588#endif
3571 3589
3572#if EV_ASYNC_ENABLE 3590#if EV_CLEANUP_ENABLE
3573void 3591void
3574ev_async_start (EV_P_ ev_async *w) 3592ev_cleanup_start (EV_P_ ev_cleanup *w)
3575{ 3593{
3576 if (expect_false (ev_is_active (w))) 3594 if (expect_false (ev_is_active (w)))
3577 return; 3595 return;
3596
3597 EV_FREQUENT_CHECK;
3598
3599 ev_start (EV_A_ (W)w, ++cleanupcnt);
3600 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3601 cleanups [cleanupcnt - 1] = w;
3602
3603 /* cleanup watchers should never keep a refcount on the loop */
3604 ev_unref (EV_A);
3605 EV_FREQUENT_CHECK;
3606}
3607
3608void
3609ev_cleanup_stop (EV_P_ ev_cleanup *w)
3610{
3611 clear_pending (EV_A_ (W)w);
3612 if (expect_false (!ev_is_active (w)))
3613 return;
3614
3615 EV_FREQUENT_CHECK;
3616 ev_ref (EV_A);
3617
3618 {
3619 int active = ev_active (w);
3620
3621 cleanups [active - 1] = cleanups [--cleanupcnt];
3622 ev_active (cleanups [active - 1]) = active;
3623 }
3624
3625 ev_stop (EV_A_ (W)w);
3626
3627 EV_FREQUENT_CHECK;
3628}
3629#endif
3630
3631#if EV_ASYNC_ENABLE
3632void
3633ev_async_start (EV_P_ ev_async *w)
3634{
3635 if (expect_false (ev_is_active (w)))
3636 return;
3637
3638 w->sent = 0;
3578 3639
3579 evpipe_init (EV_A); 3640 evpipe_init (EV_A);
3580 3641
3581 EV_FREQUENT_CHECK; 3642 EV_FREQUENT_CHECK;
3582 3643
… …
3802 3863
3803#if EV_MULTIPLICITY 3864#if EV_MULTIPLICITY
3804 #include "ev_wrap.h" 3865 #include "ev_wrap.h"
3805#endif 3866#endif
3806 3867
3807#ifdef __cplusplus 3868EV_CPP(})
3808}
3809#endif
3810 3869

Diff Legend

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