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

Comparing libev/ev.c (file contents):
Revision 1.348 by root, Fri Oct 15 22:48:25 2010 UTC vs.
Revision 1.365 by root, Sun Oct 31 22:01:20 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
182# include EV_H 178# include EV_H
183#else 179#else
184# include "ev.h" 180# include "ev.h"
185#endif 181#endif
186 182
183EV_CPP(extern "C" {)
184
187#ifndef _WIN32 185#ifndef _WIN32
188# include <sys/time.h> 186# include <sys/time.h>
189# include <sys/wait.h> 187# include <sys/wait.h>
190# include <unistd.h> 188# include <unistd.h>
191#else 189#else
… …
384# include <sys/select.h> 382# include <sys/select.h>
385# endif 383# endif
386#endif 384#endif
387 385
388#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 387# include <sys/statfs.h>
391# include <sys/inotify.h> 388# include <sys/inotify.h>
392/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
393# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
412# else 409# else
413# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
414# endif 411# endif
415# endif 412# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 414#endif
424 415
425#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h> 418# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
434# else 425# else
435# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
436# endif 427# endif
437# endif 428# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 430
443struct signalfd_siginfo 431struct signalfd_siginfo
444{ 432{
445 uint32_t ssi_signo; 433 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
447}; 435};
448# ifdef __cplusplus
449}
450# endif
451#endif 436#endif
452 437
453/**/ 438/**/
454 439
455#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
… …
537# include "ev_win32.c" 522# include "ev_win32.c"
538#endif 523#endif
539 524
540/*****************************************************************************/ 525/*****************************************************************************/
541 526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
566
567/*****************************************************************************/
568
542#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
543static void noinline 570static void noinline
544ev_printerr (const char *msg) 571ev_printerr (const char *msg)
545{ 572{
546 write (STDERR_FILENO, msg, strlen (msg)); 573 write (STDERR_FILENO, msg, strlen (msg));
… …
564 if (syserr_cb) 591 if (syserr_cb)
565 syserr_cb (msg); 592 syserr_cb (msg);
566 else 593 else
567 { 594 {
568#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg); 596 ev_printerr (msg);
572 ev_printerr (": "); 597 ev_printerr (": ");
573 ev_printerr (err); 598 ev_printerr (strerror (errno));
574 ev_printerr ("\n"); 599 ev_printerr ("\n");
575#else 600#else
576 perror (msg); 601 perror (msg);
577#endif 602#endif
578 abort (); 603 abort ();
… …
612 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
613 638
614 if (!ptr && size) 639 if (!ptr && size)
615 { 640 {
616#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
618#else 643#else
619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
620#endif 645#endif
621 abort (); 646 abort ();
622 } 647 }
623 648
624 return ptr; 649 return ptr;
… …
641 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
642 unsigned char unused; 667 unsigned char unused;
643#if EV_USE_EPOLL 668#if EV_USE_EPOLL
644 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
645#endif 670#endif
646#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
647 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
648#endif 676#endif
649} ANFD; 677} ANFD;
650 678
651/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
652typedef struct 680typedef struct
… …
717# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
718# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
720#endif 748#endif
721 749
722#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
723 751
724/*****************************************************************************/ 752/*****************************************************************************/
725 753
726#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
727ev_tstamp 755ev_tstamp
… …
781 struct timeval tv; 809 struct timeval tv;
782 810
783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
784 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
785 /* by older ones */ 813 /* by older ones */
786 EV_TS_SET (tv, delay); 814 EV_TV_SET (tv, delay);
787 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
788#endif 816#endif
789 } 817 }
790} 818}
791 819
… …
943 { 971 {
944 int fd = fdchanges [i]; 972 int fd = fdchanges [i];
945 ANFD *anfd = anfds + fd; 973 ANFD *anfd = anfds + fd;
946 ev_io *w; 974 ev_io *w;
947 975
948 unsigned char events = 0; 976 unsigned char o_events = anfd->events;
977 unsigned char o_reify = anfd->reify;
949 978
950 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 979 anfd->reify = 0;
951 events |= (unsigned char)w->events;
952 980
953#if EV_SELECT_IS_WINSOCKET 981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
954 if (events) 982 if (o_reify & EV__IOFDSET)
955 { 983 {
956 unsigned long arg; 984 unsigned long arg;
957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 986 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
987 printf ("oi %d %x\n", fd, anfd->handle);//D
959 } 988 }
960#endif 989#endif
961 990
991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
962 { 992 {
963 unsigned char o_events = anfd->events;
964 unsigned char o_reify = anfd->reify;
965
966 anfd->reify = 0;
967 anfd->events = events; 993 anfd->events = 0;
968 994
969 if (o_events != events || o_reify & EV__IOFDSET) 995 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
996 anfd->events |= (unsigned char)w->events;
997
998 if (o_events != anfd->events)
999 o_reify = EV__IOFDSET; /* actually |= */
1000 }
1001
1002 if (o_reify & EV__IOFDSET)
970 backend_modify (EV_A_ fd, o_events, events); 1003 backend_modify (EV_A_ fd, o_events, anfd->events);
971 }
972 } 1004 }
973 1005
974 fdchangecnt = 0; 1006 fdchangecnt = 0;
975} 1007}
976 1008
… …
1459 1491
1460#endif 1492#endif
1461 1493
1462/*****************************************************************************/ 1494/*****************************************************************************/
1463 1495
1496#if EV_USE_IOCP
1497# include "ev_iocp.c"
1498#endif
1464#if EV_USE_PORT 1499#if EV_USE_PORT
1465# include "ev_port.c" 1500# include "ev_port.c"
1466#endif 1501#endif
1467#if EV_USE_KQUEUE 1502#if EV_USE_KQUEUE
1468# include "ev_kqueue.c" 1503# include "ev_kqueue.c"
… …
1541ev_embeddable_backends (void) 1576ev_embeddable_backends (void)
1542{ 1577{
1543 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1578 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1544 1579
1545 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1580 /* 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 */ 1581 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1547 flags &= ~EVBACKEND_EPOLL; 1582 flags &= ~EVBACKEND_EPOLL;
1548 1583
1549 return flags; 1584 return flags;
1550} 1585}
1551 1586
1552unsigned int 1587unsigned int
… …
1665#endif 1700#endif
1666 1701
1667 if (!(flags & 0x0000ffffU)) 1702 if (!(flags & 0x0000ffffU))
1668 flags |= ev_recommended_backends (); 1703 flags |= ev_recommended_backends ();
1669 1704
1705#if EV_USE_IOCP
1706 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1707#endif
1670#if EV_USE_PORT 1708#if EV_USE_PORT
1671 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1709 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1672#endif 1710#endif
1673#if EV_USE_KQUEUE 1711#if EV_USE_KQUEUE
1674 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1712 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1691#endif 1729#endif
1692 } 1730 }
1693} 1731}
1694 1732
1695/* free up a loop structure */ 1733/* free up a loop structure */
1696static void noinline 1734void
1697loop_destroy (EV_P) 1735ev_loop_destroy (EV_P)
1698{ 1736{
1699 int i; 1737 int i;
1738
1739#if EV_MULTIPLICITY
1740 /* mimic free (0) */
1741 if (!EV_A)
1742 return;
1743#endif
1744
1745#if EV_CLEANUP_ENABLE
1746 /* queue cleanup watchers (and execute them) */
1747 if (expect_false (cleanupcnt))
1748 {
1749 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1750 EV_INVOKE_PENDING;
1751 }
1752#endif
1753
1754#if EV_CHILD_ENABLE
1755 if (ev_is_active (&childev))
1756 {
1757 ev_ref (EV_A); /* child watcher */
1758 ev_signal_stop (EV_A_ &childev);
1759 }
1760#endif
1700 1761
1701 if (ev_is_active (&pipe_w)) 1762 if (ev_is_active (&pipe_w))
1702 { 1763 {
1703 /*ev_ref (EV_A);*/ 1764 /*ev_ref (EV_A);*/
1704 /*ev_io_stop (EV_A_ &pipe_w);*/ 1765 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1726#endif 1787#endif
1727 1788
1728 if (backend_fd >= 0) 1789 if (backend_fd >= 0)
1729 close (backend_fd); 1790 close (backend_fd);
1730 1791
1792#if EV_USE_IOCP
1793 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1794#endif
1731#if EV_USE_PORT 1795#if EV_USE_PORT
1732 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1796 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1733#endif 1797#endif
1734#if EV_USE_KQUEUE 1798#if EV_USE_KQUEUE
1735 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1799 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1762 array_free (periodic, EMPTY); 1826 array_free (periodic, EMPTY);
1763#endif 1827#endif
1764#if EV_FORK_ENABLE 1828#if EV_FORK_ENABLE
1765 array_free (fork, EMPTY); 1829 array_free (fork, EMPTY);
1766#endif 1830#endif
1831#if EV_CLEANUP_ENABLE
1832 array_free (cleanup, EMPTY);
1833#endif
1767 array_free (prepare, EMPTY); 1834 array_free (prepare, EMPTY);
1768 array_free (check, EMPTY); 1835 array_free (check, EMPTY);
1769#if EV_ASYNC_ENABLE 1836#if EV_ASYNC_ENABLE
1770 array_free (async, EMPTY); 1837 array_free (async, EMPTY);
1771#endif 1838#endif
1772 1839
1773 backend = 0; 1840 backend = 0;
1841
1842#if EV_MULTIPLICITY
1843 if (ev_is_default_loop (EV_A))
1844#endif
1845 ev_default_loop_ptr = 0;
1846#if EV_MULTIPLICITY
1847 else
1848 ev_free (EV_A);
1849#endif
1774} 1850}
1775 1851
1776#if EV_USE_INOTIFY 1852#if EV_USE_INOTIFY
1777inline_size void infy_fork (EV_P); 1853inline_size void infy_fork (EV_P);
1778#endif 1854#endif
… …
1837 loop_init (EV_A_ flags); 1913 loop_init (EV_A_ flags);
1838 1914
1839 if (ev_backend (EV_A)) 1915 if (ev_backend (EV_A))
1840 return EV_A; 1916 return EV_A;
1841 1917
1918 ev_free (EV_A);
1842 return 0; 1919 return 0;
1843} 1920}
1844 1921
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 */ 1922#endif /* multiplicity */
1858 1923
1859#if EV_VERIFY 1924#if EV_VERIFY
1860static void noinline 1925static void noinline
1861verify_watcher (EV_P_ W w) 1926verify_watcher (EV_P_ W w)
… …
1936#if EV_FORK_ENABLE 2001#if EV_FORK_ENABLE
1937 assert (forkmax >= forkcnt); 2002 assert (forkmax >= forkcnt);
1938 array_verify (EV_A_ (W *)forks, forkcnt); 2003 array_verify (EV_A_ (W *)forks, forkcnt);
1939#endif 2004#endif
1940 2005
2006#if EV_CLEANUP_ENABLE
2007 assert (cleanupmax >= cleanupcnt);
2008 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2009#endif
2010
1941#if EV_ASYNC_ENABLE 2011#if EV_ASYNC_ENABLE
1942 assert (asyncmax >= asynccnt); 2012 assert (asyncmax >= asynccnt);
1943 array_verify (EV_A_ (W *)asyncs, asynccnt); 2013 array_verify (EV_A_ (W *)asyncs, asynccnt);
1944#endif 2014#endif
1945 2015
… …
1963} 2033}
1964#endif 2034#endif
1965 2035
1966#if EV_MULTIPLICITY 2036#if EV_MULTIPLICITY
1967struct ev_loop * 2037struct ev_loop *
1968ev_default_loop_init (unsigned int flags)
1969#else 2038#else
1970int 2039int
2040#endif
1971ev_default_loop (unsigned int flags) 2041ev_default_loop (unsigned int flags)
1972#endif
1973{ 2042{
1974 if (!ev_default_loop_ptr) 2043 if (!ev_default_loop_ptr)
1975 { 2044 {
1976#if EV_MULTIPLICITY 2045#if EV_MULTIPLICITY
1977 EV_P = ev_default_loop_ptr = &default_loop_struct; 2046 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1996 2065
1997 return ev_default_loop_ptr; 2066 return ev_default_loop_ptr;
1998} 2067}
1999 2068
2000void 2069void
2001ev_default_destroy (void) 2070ev_loop_fork (EV_P)
2002{ 2071{
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 */ 2072 postfork = 1; /* must be in line with ev_default_fork */
2025} 2073}
2026 2074
2027/*****************************************************************************/ 2075/*****************************************************************************/
2028 2076
2029void 2077void
… …
2289 mn_now = ev_rt_now; 2337 mn_now = ev_rt_now;
2290 } 2338 }
2291} 2339}
2292 2340
2293void 2341void
2294ev_loop (EV_P_ int flags) 2342ev_run (EV_P_ int flags)
2295{ 2343{
2296#if EV_FEATURE_API 2344#if EV_FEATURE_API
2297 ++loop_depth; 2345 ++loop_depth;
2298#endif 2346#endif
2299 2347
2300 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2348 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2301 2349
2302 loop_done = EVUNLOOP_CANCEL; 2350 loop_done = EVBREAK_CANCEL;
2303 2351
2304 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2352 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2305 2353
2306 do 2354 do
2307 { 2355 {
… …
2350 /* calculate blocking time */ 2398 /* calculate blocking time */
2351 { 2399 {
2352 ev_tstamp waittime = 0.; 2400 ev_tstamp waittime = 0.;
2353 ev_tstamp sleeptime = 0.; 2401 ev_tstamp sleeptime = 0.;
2354 2402
2403 /* remember old timestamp for io_blocktime calculation */
2404 ev_tstamp prev_mn_now = mn_now;
2405
2406 /* update time to cancel out callback processing overhead */
2407 time_update (EV_A_ 1e100);
2408
2355 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2409 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2356 { 2410 {
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; 2411 waittime = MAX_BLOCKTIME;
2364 2412
2365 if (timercnt) 2413 if (timercnt)
2366 { 2414 {
2367 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2415 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2397 } 2445 }
2398 2446
2399#if EV_FEATURE_API 2447#if EV_FEATURE_API
2400 ++loop_count; 2448 ++loop_count;
2401#endif 2449#endif
2402 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2450 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2403 backend_poll (EV_A_ waittime); 2451 backend_poll (EV_A_ waittime);
2404 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2452 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2405 2453
2406 /* update ev_rt_now, do magic */ 2454 /* update ev_rt_now, do magic */
2407 time_update (EV_A_ waittime + sleeptime); 2455 time_update (EV_A_ waittime + sleeptime);
2408 } 2456 }
2409 2457
… …
2427 EV_INVOKE_PENDING; 2475 EV_INVOKE_PENDING;
2428 } 2476 }
2429 while (expect_true ( 2477 while (expect_true (
2430 activecnt 2478 activecnt
2431 && !loop_done 2479 && !loop_done
2432 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2480 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2433 )); 2481 ));
2434 2482
2435 if (loop_done == EVUNLOOP_ONE) 2483 if (loop_done == EVBREAK_ONE)
2436 loop_done = EVUNLOOP_CANCEL; 2484 loop_done = EVBREAK_CANCEL;
2437 2485
2438#if EV_FEATURE_API 2486#if EV_FEATURE_API
2439 --loop_depth; 2487 --loop_depth;
2440#endif 2488#endif
2441} 2489}
2442 2490
2443void 2491void
2444ev_unloop (EV_P_ int how) 2492ev_break (EV_P_ int how)
2445{ 2493{
2446 loop_done = how; 2494 loop_done = how;
2447} 2495}
2448 2496
2449void 2497void
… …
2597 EV_FREQUENT_CHECK; 2645 EV_FREQUENT_CHECK;
2598 2646
2599 wlist_del (&anfds[w->fd].head, (WL)w); 2647 wlist_del (&anfds[w->fd].head, (WL)w);
2600 ev_stop (EV_A_ (W)w); 2648 ev_stop (EV_A_ (W)w);
2601 2649
2602 fd_change (EV_A_ w->fd, 1); 2650 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2603 2651
2604 EV_FREQUENT_CHECK; 2652 EV_FREQUENT_CHECK;
2605} 2653}
2606 2654
2607void noinline 2655void noinline
… …
3059 { 3107 {
3060 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3108 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3061 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3109 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3062 ofs += sizeof (struct inotify_event) + ev->len; 3110 ofs += sizeof (struct inotify_event) + ev->len;
3063 } 3111 }
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} 3112}
3097 3113
3098inline_size void 3114inline_size void
3099ev_check_2625 (EV_P) 3115ev_check_2625 (EV_P)
3100{ 3116{
… …
3424 3440
3425#if EV_EMBED_ENABLE 3441#if EV_EMBED_ENABLE
3426void noinline 3442void noinline
3427ev_embed_sweep (EV_P_ ev_embed *w) 3443ev_embed_sweep (EV_P_ ev_embed *w)
3428{ 3444{
3429 ev_loop (w->other, EVLOOP_NONBLOCK); 3445 ev_run (w->other, EVRUN_NOWAIT);
3430} 3446}
3431 3447
3432static void 3448static void
3433embed_io_cb (EV_P_ ev_io *io, int revents) 3449embed_io_cb (EV_P_ ev_io *io, int revents)
3434{ 3450{
3435 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3451 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3436 3452
3437 if (ev_cb (w)) 3453 if (ev_cb (w))
3438 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3454 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3439 else 3455 else
3440 ev_loop (w->other, EVLOOP_NONBLOCK); 3456 ev_run (w->other, EVRUN_NOWAIT);
3441} 3457}
3442 3458
3443static void 3459static void
3444embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3460embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3445{ 3461{
… …
3449 EV_P = w->other; 3465 EV_P = w->other;
3450 3466
3451 while (fdchangecnt) 3467 while (fdchangecnt)
3452 { 3468 {
3453 fd_reify (EV_A); 3469 fd_reify (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3470 ev_run (EV_A_ EVRUN_NOWAIT);
3455 } 3471 }
3456 } 3472 }
3457} 3473}
3458 3474
3459static void 3475static void
… …
3465 3481
3466 { 3482 {
3467 EV_P = w->other; 3483 EV_P = w->other;
3468 3484
3469 ev_loop_fork (EV_A); 3485 ev_loop_fork (EV_A);
3470 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3486 ev_run (EV_A_ EVRUN_NOWAIT);
3471 } 3487 }
3472 3488
3473 ev_embed_start (EV_A_ w); 3489 ev_embed_start (EV_A_ w);
3474} 3490}
3475 3491
… …
3567 3583
3568 EV_FREQUENT_CHECK; 3584 EV_FREQUENT_CHECK;
3569} 3585}
3570#endif 3586#endif
3571 3587
3572#if EV_ASYNC_ENABLE 3588#if EV_CLEANUP_ENABLE
3573void 3589void
3574ev_async_start (EV_P_ ev_async *w) 3590ev_cleanup_start (EV_P_ ev_cleanup *w)
3575{ 3591{
3576 if (expect_false (ev_is_active (w))) 3592 if (expect_false (ev_is_active (w)))
3577 return; 3593 return;
3594
3595 EV_FREQUENT_CHECK;
3596
3597 ev_start (EV_A_ (W)w, ++cleanupcnt);
3598 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3599 cleanups [cleanupcnt - 1] = w;
3600
3601 /* cleanup watchers should never keep a refcount on the loop */
3602 ev_unref (EV_A);
3603 EV_FREQUENT_CHECK;
3604}
3605
3606void
3607ev_cleanup_stop (EV_P_ ev_cleanup *w)
3608{
3609 clear_pending (EV_A_ (W)w);
3610 if (expect_false (!ev_is_active (w)))
3611 return;
3612
3613 EV_FREQUENT_CHECK;
3614 ev_ref (EV_A);
3615
3616 {
3617 int active = ev_active (w);
3618
3619 cleanups [active - 1] = cleanups [--cleanupcnt];
3620 ev_active (cleanups [active - 1]) = active;
3621 }
3622
3623 ev_stop (EV_A_ (W)w);
3624
3625 EV_FREQUENT_CHECK;
3626}
3627#endif
3628
3629#if EV_ASYNC_ENABLE
3630void
3631ev_async_start (EV_P_ ev_async *w)
3632{
3633 if (expect_false (ev_is_active (w)))
3634 return;
3635
3636 w->sent = 0;
3578 3637
3579 evpipe_init (EV_A); 3638 evpipe_init (EV_A);
3580 3639
3581 EV_FREQUENT_CHECK; 3640 EV_FREQUENT_CHECK;
3582 3641
… …
3802 3861
3803#if EV_MULTIPLICITY 3862#if EV_MULTIPLICITY
3804 #include "ev_wrap.h" 3863 #include "ev_wrap.h"
3805#endif 3864#endif
3806 3865
3807#ifdef __cplusplus 3866EV_CPP(})
3808}
3809#endif
3810 3867

Diff Legend

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