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

Comparing libev/ev.c (file contents):
Revision 1.356 by root, Fri Oct 22 11:21:52 2010 UTC vs.
Revision 1.365 by root, Sun Oct 31 22:01:20 2010 UTC

… …
530 530
531static unsigned int noinline 531static unsigned int noinline
532ev_linux_version (void) 532ev_linux_version (void)
533{ 533{
534#ifdef __linux 534#ifdef __linux
535 unsigned int v = 0;
535 struct utsname buf; 536 struct utsname buf;
536 unsigned int v;
537 int i; 537 int i;
538 char *p = buf.release; 538 char *p = buf.release;
539 539
540 if (uname (&buf)) 540 if (uname (&buf))
541 return 0; 541 return 0;
… …
591 if (syserr_cb) 591 if (syserr_cb)
592 syserr_cb (msg); 592 syserr_cb (msg);
593 else 593 else
594 { 594 {
595#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg); 596 ev_printerr (msg);
599 ev_printerr (": "); 597 ev_printerr (": ");
600 ev_printerr (err); 598 ev_printerr (strerror (errno));
601 ev_printerr ("\n"); 599 ev_printerr ("\n");
602#else 600#else
603 perror (msg); 601 perror (msg);
604#endif 602#endif
605 abort (); 603 abort ();
… …
639 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
640 638
641 if (!ptr && size) 639 if (!ptr && size)
642 { 640 {
643#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
645#else 643#else
646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
647#endif 645#endif
648 abort (); 646 abort ();
649 } 647 }
650 648
651 return ptr; 649 return ptr;
… …
668 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 */
669 unsigned char unused; 667 unsigned char unused;
670#if EV_USE_EPOLL 668#if EV_USE_EPOLL
671 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
672#endif 670#endif
673#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
674 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
675#endif 676#endif
676} ANFD; 677} ANFD;
677 678
678/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
679typedef struct 680typedef struct
… …
975 unsigned char o_events = anfd->events; 976 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify; 977 unsigned char o_reify = anfd->reify;
977 978
978 anfd->reify = 0; 979 anfd->reify = 0;
979 980
980#if EV_SELECT_IS_WINSOCKET 981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
981 if (o_reify & EV__IOFDSET) 982 if (o_reify & EV__IOFDSET)
982 { 983 {
983 unsigned long arg; 984 unsigned long arg;
984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
985 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
986 } 988 }
987#endif 989#endif
988 990
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
990 { 992 {
… …
1489 1491
1490#endif 1492#endif
1491 1493
1492/*****************************************************************************/ 1494/*****************************************************************************/
1493 1495
1496#if EV_USE_IOCP
1497# include "ev_iocp.c"
1498#endif
1494#if EV_USE_PORT 1499#if EV_USE_PORT
1495# include "ev_port.c" 1500# include "ev_port.c"
1496#endif 1501#endif
1497#if EV_USE_KQUEUE 1502#if EV_USE_KQUEUE
1498# include "ev_kqueue.c" 1503# include "ev_kqueue.c"
… …
1695#endif 1700#endif
1696 1701
1697 if (!(flags & 0x0000ffffU)) 1702 if (!(flags & 0x0000ffffU))
1698 flags |= ev_recommended_backends (); 1703 flags |= ev_recommended_backends ();
1699 1704
1705#if EV_USE_IOCP
1706 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1707#endif
1700#if EV_USE_PORT 1708#if EV_USE_PORT
1701 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1709 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1702#endif 1710#endif
1703#if EV_USE_KQUEUE 1711#if EV_USE_KQUEUE
1704 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1712 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1721#endif 1729#endif
1722 } 1730 }
1723} 1731}
1724 1732
1725/* free up a loop structure */ 1733/* free up a loop structure */
1726static void noinline 1734void
1727loop_destroy (EV_P) 1735ev_loop_destroy (EV_P)
1728{ 1736{
1729 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
1730 1761
1731 if (ev_is_active (&pipe_w)) 1762 if (ev_is_active (&pipe_w))
1732 { 1763 {
1733 /*ev_ref (EV_A);*/ 1764 /*ev_ref (EV_A);*/
1734 /*ev_io_stop (EV_A_ &pipe_w);*/ 1765 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1756#endif 1787#endif
1757 1788
1758 if (backend_fd >= 0) 1789 if (backend_fd >= 0)
1759 close (backend_fd); 1790 close (backend_fd);
1760 1791
1792#if EV_USE_IOCP
1793 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1794#endif
1761#if EV_USE_PORT 1795#if EV_USE_PORT
1762 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1796 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1763#endif 1797#endif
1764#if EV_USE_KQUEUE 1798#if EV_USE_KQUEUE
1765 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1799 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1792 array_free (periodic, EMPTY); 1826 array_free (periodic, EMPTY);
1793#endif 1827#endif
1794#if EV_FORK_ENABLE 1828#if EV_FORK_ENABLE
1795 array_free (fork, EMPTY); 1829 array_free (fork, EMPTY);
1796#endif 1830#endif
1831#if EV_CLEANUP_ENABLE
1832 array_free (cleanup, EMPTY);
1833#endif
1797 array_free (prepare, EMPTY); 1834 array_free (prepare, EMPTY);
1798 array_free (check, EMPTY); 1835 array_free (check, EMPTY);
1799#if EV_ASYNC_ENABLE 1836#if EV_ASYNC_ENABLE
1800 array_free (async, EMPTY); 1837 array_free (async, EMPTY);
1801#endif 1838#endif
1802 1839
1803 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
1804} 1850}
1805 1851
1806#if EV_USE_INOTIFY 1852#if EV_USE_INOTIFY
1807inline_size void infy_fork (EV_P); 1853inline_size void infy_fork (EV_P);
1808#endif 1854#endif
… …
1867 loop_init (EV_A_ flags); 1913 loop_init (EV_A_ flags);
1868 1914
1869 if (ev_backend (EV_A)) 1915 if (ev_backend (EV_A))
1870 return EV_A; 1916 return EV_A;
1871 1917
1918 ev_free (EV_A);
1872 return 0; 1919 return 0;
1873} 1920}
1874 1921
1875void
1876ev_loop_destroy (EV_P)
1877{
1878 loop_destroy (EV_A);
1879 ev_free (loop);
1880}
1881
1882void
1883ev_loop_fork (EV_P)
1884{
1885 postfork = 1; /* must be in line with ev_default_fork */
1886}
1887#endif /* multiplicity */ 1922#endif /* multiplicity */
1888 1923
1889#if EV_VERIFY 1924#if EV_VERIFY
1890static void noinline 1925static void noinline
1891verify_watcher (EV_P_ W w) 1926verify_watcher (EV_P_ W w)
… …
1966#if EV_FORK_ENABLE 2001#if EV_FORK_ENABLE
1967 assert (forkmax >= forkcnt); 2002 assert (forkmax >= forkcnt);
1968 array_verify (EV_A_ (W *)forks, forkcnt); 2003 array_verify (EV_A_ (W *)forks, forkcnt);
1969#endif 2004#endif
1970 2005
2006#if EV_CLEANUP_ENABLE
2007 assert (cleanupmax >= cleanupcnt);
2008 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2009#endif
2010
1971#if EV_ASYNC_ENABLE 2011#if EV_ASYNC_ENABLE
1972 assert (asyncmax >= asynccnt); 2012 assert (asyncmax >= asynccnt);
1973 array_verify (EV_A_ (W *)asyncs, asynccnt); 2013 array_verify (EV_A_ (W *)asyncs, asynccnt);
1974#endif 2014#endif
1975 2015
… …
1993} 2033}
1994#endif 2034#endif
1995 2035
1996#if EV_MULTIPLICITY 2036#if EV_MULTIPLICITY
1997struct ev_loop * 2037struct ev_loop *
1998ev_default_loop_init (unsigned int flags)
1999#else 2038#else
2000int 2039int
2040#endif
2001ev_default_loop (unsigned int flags) 2041ev_default_loop (unsigned int flags)
2002#endif
2003{ 2042{
2004 if (!ev_default_loop_ptr) 2043 if (!ev_default_loop_ptr)
2005 { 2044 {
2006#if EV_MULTIPLICITY 2045#if EV_MULTIPLICITY
2007 EV_P = ev_default_loop_ptr = &default_loop_struct; 2046 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2026 2065
2027 return ev_default_loop_ptr; 2066 return ev_default_loop_ptr;
2028} 2067}
2029 2068
2030void 2069void
2031ev_default_destroy (void) 2070ev_loop_fork (EV_P)
2032{ 2071{
2033#if EV_MULTIPLICITY
2034 EV_P = ev_default_loop_ptr;
2035#endif
2036
2037 ev_default_loop_ptr = 0;
2038
2039#if EV_CHILD_ENABLE
2040 ev_ref (EV_A); /* child watcher */
2041 ev_signal_stop (EV_A_ &childev);
2042#endif
2043
2044 loop_destroy (EV_A);
2045}
2046
2047void
2048ev_default_fork (void)
2049{
2050#if EV_MULTIPLICITY
2051 EV_P = ev_default_loop_ptr;
2052#endif
2053
2054 postfork = 1; /* must be in line with ev_loop_fork */ 2072 postfork = 1; /* must be in line with ev_default_fork */
2055} 2073}
2056 2074
2057/*****************************************************************************/ 2075/*****************************************************************************/
2058 2076
2059void 2077void
… …
3565 3583
3566 EV_FREQUENT_CHECK; 3584 EV_FREQUENT_CHECK;
3567} 3585}
3568#endif 3586#endif
3569 3587
3588#if EV_CLEANUP_ENABLE
3589void
3590ev_cleanup_start (EV_P_ ev_cleanup *w)
3591{
3592 if (expect_false (ev_is_active (w)))
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
3570#if EV_ASYNC_ENABLE 3629#if EV_ASYNC_ENABLE
3571void 3630void
3572ev_async_start (EV_P_ ev_async *w) 3631ev_async_start (EV_P_ ev_async *w)
3573{ 3632{
3574 if (expect_false (ev_is_active (w))) 3633 if (expect_false (ev_is_active (w)))

Diff Legend

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