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

Comparing libev/ev.c (file contents):
Revision 1.355 by root, Fri Oct 22 10:09:12 2010 UTC vs.
Revision 1.372 by root, Wed Feb 16 08:02:50 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 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
… …
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
528static unsigned int noinline 532static unsigned int noinline
529ev_linux_version (void) 533ev_linux_version (void)
530{ 534{
531#ifdef __linux 535#ifdef __linux
536 unsigned int v = 0;
532 struct utsname buf; 537 struct utsname buf;
533 unsigned int v;
534 int i; 538 int i;
535 char *p = buf.release; 539 char *p = buf.release;
536 540
537 if (uname (&buf)) 541 if (uname (&buf))
538 return 0; 542 return 0;
… …
588 if (syserr_cb) 592 if (syserr_cb)
589 syserr_cb (msg); 593 syserr_cb (msg);
590 else 594 else
591 { 595 {
592#if EV_AVOID_STDIO 596#if EV_AVOID_STDIO
593 const char *err = strerror (errno);
594
595 ev_printerr (msg); 597 ev_printerr (msg);
596 ev_printerr (": "); 598 ev_printerr (": ");
597 ev_printerr (err); 599 ev_printerr (strerror (errno));
598 ev_printerr ("\n"); 600 ev_printerr ("\n");
599#else 601#else
600 perror (msg); 602 perror (msg);
601#endif 603#endif
602 abort (); 604 abort ();
… …
636 ptr = alloc (ptr, size); 638 ptr = alloc (ptr, size);
637 639
638 if (!ptr && size) 640 if (!ptr && size)
639 { 641 {
640#if EV_AVOID_STDIO 642#if EV_AVOID_STDIO
641 ev_printerr ("libev: memory allocation failed, aborting.\n"); 643 ev_printerr ("(libev) memory allocation failed, aborting.\n");
642#else 644#else
643 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 645 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
644#endif 646#endif
645 abort (); 647 abort ();
646 } 648 }
647 649
648 return ptr; 650 return ptr;
… …
665 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 */
666 unsigned char unused; 668 unsigned char unused;
667#if EV_USE_EPOLL 669#if EV_USE_EPOLL
668 unsigned int egen; /* generation counter to counter epoll bugs */ 670 unsigned int egen; /* generation counter to counter epoll bugs */
669#endif 671#endif
670#if EV_SELECT_IS_WINSOCKET 672#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
671 SOCKET handle; 673 SOCKET handle;
674#endif
675#if EV_USE_IOCP
676 OVERLAPPED or, ow;
672#endif 677#endif
673} ANFD; 678} ANFD;
674 679
675/* stores the pending event set for a given watcher */ 680/* stores the pending event set for a given watcher */
676typedef struct 681typedef struct
… …
811 select (0, 0, 0, 0, &tv); 816 select (0, 0, 0, 0, &tv);
812#endif 817#endif
813 } 818 }
814} 819}
815 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
816/*****************************************************************************/ 829/*****************************************************************************/
817 830
818#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 */
819 832
820/* find a suitable new size for the given array, */ 833/* find a suitable new size for the given array, */
… …
961inline_size void 974inline_size void
962fd_reify (EV_P) 975fd_reify (EV_P)
963{ 976{
964 int i; 977 int i;
965 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
966 for (i = 0; i < fdchangecnt; ++i) 1004 for (i = 0; i < fdchangecnt; ++i)
967 { 1005 {
968 int fd = fdchanges [i]; 1006 int fd = fdchanges [i];
969 ANFD *anfd = anfds + fd; 1007 ANFD *anfd = anfds + fd;
970 ev_io *w; 1008 ev_io *w;
971 1009
972 unsigned char o_events = anfd->events; 1010 unsigned char o_events = anfd->events;
973 unsigned char o_reify = anfd->reify; 1011 unsigned char o_reify = anfd->reify;
974 1012
975 anfd->reify = 0; 1013 anfd->reify = 0;
976
977#if EV_SELECT_IS_WINSOCKET
978 if (o_reify & EV__IOFDSET)
979 {
980 unsigned long arg;
981 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
982 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
983 }
984#endif
985 1014
986 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1015 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
987 { 1016 {
988 anfd->events = 0; 1017 anfd->events = 0;
989 1018
… …
1338 char dummy; 1367 char dummy;
1339 /* 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 */
1340 read (evpipe [0], &dummy, 1); 1369 read (evpipe [0], &dummy, 1);
1341 } 1370 }
1342 1371
1372#if EV_SIGNAL_ENABLE
1343 if (sig_pending) 1373 if (sig_pending)
1344 { 1374 {
1345 sig_pending = 0; 1375 sig_pending = 0;
1346 1376
1347 for (i = EV_NSIG - 1; i--; ) 1377 for (i = EV_NSIG - 1; i--; )
1348 if (expect_false (signals [i].pending)) 1378 if (expect_false (signals [i].pending))
1349 ev_feed_signal_event (EV_A_ i + 1); 1379 ev_feed_signal_event (EV_A_ i + 1);
1350 } 1380 }
1381#endif
1351 1382
1352#if EV_ASYNC_ENABLE 1383#if EV_ASYNC_ENABLE
1353 if (async_pending) 1384 if (async_pending)
1354 { 1385 {
1355 async_pending = 0; 1386 async_pending = 0;
… …
1364#endif 1395#endif
1365} 1396}
1366 1397
1367/*****************************************************************************/ 1398/*****************************************************************************/
1368 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
1369static void 1414static void
1370ev_sighandler (int signum) 1415ev_sighandler (int signum)
1371{ 1416{
1372#if EV_MULTIPLICITY
1373 EV_P = signals [signum - 1].loop;
1374#endif
1375
1376#ifdef _WIN32 1417#ifdef _WIN32
1377 signal (signum, ev_sighandler); 1418 signal (signum, ev_sighandler);
1378#endif 1419#endif
1379 1420
1380 signals [signum - 1].pending = 1; 1421 ev_feed_signal (signum);
1381 evpipe_write (EV_A_ &sig_pending);
1382} 1422}
1383 1423
1384void noinline 1424void noinline
1385ev_feed_signal_event (EV_P_ int signum) 1425ev_feed_signal_event (EV_P_ int signum)
1386{ 1426{
… …
1486 1526
1487#endif 1527#endif
1488 1528
1489/*****************************************************************************/ 1529/*****************************************************************************/
1490 1530
1531#if EV_USE_IOCP
1532# include "ev_iocp.c"
1533#endif
1491#if EV_USE_PORT 1534#if EV_USE_PORT
1492# include "ev_port.c" 1535# include "ev_port.c"
1493#endif 1536#endif
1494#if EV_USE_KQUEUE 1537#if EV_USE_KQUEUE
1495# include "ev_kqueue.c" 1538# include "ev_kqueue.c"
… …
1635static void noinline 1678static void noinline
1636loop_init (EV_P_ unsigned int flags) 1679loop_init (EV_P_ unsigned int flags)
1637{ 1680{
1638 if (!backend) 1681 if (!backend)
1639 { 1682 {
1683 origflags = flags;
1684
1640#if EV_USE_REALTIME 1685#if EV_USE_REALTIME
1641 if (!have_realtime) 1686 if (!have_realtime)
1642 { 1687 {
1643 struct timespec ts; 1688 struct timespec ts;
1644 1689
… …
1689#endif 1734#endif
1690#if EV_USE_SIGNALFD 1735#if EV_USE_SIGNALFD
1691 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1736 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1692#endif 1737#endif
1693 1738
1694 if (!(flags & 0x0000ffffU)) 1739 if (!(flags & EVBACKEND_MASK))
1695 flags |= ev_recommended_backends (); 1740 flags |= ev_recommended_backends ();
1696 1741
1742#if EV_USE_IOCP
1743 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1744#endif
1697#if EV_USE_PORT 1745#if EV_USE_PORT
1698 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1746 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1699#endif 1747#endif
1700#if EV_USE_KQUEUE 1748#if EV_USE_KQUEUE
1701 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1749 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1718#endif 1766#endif
1719 } 1767 }
1720} 1768}
1721 1769
1722/* free up a loop structure */ 1770/* free up a loop structure */
1723static void noinline 1771void
1724loop_destroy (EV_P) 1772ev_loop_destroy (EV_P)
1725{ 1773{
1726 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
1727 1798
1728 if (ev_is_active (&pipe_w)) 1799 if (ev_is_active (&pipe_w))
1729 { 1800 {
1730 /*ev_ref (EV_A);*/ 1801 /*ev_ref (EV_A);*/
1731 /*ev_io_stop (EV_A_ &pipe_w);*/ 1802 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1753#endif 1824#endif
1754 1825
1755 if (backend_fd >= 0) 1826 if (backend_fd >= 0)
1756 close (backend_fd); 1827 close (backend_fd);
1757 1828
1829#if EV_USE_IOCP
1830 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1831#endif
1758#if EV_USE_PORT 1832#if EV_USE_PORT
1759 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1833 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1760#endif 1834#endif
1761#if EV_USE_KQUEUE 1835#if EV_USE_KQUEUE
1762 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1836 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1789 array_free (periodic, EMPTY); 1863 array_free (periodic, EMPTY);
1790#endif 1864#endif
1791#if EV_FORK_ENABLE 1865#if EV_FORK_ENABLE
1792 array_free (fork, EMPTY); 1866 array_free (fork, EMPTY);
1793#endif 1867#endif
1868#if EV_CLEANUP_ENABLE
1869 array_free (cleanup, EMPTY);
1870#endif
1794 array_free (prepare, EMPTY); 1871 array_free (prepare, EMPTY);
1795 array_free (check, EMPTY); 1872 array_free (check, EMPTY);
1796#if EV_ASYNC_ENABLE 1873#if EV_ASYNC_ENABLE
1797 array_free (async, EMPTY); 1874 array_free (async, EMPTY);
1798#endif 1875#endif
1799 1876
1800 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
1801} 1887}
1802 1888
1803#if EV_USE_INOTIFY 1889#if EV_USE_INOTIFY
1804inline_size void infy_fork (EV_P); 1890inline_size void infy_fork (EV_P);
1805#endif 1891#endif
… …
1864 loop_init (EV_A_ flags); 1950 loop_init (EV_A_ flags);
1865 1951
1866 if (ev_backend (EV_A)) 1952 if (ev_backend (EV_A))
1867 return EV_A; 1953 return EV_A;
1868 1954
1955 ev_free (EV_A);
1869 return 0; 1956 return 0;
1870} 1957}
1871 1958
1872void
1873ev_loop_destroy (EV_P)
1874{
1875 loop_destroy (EV_A);
1876 ev_free (loop);
1877}
1878
1879void
1880ev_loop_fork (EV_P)
1881{
1882 postfork = 1; /* must be in line with ev_default_fork */
1883}
1884#endif /* multiplicity */ 1959#endif /* multiplicity */
1885 1960
1886#if EV_VERIFY 1961#if EV_VERIFY
1887static void noinline 1962static void noinline
1888verify_watcher (EV_P_ W w) 1963verify_watcher (EV_P_ W w)
… …
1963#if EV_FORK_ENABLE 2038#if EV_FORK_ENABLE
1964 assert (forkmax >= forkcnt); 2039 assert (forkmax >= forkcnt);
1965 array_verify (EV_A_ (W *)forks, forkcnt); 2040 array_verify (EV_A_ (W *)forks, forkcnt);
1966#endif 2041#endif
1967 2042
2043#if EV_CLEANUP_ENABLE
2044 assert (cleanupmax >= cleanupcnt);
2045 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2046#endif
2047
1968#if EV_ASYNC_ENABLE 2048#if EV_ASYNC_ENABLE
1969 assert (asyncmax >= asynccnt); 2049 assert (asyncmax >= asynccnt);
1970 array_verify (EV_A_ (W *)asyncs, asynccnt); 2050 array_verify (EV_A_ (W *)asyncs, asynccnt);
1971#endif 2051#endif
1972 2052
… …
1990} 2070}
1991#endif 2071#endif
1992 2072
1993#if EV_MULTIPLICITY 2073#if EV_MULTIPLICITY
1994struct ev_loop * 2074struct ev_loop *
1995ev_default_loop_init (unsigned int flags)
1996#else 2075#else
1997int 2076int
2077#endif
1998ev_default_loop (unsigned int flags) 2078ev_default_loop (unsigned int flags)
1999#endif
2000{ 2079{
2001 if (!ev_default_loop_ptr) 2080 if (!ev_default_loop_ptr)
2002 { 2081 {
2003#if EV_MULTIPLICITY 2082#if EV_MULTIPLICITY
2004 EV_P = ev_default_loop_ptr = &default_loop_struct; 2083 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
2023 2102
2024 return ev_default_loop_ptr; 2103 return ev_default_loop_ptr;
2025} 2104}
2026 2105
2027void 2106void
2028ev_default_destroy (void) 2107ev_loop_fork (EV_P)
2029{ 2108{
2030#if EV_MULTIPLICITY
2031 EV_P = ev_default_loop_ptr;
2032#endif
2033
2034 ev_default_loop_ptr = 0;
2035
2036#if EV_CHILD_ENABLE
2037 ev_ref (EV_A); /* child watcher */
2038 ev_signal_stop (EV_A_ &childev);
2039#endif
2040
2041 loop_destroy (EV_A);
2042}
2043
2044void
2045ev_default_fork (void)
2046{
2047#if EV_MULTIPLICITY
2048 EV_P = ev_default_loop_ptr;
2049#endif
2050
2051 postfork = 1; /* must be in line with ev_loop_fork */ 2109 postfork = 1; /* must be in line with ev_default_fork */
2052} 2110}
2053 2111
2054/*****************************************************************************/ 2112/*****************************************************************************/
2055 2113
2056void 2114void
… …
2078 2136
2079 for (pri = NUMPRI; pri--; ) 2137 for (pri = NUMPRI; pri--; )
2080 while (pendingcnt [pri]) 2138 while (pendingcnt [pri])
2081 { 2139 {
2082 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2140 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2083
2084 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2085 /* ^ this is no longer true, as pending_w could be here */
2086 2141
2087 p->w->pending = 0; 2142 p->w->pending = 0;
2088 EV_CB_INVOKE (p->w, p->events); 2143 EV_CB_INVOKE (p->w, p->events);
2089 EV_FREQUENT_CHECK; 2144 EV_FREQUENT_CHECK;
2090 } 2145 }
… …
2152 feed_reverse_done (EV_A_ EV_TIMER); 2207 feed_reverse_done (EV_A_ EV_TIMER);
2153 } 2208 }
2154} 2209}
2155 2210
2156#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
2157/* make periodics pending */ 2221/* make periodics pending */
2158inline_size void 2222inline_size void
2159periodics_reify (EV_P) 2223periodics_reify (EV_P)
2160{ 2224{
2161 EV_FREQUENT_CHECK; 2225 EV_FREQUENT_CHECK;
… …
2180 ANHE_at_cache (periodics [HEAP0]); 2244 ANHE_at_cache (periodics [HEAP0]);
2181 downheap (periodics, periodiccnt, HEAP0); 2245 downheap (periodics, periodiccnt, HEAP0);
2182 } 2246 }
2183 else if (w->interval) 2247 else if (w->interval)
2184 { 2248 {
2185 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2249 periodic_recalc (EV_A_ w);
2250
2186 /* 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 */
2187 /* this might happen because of floating point inexactness */ 2252 /* this might happen because of floating point inexactness */
2188 if (ev_at (w) - ev_rt_now < TIME_EPSILON) 2253 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2189 { 2254 {
2190 ev_at (w) += w->interval; 2255 ev_at (w) += w->interval;
… …
2224 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]); 2289 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2225 2290
2226 if (w->reschedule_cb) 2291 if (w->reschedule_cb)
2227 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2292 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2228 else if (w->interval) 2293 else if (w->interval)
2229 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2294 periodic_recalc (EV_A_ w);
2230 2295
2231 ANHE_at_cache (periodics [i]); 2296 ANHE_at_cache (periodics [i]);
2232 } 2297 }
2233 2298
2234 reheap (periodics, periodiccnt); 2299 reheap (periodics, periodiccnt);
… …
2726 if (w->reschedule_cb) 2791 if (w->reschedule_cb)
2727 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2792 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2728 else if (w->interval) 2793 else if (w->interval)
2729 { 2794 {
2730 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.));
2731 /* this formula differs from the one in periodic_reify because we do not always round up */ 2796 periodic_recalc (EV_A_ w);
2732 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2733 } 2797 }
2734 else 2798 else
2735 ev_at (w) = w->offset; 2799 ev_at (w) = w->offset;
2736 2800
2737 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
… …
2858 sa.sa_handler = ev_sighandler; 2922 sa.sa_handler = ev_sighandler;
2859 sigfillset (&sa.sa_mask); 2923 sigfillset (&sa.sa_mask);
2860 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 */
2861 sigaction (w->signum, &sa, 0); 2925 sigaction (w->signum, &sa, 0);
2862 2926
2927 if (origflags & EVFLAG_NOSIGMASK)
2928 {
2863 sigemptyset (&sa.sa_mask); 2929 sigemptyset (&sa.sa_mask);
2864 sigaddset (&sa.sa_mask, w->signum); 2930 sigaddset (&sa.sa_mask, w->signum);
2865 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2931 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2932 }
2866#endif 2933#endif
2867 } 2934 }
2868 2935
2869 EV_FREQUENT_CHECK; 2936 EV_FREQUENT_CHECK;
2870} 2937}
… …
3011 if (!pend || pend == path) 3078 if (!pend || pend == path)
3012 break; 3079 break;
3013 3080
3014 *pend = 0; 3081 *pend = 0;
3015 w->wd = inotify_add_watch (fs_fd, path, mask); 3082 w->wd = inotify_add_watch (fs_fd, path, mask);
3016 } 3083 }
3017 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3084 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3018 } 3085 }
3019 } 3086 }
3020 3087
3021 if (w->wd >= 0) 3088 if (w->wd >= 0)
… …
3562 3629
3563 EV_FREQUENT_CHECK; 3630 EV_FREQUENT_CHECK;
3564} 3631}
3565#endif 3632#endif
3566 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
3567#if EV_ASYNC_ENABLE 3675#if EV_ASYNC_ENABLE
3568void 3676void
3569ev_async_start (EV_P_ ev_async *w) 3677ev_async_start (EV_P_ ev_async *w)
3570{ 3678{
3571 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