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

Comparing libev/ev.c (file contents):
Revision 1.354 by root, Fri Oct 22 09:24:11 2010 UTC vs.
Revision 1.370 by root, Sun Jan 30 19:05:41 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
387# include <sys/utsname.h>
388# include <sys/statfs.h> 388# include <sys/statfs.h>
389# include <sys/inotify.h> 389# include <sys/inotify.h>
390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
391# ifndef IN_DONT_FOLLOW 391# ifndef IN_DONT_FOLLOW
392# undef EV_USE_INOTIFY 392# undef EV_USE_INOTIFY
… …
523# include "ev_win32.c" 523# include "ev_win32.c"
524#endif 524#endif
525 525
526/*****************************************************************************/ 526/*****************************************************************************/
527 527
528#ifdef __linux
529# include <sys/utsname.h>
530#endif
531
532static unsigned int noinline
533ev_linux_version (void)
534{
535#ifdef __linux
536 unsigned int v = 0;
537 struct utsname buf;
538 int i;
539 char *p = buf.release;
540
541 if (uname (&buf))
542 return 0;
543
544 for (i = 3+1; --i; )
545 {
546 unsigned int c = 0;
547
548 for (;;)
549 {
550 if (*p >= '0' && *p <= '9')
551 c = c * 10 + *p++ - '0';
552 else
553 {
554 p += *p == '.';
555 break;
556 }
557 }
558
559 v = (v << 8) | c;
560 }
561
562 return v;
563#else
564 return 0;
565#endif
566}
567
568/*****************************************************************************/
569
528#if EV_AVOID_STDIO 570#if EV_AVOID_STDIO
529static void noinline 571static void noinline
530ev_printerr (const char *msg) 572ev_printerr (const char *msg)
531{ 573{
532 write (STDERR_FILENO, msg, strlen (msg)); 574 write (STDERR_FILENO, msg, strlen (msg));
… …
550 if (syserr_cb) 592 if (syserr_cb)
551 syserr_cb (msg); 593 syserr_cb (msg);
552 else 594 else
553 { 595 {
554#if EV_AVOID_STDIO 596#if EV_AVOID_STDIO
555 const char *err = strerror (errno);
556
557 ev_printerr (msg); 597 ev_printerr (msg);
558 ev_printerr (": "); 598 ev_printerr (": ");
559 ev_printerr (err); 599 ev_printerr (strerror (errno));
560 ev_printerr ("\n"); 600 ev_printerr ("\n");
561#else 601#else
562 perror (msg); 602 perror (msg);
563#endif 603#endif
564 abort (); 604 abort ();
… …
598 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
599 639
600 if (!ptr && size) 640 if (!ptr && size)
601 { 641 {
602#if EV_AVOID_STDIO 642#if EV_AVOID_STDIO
603 ev_printerr ("libev: memory allocation failed, aborting.\n"); 643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
604#else 644#else
605 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
606#endif 646#endif
607 abort (); 647 abort ();
608 } 648 }
609 649
610 return ptr; 650 return ptr;
… …
627 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 */
628 unsigned char unused; 668 unsigned char unused;
629#if EV_USE_EPOLL 669#if EV_USE_EPOLL
630 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
631#endif 671#endif
632#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
633 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
634#endif 677#endif
635} ANFD; 678} ANFD;
636 679
637/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
638typedef struct 681typedef struct
… …
773 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
774#endif 817#endif
775 } 818 }
776} 819}
777 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
778/*****************************************************************************/ 829/*****************************************************************************/
779 830
780#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 */
781 832
782/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
… …
934 unsigned char o_events = anfd->events; 985 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify; 986 unsigned char o_reify = anfd->reify;
936 987
937 anfd->reify = 0; 988 anfd->reify = 0;
938 989
939#if EV_SELECT_IS_WINSOCKET 990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
940 if (o_reify & EV__IOFDSET) 991 if (o_reify & EV__IOFDSET)
941 { 992 {
942 unsigned long arg; 993 unsigned long arg;
943 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
944 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
945 } 997 }
946#endif 998#endif
947 999
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
949 { 1001 {
… …
1300 char dummy; 1352 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1302 read (evpipe [0], &dummy, 1); 1354 read (evpipe [0], &dummy, 1);
1303 } 1355 }
1304 1356
1357#if EV_SIGNAL_ENABLE
1305 if (sig_pending) 1358 if (sig_pending)
1306 { 1359 {
1307 sig_pending = 0; 1360 sig_pending = 0;
1308 1361
1309 for (i = EV_NSIG - 1; i--; ) 1362 for (i = EV_NSIG - 1; i--; )
1310 if (expect_false (signals [i].pending)) 1363 if (expect_false (signals [i].pending))
1311 ev_feed_signal_event (EV_A_ i + 1); 1364 ev_feed_signal_event (EV_A_ i + 1);
1312 } 1365 }
1366#endif
1313 1367
1314#if EV_ASYNC_ENABLE 1368#if EV_ASYNC_ENABLE
1315 if (async_pending) 1369 if (async_pending)
1316 { 1370 {
1317 async_pending = 0; 1371 async_pending = 0;
… …
1326#endif 1380#endif
1327} 1381}
1328 1382
1329/*****************************************************************************/ 1383/*****************************************************************************/
1330 1384
1385void
1386ev_feed_signal (int signum)
1387{
1388#if EV_MULTIPLICITY
1389 EV_P = signals [signum - 1].loop;
1390
1391 if (!EV_A)
1392 return;
1393#endif
1394
1395 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending);
1397}
1398
1331static void 1399static void
1332ev_sighandler (int signum) 1400ev_sighandler (int signum)
1333{ 1401{
1334#if EV_MULTIPLICITY
1335 EV_P = signals [signum - 1].loop;
1336#endif
1337
1338#ifdef _WIN32 1402#ifdef _WIN32
1339 signal (signum, ev_sighandler); 1403 signal (signum, ev_sighandler);
1340#endif 1404#endif
1341 1405
1342 signals [signum - 1].pending = 1; 1406 ev_feed_signal (signum);
1343 evpipe_write (EV_A_ &sig_pending);
1344} 1407}
1345 1408
1346void noinline 1409void noinline
1347ev_feed_signal_event (EV_P_ int signum) 1410ev_feed_signal_event (EV_P_ int signum)
1348{ 1411{
… …
1448 1511
1449#endif 1512#endif
1450 1513
1451/*****************************************************************************/ 1514/*****************************************************************************/
1452 1515
1516#if EV_USE_IOCP
1517# include "ev_iocp.c"
1518#endif
1453#if EV_USE_PORT 1519#if EV_USE_PORT
1454# include "ev_port.c" 1520# include "ev_port.c"
1455#endif 1521#endif
1456#if EV_USE_KQUEUE 1522#if EV_USE_KQUEUE
1457# include "ev_kqueue.c" 1523# include "ev_kqueue.c"
… …
1530ev_embeddable_backends (void) 1596ev_embeddable_backends (void)
1531{ 1597{
1532 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1533 1599
1534 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1600 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1535 /* please fix it and tell me how to detect the fix */ 1601 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1536 flags &= ~EVBACKEND_EPOLL; 1602 flags &= ~EVBACKEND_EPOLL;
1537 1603
1538 return flags; 1604 return flags;
1539} 1605}
1540 1606
1541unsigned int 1607unsigned int
… …
1597static void noinline 1663static void noinline
1598loop_init (EV_P_ unsigned int flags) 1664loop_init (EV_P_ unsigned int flags)
1599{ 1665{
1600 if (!backend) 1666 if (!backend)
1601 { 1667 {
1668 origflags = flags;
1669
1602#if EV_USE_REALTIME 1670#if EV_USE_REALTIME
1603 if (!have_realtime) 1671 if (!have_realtime)
1604 { 1672 {
1605 struct timespec ts; 1673 struct timespec ts;
1606 1674
… …
1651#endif 1719#endif
1652#if EV_USE_SIGNALFD 1720#if EV_USE_SIGNALFD
1653 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1654#endif 1722#endif
1655 1723
1656 if (!(flags & 0x0000ffffU)) 1724 if (!(flags & EVBACKEND_MASK))
1657 flags |= ev_recommended_backends (); 1725 flags |= ev_recommended_backends ();
1658 1726
1727#if EV_USE_IOCP
1728 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1729#endif
1659#if EV_USE_PORT 1730#if EV_USE_PORT
1660 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1731 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1661#endif 1732#endif
1662#if EV_USE_KQUEUE 1733#if EV_USE_KQUEUE
1663 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1734 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1680#endif 1751#endif
1681 } 1752 }
1682} 1753}
1683 1754
1684/* free up a loop structure */ 1755/* free up a loop structure */
1685static void noinline 1756void
1686loop_destroy (EV_P) 1757ev_loop_destroy (EV_P)
1687{ 1758{
1688 int i; 1759 int i;
1760
1761#if EV_MULTIPLICITY
1762 /* mimic free (0) */
1763 if (!EV_A)
1764 return;
1765#endif
1766
1767#if EV_CLEANUP_ENABLE
1768 /* queue cleanup watchers (and execute them) */
1769 if (expect_false (cleanupcnt))
1770 {
1771 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1772 EV_INVOKE_PENDING;
1773 }
1774#endif
1775
1776#if EV_CHILD_ENABLE
1777 if (ev_is_active (&childev))
1778 {
1779 ev_ref (EV_A); /* child watcher */
1780 ev_signal_stop (EV_A_ &childev);
1781 }
1782#endif
1689 1783
1690 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1691 { 1785 {
1692 /*ev_ref (EV_A);*/ 1786 /*ev_ref (EV_A);*/
1693 /*ev_io_stop (EV_A_ &pipe_w);*/ 1787 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1715#endif 1809#endif
1716 1810
1717 if (backend_fd >= 0) 1811 if (backend_fd >= 0)
1718 close (backend_fd); 1812 close (backend_fd);
1719 1813
1814#if EV_USE_IOCP
1815 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1816#endif
1720#if EV_USE_PORT 1817#if EV_USE_PORT
1721 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1818 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1722#endif 1819#endif
1723#if EV_USE_KQUEUE 1820#if EV_USE_KQUEUE
1724 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1821 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1751 array_free (periodic, EMPTY); 1848 array_free (periodic, EMPTY);
1752#endif 1849#endif
1753#if EV_FORK_ENABLE 1850#if EV_FORK_ENABLE
1754 array_free (fork, EMPTY); 1851 array_free (fork, EMPTY);
1755#endif 1852#endif
1853#if EV_CLEANUP_ENABLE
1854 array_free (cleanup, EMPTY);
1855#endif
1756 array_free (prepare, EMPTY); 1856 array_free (prepare, EMPTY);
1757 array_free (check, EMPTY); 1857 array_free (check, EMPTY);
1758#if EV_ASYNC_ENABLE 1858#if EV_ASYNC_ENABLE
1759 array_free (async, EMPTY); 1859 array_free (async, EMPTY);
1760#endif 1860#endif
1761 1861
1762 backend = 0; 1862 backend = 0;
1863
1864#if EV_MULTIPLICITY
1865 if (ev_is_default_loop (EV_A))
1866#endif
1867 ev_default_loop_ptr = 0;
1868#if EV_MULTIPLICITY
1869 else
1870 ev_free (EV_A);
1871#endif
1763} 1872}
1764 1873
1765#if EV_USE_INOTIFY 1874#if EV_USE_INOTIFY
1766inline_size void infy_fork (EV_P); 1875inline_size void infy_fork (EV_P);
1767#endif 1876#endif
… …
1826 loop_init (EV_A_ flags); 1935 loop_init (EV_A_ flags);
1827 1936
1828 if (ev_backend (EV_A)) 1937 if (ev_backend (EV_A))
1829 return EV_A; 1938 return EV_A;
1830 1939
1940 ev_free (EV_A);
1831 return 0; 1941 return 0;
1832} 1942}
1833 1943
1834void
1835ev_loop_destroy (EV_P)
1836{
1837 loop_destroy (EV_A);
1838 ev_free (loop);
1839}
1840
1841void
1842ev_loop_fork (EV_P)
1843{
1844 postfork = 1; /* must be in line with ev_default_fork */
1845}
1846#endif /* multiplicity */ 1944#endif /* multiplicity */
1847 1945
1848#if EV_VERIFY 1946#if EV_VERIFY
1849static void noinline 1947static void noinline
1850verify_watcher (EV_P_ W w) 1948verify_watcher (EV_P_ W w)
… …
1925#if EV_FORK_ENABLE 2023#if EV_FORK_ENABLE
1926 assert (forkmax >= forkcnt); 2024 assert (forkmax >= forkcnt);
1927 array_verify (EV_A_ (W *)forks, forkcnt); 2025 array_verify (EV_A_ (W *)forks, forkcnt);
1928#endif 2026#endif
1929 2027
2028#if EV_CLEANUP_ENABLE
2029 assert (cleanupmax >= cleanupcnt);
2030 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2031#endif
2032
1930#if EV_ASYNC_ENABLE 2033#if EV_ASYNC_ENABLE
1931 assert (asyncmax >= asynccnt); 2034 assert (asyncmax >= asynccnt);
1932 array_verify (EV_A_ (W *)asyncs, asynccnt); 2035 array_verify (EV_A_ (W *)asyncs, asynccnt);
1933#endif 2036#endif
1934 2037
… …
1952} 2055}
1953#endif 2056#endif
1954 2057
1955#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1956struct ev_loop * 2059struct ev_loop *
1957ev_default_loop_init (unsigned int flags)
1958#else 2060#else
1959int 2061int
2062#endif
1960ev_default_loop (unsigned int flags) 2063ev_default_loop (unsigned int flags)
1961#endif
1962{ 2064{
1963 if (!ev_default_loop_ptr) 2065 if (!ev_default_loop_ptr)
1964 { 2066 {
1965#if EV_MULTIPLICITY 2067#if EV_MULTIPLICITY
1966 EV_P = ev_default_loop_ptr = &default_loop_struct; 2068 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1985 2087
1986 return ev_default_loop_ptr; 2088 return ev_default_loop_ptr;
1987} 2089}
1988 2090
1989void 2091void
1990ev_default_destroy (void) 2092ev_loop_fork (EV_P)
1991{ 2093{
1992#if EV_MULTIPLICITY
1993 EV_P = ev_default_loop_ptr;
1994#endif
1995
1996 ev_default_loop_ptr = 0;
1997
1998#if EV_CHILD_ENABLE
1999 ev_ref (EV_A); /* child watcher */
2000 ev_signal_stop (EV_A_ &childev);
2001#endif
2002
2003 loop_destroy (EV_A);
2004}
2005
2006void
2007ev_default_fork (void)
2008{
2009#if EV_MULTIPLICITY
2010 EV_P = ev_default_loop_ptr;
2011#endif
2012
2013 postfork = 1; /* must be in line with ev_loop_fork */ 2094 postfork = 1; /* must be in line with ev_default_fork */
2014} 2095}
2015 2096
2016/*****************************************************************************/ 2097/*****************************************************************************/
2017 2098
2018void 2099void
… …
2040 2121
2041 for (pri = NUMPRI; pri--; ) 2122 for (pri = NUMPRI; pri--; )
2042 while (pendingcnt [pri]) 2123 while (pendingcnt [pri])
2043 { 2124 {
2044 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2125 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2045
2046 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2047 /* ^ this is no longer true, as pending_w could be here */
2048 2126
2049 p->w->pending = 0; 2127 p->w->pending = 0;
2050 EV_CB_INVOKE (p->w, p->events); 2128 EV_CB_INVOKE (p->w, p->events);
2051 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
2052 } 2130 }
… …
2114 feed_reverse_done (EV_A_ EV_TIMER); 2192 feed_reverse_done (EV_A_ EV_TIMER);
2115 } 2193 }
2116} 2194}
2117 2195
2118#if EV_PERIODIC_ENABLE 2196#if EV_PERIODIC_ENABLE
2197
2198inline_speed
2199periodic_recalc (EV_P_ ev_periodic *w)
2200{
2201 /* TODO: use slow but potentially more correct incremental algo, */
2202 /* also do not rely on ceil */
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2204}
2205
2119/* make periodics pending */ 2206/* make periodics pending */
2120inline_size void 2207inline_size void
2121periodics_reify (EV_P) 2208periodics_reify (EV_P)
2122{ 2209{
2123 EV_FREQUENT_CHECK; 2210 EV_FREQUENT_CHECK;
… …
2142 ANHE_at_cache (periodics [HEAP0]); 2229 ANHE_at_cache (periodics [HEAP0]);
2143 downheap (periodics, periodiccnt, HEAP0); 2230 downheap (periodics, periodiccnt, HEAP0);
2144 } 2231 }
2145 else if (w->interval) 2232 else if (w->interval)
2146 { 2233 {
2147 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2234 periodic_recalc (EV_A_ w);
2235
2148 /* if next trigger time is not sufficiently in the future, put it there */ 2236 /* if next trigger time is not sufficiently in the future, put it there */
2149 /* this might happen because of floating point inexactness */ 2237 /* this might happen because of floating point inexactness */
2150 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2151 { 2239 {
2152 ev_at (w) += w->interval; 2240 ev_at (w) += w->interval;
… …
2186 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2274 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2187 2275
2188 if (w->reschedule_cb) 2276 if (w->reschedule_cb)
2189 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2277 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2190 else if (w->interval) 2278 else if (w->interval)
2191 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2279 periodic_recalc (EV_A_ w);
2192 2280
2193 ANHE_at_cache (periodics [i]); 2281 ANHE_at_cache (periodics [i]);
2194 } 2282 }
2195 2283
2196 reheap (periodics, periodiccnt); 2284 reheap (periodics, periodiccnt);
… …
2688 if (w->reschedule_cb) 2776 if (w->reschedule_cb)
2689 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2777 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2690 else if (w->interval) 2778 else if (w->interval)
2691 { 2779 {
2692 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.)); 2780 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2693 /* this formula differs from the one in periodic_reify because we do not always round up */ 2781 periodic_recalc (EV_A_ w);
2694 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2695 } 2782 }
2696 else 2783 else
2697 ev_at (w) = w->offset; 2784 ev_at (w) = w->offset;
2698 2785
2699 EV_FREQUENT_CHECK; 2786 EV_FREQUENT_CHECK;
… …
2820 sa.sa_handler = ev_sighandler; 2907 sa.sa_handler = ev_sighandler;
2821 sigfillset (&sa.sa_mask); 2908 sigfillset (&sa.sa_mask);
2822 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2909 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2823 sigaction (w->signum, &sa, 0); 2910 sigaction (w->signum, &sa, 0);
2824 2911
2912 if (origflags & EVFLAG_NOSIGMASK)
2913 {
2825 sigemptyset (&sa.sa_mask); 2914 sigemptyset (&sa.sa_mask);
2826 sigaddset (&sa.sa_mask, w->signum); 2915 sigaddset (&sa.sa_mask, w->signum);
2827 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2916 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2917 }
2828#endif 2918#endif
2829 } 2919 }
2830 2920
2831 EV_FREQUENT_CHECK; 2921 EV_FREQUENT_CHECK;
2832} 2922}
… …
3048 { 3138 {
3049 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3139 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3050 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3140 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3051 ofs += sizeof (struct inotify_event) + ev->len; 3141 ofs += sizeof (struct inotify_event) + ev->len;
3052 } 3142 }
3053}
3054
3055inline_size unsigned int
3056ev_linux_version (void)
3057{
3058 struct utsname buf;
3059 unsigned int v;
3060 int i;
3061 char *p = buf.release;
3062
3063 if (uname (&buf))
3064 return 0;
3065
3066 for (i = 3+1; --i; )
3067 {
3068 unsigned int c = 0;
3069
3070 for (;;)
3071 {
3072 if (*p >= '0' && *p <= '9')
3073 c = c * 10 + *p++ - '0';
3074 else
3075 {
3076 p += *p == '.';
3077 break;
3078 }
3079 }
3080
3081 v = (v << 8) | c;
3082 }
3083
3084 return v;
3085} 3143}
3086 3144
3087inline_size void 3145inline_size void
3088ev_check_2625 (EV_P) 3146ev_check_2625 (EV_P)
3089{ 3147{
… …
3556 3614
3557 EV_FREQUENT_CHECK; 3615 EV_FREQUENT_CHECK;
3558} 3616}
3559#endif 3617#endif
3560 3618
3619#if EV_CLEANUP_ENABLE
3620void
3621ev_cleanup_start (EV_P_ ev_cleanup *w)
3622{
3623 if (expect_false (ev_is_active (w)))
3624 return;
3625
3626 EV_FREQUENT_CHECK;
3627
3628 ev_start (EV_A_ (W)w, ++cleanupcnt);
3629 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3630 cleanups [cleanupcnt - 1] = w;
3631
3632 /* cleanup watchers should never keep a refcount on the loop */
3633 ev_unref (EV_A);
3634 EV_FREQUENT_CHECK;
3635}
3636
3637void
3638ev_cleanup_stop (EV_P_ ev_cleanup *w)
3639{
3640 clear_pending (EV_A_ (W)w);
3641 if (expect_false (!ev_is_active (w)))
3642 return;
3643
3644 EV_FREQUENT_CHECK;
3645 ev_ref (EV_A);
3646
3647 {
3648 int active = ev_active (w);
3649
3650 cleanups [active - 1] = cleanups [--cleanupcnt];
3651 ev_active (cleanups [active - 1]) = active;
3652 }
3653
3654 ev_stop (EV_A_ (W)w);
3655
3656 EV_FREQUENT_CHECK;
3657}
3658#endif
3659
3561#if EV_ASYNC_ENABLE 3660#if EV_ASYNC_ENABLE
3562void 3661void
3563ev_async_start (EV_P_ ev_async *w) 3662ev_async_start (EV_P_ ev_async *w)
3564{ 3663{
3565 if (expect_false (ev_is_active (w))) 3664 if (expect_false (ev_is_active (w)))

Diff Legend

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