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.359 by root, Sun Oct 24 17:58:41 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;
… …
668 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 */
669 unsigned char unused; 669 unsigned char unused;
670#if EV_USE_EPOLL 670#if EV_USE_EPOLL
671 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
672#endif 672#endif
673#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
674 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
675#endif 678#endif
676} ANFD; 679} ANFD;
677 680
678/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
679typedef struct 682typedef struct
… …
975 unsigned char o_events = anfd->events; 978 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify; 979 unsigned char o_reify = anfd->reify;
977 980
978 anfd->reify = 0; 981 anfd->reify = 0;
979 982
980#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
981 if (o_reify & EV__IOFDSET) 984 if (o_reify & EV__IOFDSET)
982 { 985 {
983 unsigned long arg; 986 unsigned long arg;
984 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
985 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
986 } 990 }
987#endif 991#endif
988 992
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
990 { 994 {
… …
1489 1493
1490#endif 1494#endif
1491 1495
1492/*****************************************************************************/ 1496/*****************************************************************************/
1493 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1494#if EV_USE_PORT 1501#if EV_USE_PORT
1495# include "ev_port.c" 1502# include "ev_port.c"
1496#endif 1503#endif
1497#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1498# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1695#endif 1702#endif
1696 1703
1697 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1698 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1699 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1700#if EV_USE_PORT 1710#if EV_USE_PORT
1701 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1702#endif 1712#endif
1703#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1704 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1721#endif 1731#endif
1722 } 1732 }
1723} 1733}
1724 1734
1725/* free up a loop structure */ 1735/* free up a loop structure */
1726static void noinline 1736void
1727loop_destroy (EV_P) 1737ev_loop_destroy (EV_P)
1728{ 1738{
1729 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
1730 1748
1731 if (ev_is_active (&pipe_w)) 1749 if (ev_is_active (&pipe_w))
1732 { 1750 {
1733 /*ev_ref (EV_A);*/ 1751 /*ev_ref (EV_A);*/
1734 /*ev_io_stop (EV_A_ &pipe_w);*/ 1752 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1756#endif 1774#endif
1757 1775
1758 if (backend_fd >= 0) 1776 if (backend_fd >= 0)
1759 close (backend_fd); 1777 close (backend_fd);
1760 1778
1779#if EV_USE_IOCP
1780 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1781#endif
1761#if EV_USE_PORT 1782#if EV_USE_PORT
1762 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1783 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1763#endif 1784#endif
1764#if EV_USE_KQUEUE 1785#if EV_USE_KQUEUE
1765 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1786 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1799#if EV_ASYNC_ENABLE 1820#if EV_ASYNC_ENABLE
1800 array_free (async, EMPTY); 1821 array_free (async, EMPTY);
1801#endif 1822#endif
1802 1823
1803 backend = 0; 1824 backend = 0;
1825
1826#if EV_MULTIPLICITY
1827 if (ev_is_default_loop (EV_A))
1828#endif
1829 ev_default_loop_ptr = 0;
1830#if EV_MULTIPLICITY
1831 else
1832 ev_free (EV_A);
1833#endif
1804} 1834}
1805 1835
1806#if EV_USE_INOTIFY 1836#if EV_USE_INOTIFY
1807inline_size void infy_fork (EV_P); 1837inline_size void infy_fork (EV_P);
1808#endif 1838#endif
… …
1867 loop_init (EV_A_ flags); 1897 loop_init (EV_A_ flags);
1868 1898
1869 if (ev_backend (EV_A)) 1899 if (ev_backend (EV_A))
1870 return EV_A; 1900 return EV_A;
1871 1901
1902 ev_free (EV_A);
1872 return 0; 1903 return 0;
1873} 1904}
1874 1905
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 */ 1906#endif /* multiplicity */
1888 1907
1889#if EV_VERIFY 1908#if EV_VERIFY
1890static void noinline 1909static void noinline
1891verify_watcher (EV_P_ W w) 1910verify_watcher (EV_P_ W w)
… …
1993} 2012}
1994#endif 2013#endif
1995 2014
1996#if EV_MULTIPLICITY 2015#if EV_MULTIPLICITY
1997struct ev_loop * 2016struct ev_loop *
1998ev_default_loop_init (unsigned int flags)
1999#else 2017#else
2000int 2018int
2019#endif
2001ev_default_loop (unsigned int flags) 2020ev_default_loop (unsigned int flags)
2002#endif
2003{ 2021{
2004 if (!ev_default_loop_ptr) 2022 if (!ev_default_loop_ptr)
2005 { 2023 {
2006#if EV_MULTIPLICITY 2024#if EV_MULTIPLICITY
2007 EV_P = ev_default_loop_ptr = &default_loop_struct; 2025 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2026 2044
2027 return ev_default_loop_ptr; 2045 return ev_default_loop_ptr;
2028} 2046}
2029 2047
2030void 2048void
2031ev_default_destroy (void) 2049ev_loop_fork (EV_P)
2032{ 2050{
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 */ 2051 postfork = 1; /* must be in line with ev_default_fork */
2055} 2052}
2056 2053
2057/*****************************************************************************/ 2054/*****************************************************************************/
2058 2055
2059void 2056void

Diff Legend

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