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.371 by root, Mon Feb 7 21:45:32 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
376# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
377# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
378#endif 378#endif
379 379
380#if !EV_USE_NANOSLEEP 380#if !EV_USE_NANOSLEEP
381# ifndef _WIN32 381/* hp-ux has it in sys/time.h, which we unconditionally include above */
382# if !defined(_WIN32) && !defined(__hpux)
382# include <sys/select.h> 383# include <sys/select.h>
383# endif 384# endif
384#endif 385#endif
385 386
386#if EV_USE_INOTIFY 387#if EV_USE_INOTIFY
… …
530 531
531static unsigned int noinline 532static unsigned int noinline
532ev_linux_version (void) 533ev_linux_version (void)
533{ 534{
534#ifdef __linux 535#ifdef __linux
536 unsigned int v = 0;
535 struct utsname buf; 537 struct utsname buf;
536 unsigned int v;
537 int i; 538 int i;
538 char *p = buf.release; 539 char *p = buf.release;
539 540
540 if (uname (&buf)) 541 if (uname (&buf))
541 return 0; 542 return 0;
… …
591 if (syserr_cb) 592 if (syserr_cb)
592 syserr_cb (msg); 593 syserr_cb (msg);
593 else 594 else
594 { 595 {
595#if EV_AVOID_STDIO 596#if EV_AVOID_STDIO
596 const char *err = strerror (errno);
597
598 ev_printerr (msg); 597 ev_printerr (msg);
599 ev_printerr (": "); 598 ev_printerr (": ");
600 ev_printerr (err); 599 ev_printerr (strerror (errno));
601 ev_printerr ("\n"); 600 ev_printerr ("\n");
602#else 601#else
603 perror (msg); 602 perror (msg);
604#endif 603#endif
605 abort (); 604 abort ();
… …
639 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
640 639
641 if (!ptr && size) 640 if (!ptr && size)
642 { 641 {
643#if EV_AVOID_STDIO 642#if EV_AVOID_STDIO
644 ev_printerr ("libev: memory allocation failed, aborting.\n"); 643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
645#else 644#else
646 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
647#endif 646#endif
648 abort (); 647 abort ();
649 } 648 }
650 649
651 return ptr; 650 return ptr;
… …
668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 667 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
669 unsigned char unused; 668 unsigned char unused;
670#if EV_USE_EPOLL 669#if EV_USE_EPOLL
671 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
672#endif 671#endif
673#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
674 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
675#endif 677#endif
676} ANFD; 678} ANFD;
677 679
678/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
679typedef struct 681typedef struct
… …
814 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
815#endif 817#endif
816 } 818 }
817} 819}
818 820
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
819/*****************************************************************************/ 829/*****************************************************************************/
820 830
821#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
822 832
823/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
… …
964inline_size void 974inline_size void
965fd_reify (EV_P) 975fd_reify (EV_P)
966{ 976{
967 int i; 977 int i;
968 978
979#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
980 for (i = 0; i < fdchangecnt; ++i)
981 {
982 int fd = fdchanges [i];
983 ANFD *anfd = anfds + fd;
984
985 if (anfd->reify & EV__IOFDSET)
986 {
987 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
988
989 if (handle != anfd->handle)
990 {
991 unsigned long arg;
992
993 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
994
995 /* handle changed, but fd didn't - we need to do it in two steps */
996 backend_modify (EV_A_ fd, anfd->events, 0);
997 anfd->events = 0;
998 anfd->handle = handle;
999 }
1000 }
1001 }
1002#endif
1003
969 for (i = 0; i < fdchangecnt; ++i) 1004 for (i = 0; i < fdchangecnt; ++i)
970 { 1005 {
971 int fd = fdchanges [i]; 1006 int fd = fdchanges [i];
972 ANFD *anfd = anfds + fd; 1007 ANFD *anfd = anfds + fd;
973 ev_io *w; 1008 ev_io *w;
974 1009
975 unsigned char o_events = anfd->events; 1010 unsigned char o_events = anfd->events;
976 unsigned char o_reify = anfd->reify; 1011 unsigned char o_reify = anfd->reify;
977 1012
978 anfd->reify = 0; 1013 anfd->reify = 0;
979
980#if EV_SELECT_IS_WINSOCKET
981 if (o_reify & EV__IOFDSET)
982 {
983 unsigned long arg;
984 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 }
987#endif
988 1014
989 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1015 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
990 { 1016 {
991 anfd->events = 0; 1017 anfd->events = 0;
992 1018
… …
1341 char dummy; 1367 char dummy;
1342 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1368 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1343 read (evpipe [0], &dummy, 1); 1369 read (evpipe [0], &dummy, 1);
1344 } 1370 }
1345 1371
1372#if EV_SIGNAL_ENABLE
1346 if (sig_pending) 1373 if (sig_pending)
1347 { 1374 {
1348 sig_pending = 0; 1375 sig_pending = 0;
1349 1376
1350 for (i = EV_NSIG - 1; i--; ) 1377 for (i = EV_NSIG - 1; i--; )
1351 if (expect_false (signals [i].pending)) 1378 if (expect_false (signals [i].pending))
1352 ev_feed_signal_event (EV_A_ i + 1); 1379 ev_feed_signal_event (EV_A_ i + 1);
1353 } 1380 }
1381#endif
1354 1382
1355#if EV_ASYNC_ENABLE 1383#if EV_ASYNC_ENABLE
1356 if (async_pending) 1384 if (async_pending)
1357 { 1385 {
1358 async_pending = 0; 1386 async_pending = 0;
… …
1367#endif 1395#endif
1368} 1396}
1369 1397
1370/*****************************************************************************/ 1398/*****************************************************************************/
1371 1399
1400void
1401ev_feed_signal (int signum)
1402{
1403#if EV_MULTIPLICITY
1404 EV_P = signals [signum - 1].loop;
1405
1406 if (!EV_A)
1407 return;
1408#endif
1409
1410 signals [signum - 1].pending = 1;
1411 evpipe_write (EV_A_ &sig_pending);
1412}
1413
1372static void 1414static void
1373ev_sighandler (int signum) 1415ev_sighandler (int signum)
1374{ 1416{
1375#if EV_MULTIPLICITY
1376 EV_P = signals [signum - 1].loop;
1377#endif
1378
1379#ifdef _WIN32 1417#ifdef _WIN32
1380 signal (signum, ev_sighandler); 1418 signal (signum, ev_sighandler);
1381#endif 1419#endif
1382 1420
1383 signals [signum - 1].pending = 1; 1421 ev_feed_signal (signum);
1384 evpipe_write (EV_A_ &sig_pending);
1385} 1422}
1386 1423
1387void noinline 1424void noinline
1388ev_feed_signal_event (EV_P_ int signum) 1425ev_feed_signal_event (EV_P_ int signum)
1389{ 1426{
… …
1489 1526
1490#endif 1527#endif
1491 1528
1492/*****************************************************************************/ 1529/*****************************************************************************/
1493 1530
1531#if EV_USE_IOCP
1532# include "ev_iocp.c"
1533#endif
1494#if EV_USE_PORT 1534#if EV_USE_PORT
1495# include "ev_port.c" 1535# include "ev_port.c"
1496#endif 1536#endif
1497#if EV_USE_KQUEUE 1537#if EV_USE_KQUEUE
1498# include "ev_kqueue.c" 1538# include "ev_kqueue.c"
… …
1638static void noinline 1678static void noinline
1639loop_init (EV_P_ unsigned int flags) 1679loop_init (EV_P_ unsigned int flags)
1640{ 1680{
1641 if (!backend) 1681 if (!backend)
1642 { 1682 {
1683 origflags = flags;
1684
1643#if EV_USE_REALTIME 1685#if EV_USE_REALTIME
1644 if (!have_realtime) 1686 if (!have_realtime)
1645 { 1687 {
1646 struct timespec ts; 1688 struct timespec ts;
1647 1689
… …
1692#endif 1734#endif
1693#if EV_USE_SIGNALFD 1735#if EV_USE_SIGNALFD
1694 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1736 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1695#endif 1737#endif
1696 1738
1697 if (!(flags & 0x0000ffffU)) 1739 if (!(flags & EVBACKEND_MASK))
1698 flags |= ev_recommended_backends (); 1740 flags |= ev_recommended_backends ();
1699 1741
1742#if EV_USE_IOCP
1743 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1744#endif
1700#if EV_USE_PORT 1745#if EV_USE_PORT
1701 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1746 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1702#endif 1747#endif
1703#if EV_USE_KQUEUE 1748#if EV_USE_KQUEUE
1704 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1749 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1721#endif 1766#endif
1722 } 1767 }
1723} 1768}
1724 1769
1725/* free up a loop structure */ 1770/* free up a loop structure */
1726static void noinline 1771void
1727loop_destroy (EV_P) 1772ev_loop_destroy (EV_P)
1728{ 1773{
1729 int i; 1774 int i;
1775
1776#if EV_MULTIPLICITY
1777 /* mimic free (0) */
1778 if (!EV_A)
1779 return;
1780#endif
1781
1782#if EV_CLEANUP_ENABLE
1783 /* queue cleanup watchers (and execute them) */
1784 if (expect_false (cleanupcnt))
1785 {
1786 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1787 EV_INVOKE_PENDING;
1788 }
1789#endif
1790
1791#if EV_CHILD_ENABLE
1792 if (ev_is_active (&childev))
1793 {
1794 ev_ref (EV_A); /* child watcher */
1795 ev_signal_stop (EV_A_ &childev);
1796 }
1797#endif
1730 1798
1731 if (ev_is_active (&pipe_w)) 1799 if (ev_is_active (&pipe_w))
1732 { 1800 {
1733 /*ev_ref (EV_A);*/ 1801 /*ev_ref (EV_A);*/
1734 /*ev_io_stop (EV_A_ &pipe_w);*/ 1802 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1756#endif 1824#endif
1757 1825
1758 if (backend_fd >= 0) 1826 if (backend_fd >= 0)
1759 close (backend_fd); 1827 close (backend_fd);
1760 1828
1829#if EV_USE_IOCP
1830 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1831#endif
1761#if EV_USE_PORT 1832#if EV_USE_PORT
1762 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1833 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1763#endif 1834#endif
1764#if EV_USE_KQUEUE 1835#if EV_USE_KQUEUE
1765 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1836 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1792 array_free (periodic, EMPTY); 1863 array_free (periodic, EMPTY);
1793#endif 1864#endif
1794#if EV_FORK_ENABLE 1865#if EV_FORK_ENABLE
1795 array_free (fork, EMPTY); 1866 array_free (fork, EMPTY);
1796#endif 1867#endif
1868#if EV_CLEANUP_ENABLE
1869 array_free (cleanup, EMPTY);
1870#endif
1797 array_free (prepare, EMPTY); 1871 array_free (prepare, EMPTY);
1798 array_free (check, EMPTY); 1872 array_free (check, EMPTY);
1799#if EV_ASYNC_ENABLE 1873#if EV_ASYNC_ENABLE
1800 array_free (async, EMPTY); 1874 array_free (async, EMPTY);
1801#endif 1875#endif
1802 1876
1803 backend = 0; 1877 backend = 0;
1878
1879#if EV_MULTIPLICITY
1880 if (ev_is_default_loop (EV_A))
1881#endif
1882 ev_default_loop_ptr = 0;
1883#if EV_MULTIPLICITY
1884 else
1885 ev_free (EV_A);
1886#endif
1804} 1887}
1805 1888
1806#if EV_USE_INOTIFY 1889#if EV_USE_INOTIFY
1807inline_size void infy_fork (EV_P); 1890inline_size void infy_fork (EV_P);
1808#endif 1891#endif
… …
1867 loop_init (EV_A_ flags); 1950 loop_init (EV_A_ flags);
1868 1951
1869 if (ev_backend (EV_A)) 1952 if (ev_backend (EV_A))
1870 return EV_A; 1953 return EV_A;
1871 1954
1955 ev_free (EV_A);
1872 return 0; 1956 return 0;
1873} 1957}
1874 1958
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 */ 1959#endif /* multiplicity */
1888 1960
1889#if EV_VERIFY 1961#if EV_VERIFY
1890static void noinline 1962static void noinline
1891verify_watcher (EV_P_ W w) 1963verify_watcher (EV_P_ W w)
… …
1966#if EV_FORK_ENABLE 2038#if EV_FORK_ENABLE
1967 assert (forkmax >= forkcnt); 2039 assert (forkmax >= forkcnt);
1968 array_verify (EV_A_ (W *)forks, forkcnt); 2040 array_verify (EV_A_ (W *)forks, forkcnt);
1969#endif 2041#endif
1970 2042
2043#if EV_CLEANUP_ENABLE
2044 assert (cleanupmax >= cleanupcnt);
2045 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2046#endif
2047
1971#if EV_ASYNC_ENABLE 2048#if EV_ASYNC_ENABLE
1972 assert (asyncmax >= asynccnt); 2049 assert (asyncmax >= asynccnt);
1973 array_verify (EV_A_ (W *)asyncs, asynccnt); 2050 array_verify (EV_A_ (W *)asyncs, asynccnt);
1974#endif 2051#endif
1975 2052
… …
1993} 2070}
1994#endif 2071#endif
1995 2072
1996#if EV_MULTIPLICITY 2073#if EV_MULTIPLICITY
1997struct ev_loop * 2074struct ev_loop *
1998ev_default_loop_init (unsigned int flags)
1999#else 2075#else
2000int 2076int
2077#endif
2001ev_default_loop (unsigned int flags) 2078ev_default_loop (unsigned int flags)
2002#endif
2003{ 2079{
2004 if (!ev_default_loop_ptr) 2080 if (!ev_default_loop_ptr)
2005 { 2081 {
2006#if EV_MULTIPLICITY 2082#if EV_MULTIPLICITY
2007 EV_P = ev_default_loop_ptr = &default_loop_struct; 2083 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2026 2102
2027 return ev_default_loop_ptr; 2103 return ev_default_loop_ptr;
2028} 2104}
2029 2105
2030void 2106void
2031ev_default_destroy (void) 2107ev_loop_fork (EV_P)
2032{ 2108{
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 */ 2109 postfork = 1; /* must be in line with ev_default_fork */
2055} 2110}
2056 2111
2057/*****************************************************************************/ 2112/*****************************************************************************/
2058 2113
2059void 2114void
… …
2081 2136
2082 for (pri = NUMPRI; pri--; ) 2137 for (pri = NUMPRI; pri--; )
2083 while (pendingcnt [pri]) 2138 while (pendingcnt [pri])
2084 { 2139 {
2085 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2140 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2086
2087 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2088 /* ^ this is no longer true, as pending_w could be here */
2089 2141
2090 p->w->pending = 0; 2142 p->w->pending = 0;
2091 EV_CB_INVOKE (p->w, p->events); 2143 EV_CB_INVOKE (p->w, p->events);
2092 EV_FREQUENT_CHECK; 2144 EV_FREQUENT_CHECK;
2093 } 2145 }
… …
2155 feed_reverse_done (EV_A_ EV_TIMER); 2207 feed_reverse_done (EV_A_ EV_TIMER);
2156 } 2208 }
2157} 2209}
2158 2210
2159#if EV_PERIODIC_ENABLE 2211#if EV_PERIODIC_ENABLE
2212
2213inline_speed void
2214periodic_recalc (EV_P_ ev_periodic *w)
2215{
2216 /* TODO: use slow but potentially more correct incremental algo, */
2217 /* also do not rely on ceil */
2218 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2219}
2220
2160/* make periodics pending */ 2221/* make periodics pending */
2161inline_size void 2222inline_size void
2162periodics_reify (EV_P) 2223periodics_reify (EV_P)
2163{ 2224{
2164 EV_FREQUENT_CHECK; 2225 EV_FREQUENT_CHECK;
… …
2183 ANHE_at_cache (periodics [HEAP0]); 2244 ANHE_at_cache (periodics [HEAP0]);
2184 downheap (periodics, periodiccnt, HEAP0); 2245 downheap (periodics, periodiccnt, HEAP0);
2185 } 2246 }
2186 else if (w->interval) 2247 else if (w->interval)
2187 { 2248 {
2188 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2249 periodic_recalc (EV_A_ w);
2250
2189 /* if next trigger time is not sufficiently in the future, put it there */ 2251 /* if next trigger time is not sufficiently in the future, put it there */
2190 /* this might happen because of floating point inexactness */ 2252 /* this might happen because of floating point inexactness */
2191 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2253 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2192 { 2254 {
2193 ev_at (w) += w->interval; 2255 ev_at (w) += w->interval;
… …
2227 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2289 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2228 2290
2229 if (w->reschedule_cb) 2291 if (w->reschedule_cb)
2230 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2292 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2231 else if (w->interval) 2293 else if (w->interval)
2232 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2294 periodic_recalc (EV_A_ w);
2233 2295
2234 ANHE_at_cache (periodics [i]); 2296 ANHE_at_cache (periodics [i]);
2235 } 2297 }
2236 2298
2237 reheap (periodics, periodiccnt); 2299 reheap (periodics, periodiccnt);
… …
2729 if (w->reschedule_cb) 2791 if (w->reschedule_cb)
2730 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2792 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2731 else if (w->interval) 2793 else if (w->interval)
2732 { 2794 {
2733 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2795 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2734 /* this formula differs from the one in periodic_reify because we do not always round up */ 2796 periodic_recalc (EV_A_ w);
2735 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2736 } 2797 }
2737 else 2798 else
2738 ev_at (w) = w->offset; 2799 ev_at (w) = w->offset;
2739 2800
2740 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
… …
2861 sa.sa_handler = ev_sighandler; 2922 sa.sa_handler = ev_sighandler;
2862 sigfillset (&sa.sa_mask); 2923 sigfillset (&sa.sa_mask);
2863 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2924 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2864 sigaction (w->signum, &sa, 0); 2925 sigaction (w->signum, &sa, 0);
2865 2926
2927 if (origflags & EVFLAG_NOSIGMASK)
2928 {
2866 sigemptyset (&sa.sa_mask); 2929 sigemptyset (&sa.sa_mask);
2867 sigaddset (&sa.sa_mask, w->signum); 2930 sigaddset (&sa.sa_mask, w->signum);
2868 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2931 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2932 }
2869#endif 2933#endif
2870 } 2934 }
2871 2935
2872 EV_FREQUENT_CHECK; 2936 EV_FREQUENT_CHECK;
2873} 2937}
… …
3565 3629
3566 EV_FREQUENT_CHECK; 3630 EV_FREQUENT_CHECK;
3567} 3631}
3568#endif 3632#endif
3569 3633
3634#if EV_CLEANUP_ENABLE
3635void
3636ev_cleanup_start (EV_P_ ev_cleanup *w)
3637{
3638 if (expect_false (ev_is_active (w)))
3639 return;
3640
3641 EV_FREQUENT_CHECK;
3642
3643 ev_start (EV_A_ (W)w, ++cleanupcnt);
3644 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3645 cleanups [cleanupcnt - 1] = w;
3646
3647 /* cleanup watchers should never keep a refcount on the loop */
3648 ev_unref (EV_A);
3649 EV_FREQUENT_CHECK;
3650}
3651
3652void
3653ev_cleanup_stop (EV_P_ ev_cleanup *w)
3654{
3655 clear_pending (EV_A_ (W)w);
3656 if (expect_false (!ev_is_active (w)))
3657 return;
3658
3659 EV_FREQUENT_CHECK;
3660 ev_ref (EV_A);
3661
3662 {
3663 int active = ev_active (w);
3664
3665 cleanups [active - 1] = cleanups [--cleanupcnt];
3666 ev_active (cleanups [active - 1]) = active;
3667 }
3668
3669 ev_stop (EV_A_ (W)w);
3670
3671 EV_FREQUENT_CHECK;
3672}
3673#endif
3674
3570#if EV_ASYNC_ENABLE 3675#if EV_ASYNC_ENABLE
3571void 3676void
3572ev_async_start (EV_P_ ev_async *w) 3677ev_async_start (EV_P_ ev_async *w)
3573{ 3678{
3574 if (expect_false (ev_is_active (w))) 3679 if (expect_false (ev_is_active (w)))

Diff Legend

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