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

Comparing libev/ev.c (file contents):
Revision 1.258 by root, Sun Sep 7 18:15:12 2008 UTC vs.
Revision 1.278 by root, Tue Jan 6 19:46:56 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 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 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
… …
164# endif 176# endif
165#endif 177#endif
166 178
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
168 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 306# include <sys/select.h>
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
291# include <sys/inotify.h> 313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
292#endif 319#endif
293 320
294#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
295# include <winsock.h> 322# include <winsock.h>
323#endif
324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
296#endif 332#endif
297 333
298#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
299/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
300# include <stdint.h> 336# include <stdint.h>
… …
382{ 418{
383 syserr_cb = cb; 419 syserr_cb = cb;
384} 420}
385 421
386static void noinline 422static void noinline
387syserr (const char *msg) 423ev_syserr (const char *msg)
388{ 424{
389 if (!msg) 425 if (!msg)
390 msg = "(libev) system error"; 426 msg = "(libev) system error";
391 427
392 if (syserr_cb) 428 if (syserr_cb)
… …
443typedef struct 479typedef struct
444{ 480{
445 WL head; 481 WL head;
446 unsigned char events; 482 unsigned char events;
447 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
448#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 490 SOCKET handle;
450#endif 491#endif
451} ANFD; 492} ANFD;
452 493
… …
605{ 646{
606 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
607 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
608} 649}
609 650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
653
610#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
611 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
612 { \ 656 { \
613 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
614 (base) = (type *)array_realloc \ 658 (base) = (type *)array_realloc \
… …
656 for (i = 0; i < eventcnt; ++i) 700 for (i = 0; i < eventcnt; ++i)
657 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
658} 702}
659 703
660/*****************************************************************************/ 704/*****************************************************************************/
661
662void inline_size
663anfds_init (ANFD *base, int count)
664{
665 while (count--)
666 {
667 base->head = 0;
668 base->events = EV_NONE;
669 base->reify = 0;
670
671 ++base;
672 }
673}
674 705
675void inline_speed 706void inline_speed
676fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
677{ 708{
678 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
… …
717 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
719 #else 750 #else
720 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
721 #endif 752 #endif
722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 753 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
723 } 754 }
724#endif 755#endif
725 756
726 { 757 {
727 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
808 839
809 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
810 if (anfds [fd].events) 841 if (anfds [fd].events)
811 { 842 {
812 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
813 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
814 } 846 }
815} 847}
816 848
817/*****************************************************************************/ 849/*****************************************************************************/
… …
969static ANSIG *signals; 1001static ANSIG *signals;
970static int signalmax; 1002static int signalmax;
971 1003
972static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
973 1005
974void inline_size
975signals_init (ANSIG *base, int count)
976{
977 while (count--)
978 {
979 base->head = 0;
980 base->gotsig = 0;
981
982 ++base;
983 }
984}
985
986/*****************************************************************************/ 1006/*****************************************************************************/
987 1007
988void inline_speed 1008void inline_speed
989fd_intern (int fd) 1009fd_intern (int fd)
990{ 1010{
… …
1011 } 1031 }
1012 else 1032 else
1013#endif 1033#endif
1014 { 1034 {
1015 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1016 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1017 1037
1018 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1019 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1020 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1021 } 1041 }
… …
1111ev_feed_signal_event (EV_P_ int signum) 1131ev_feed_signal_event (EV_P_ int signum)
1112{ 1132{
1113 WL w; 1133 WL w;
1114 1134
1115#if EV_MULTIPLICITY 1135#if EV_MULTIPLICITY
1116 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1136 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1117#endif 1137#endif
1118 1138
1119 --signum; 1139 --signum;
1120 1140
1121 if (signum < 0 || signum >= signalmax) 1141 if (signum < 0 || signum >= signalmax)
… …
1250 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1251 /* it usually doesn't work correctly on anything but sockets and pipes */ 1271 /* it usually doesn't work correctly on anything but sockets and pipes */
1252 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1253#endif 1273#endif
1254#ifdef __APPLE__ 1274#ifdef __APPLE__
1255 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 /* only select works correctly on that "unix-certified" platform */
1256 flags &= ~EVBACKEND_POLL; 1276 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1277 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1257#endif 1278#endif
1258 1279
1259 return flags; 1280 return flags;
1260} 1281}
1261 1282
… …
1514 1535
1515#if EV_VERIFY 1536#if EV_VERIFY
1516static void noinline 1537static void noinline
1517verify_watcher (EV_P_ W w) 1538verify_watcher (EV_P_ W w)
1518{ 1539{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1540 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520 1541
1521 if (w->pending) 1542 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1543 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523} 1544}
1524 1545
1525static void noinline 1546static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N) 1547verify_heap (EV_P_ ANHE *heap, int N)
1527{ 1548{
1528 int i; 1549 int i;
1529 1550
1530 for (i = HEAP0; i < N + HEAP0; ++i) 1551 for (i = HEAP0; i < N + HEAP0; ++i)
1531 { 1552 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1553 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1554 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1555 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535 1556
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1557 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 } 1558 }
1538} 1559}
1539 1560
1540static void noinline 1561static void noinline
1541array_verify (EV_P_ W *ws, int cnt) 1562array_verify (EV_P_ W *ws, int cnt)
1542{ 1563{
1543 while (cnt--) 1564 while (cnt--)
1544 { 1565 {
1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1566 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]); 1567 verify_watcher (EV_A_ ws [cnt]);
1547 } 1568 }
1548} 1569}
1549#endif 1570#endif
1550 1571
… …
1557 1578
1558 assert (activecnt >= -1); 1579 assert (activecnt >= -1);
1559 1580
1560 assert (fdchangemax >= fdchangecnt); 1581 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i) 1582 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1583 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1563 1584
1564 assert (anfdmax >= 0); 1585 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i) 1586 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next) 1587 for (w = anfds [i].head; w; w = w->next)
1567 { 1588 {
1568 verify_watcher (EV_A_ (W)w); 1589 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1590 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1591 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 } 1592 }
1572 1593
1573 assert (timermax >= timercnt); 1594 assert (timermax >= timercnt);
1574 verify_heap (EV_A_ timers, timercnt); 1595 verify_heap (EV_A_ timers, timercnt);
1575 1596
… …
1652{ 1673{
1653#if EV_MULTIPLICITY 1674#if EV_MULTIPLICITY
1654 struct ev_loop *loop = ev_default_loop_ptr; 1675 struct ev_loop *loop = ev_default_loop_ptr;
1655#endif 1676#endif
1656 1677
1678 ev_default_loop_ptr = 0;
1679
1657#ifndef _WIN32 1680#ifndef _WIN32
1658 ev_ref (EV_A); /* child watcher */ 1681 ev_ref (EV_A); /* child watcher */
1659 ev_signal_stop (EV_A_ &childev); 1682 ev_signal_stop (EV_A_ &childev);
1660#endif 1683#endif
1661 1684
… …
1667{ 1690{
1668#if EV_MULTIPLICITY 1691#if EV_MULTIPLICITY
1669 struct ev_loop *loop = ev_default_loop_ptr; 1692 struct ev_loop *loop = ev_default_loop_ptr;
1670#endif 1693#endif
1671 1694
1672 if (backend)
1673 postfork = 1; /* must be in line with ev_loop_fork */ 1695 postfork = 1; /* must be in line with ev_loop_fork */
1674} 1696}
1675 1697
1676/*****************************************************************************/ 1698/*****************************************************************************/
1677 1699
1678void 1700void
… …
1691 { 1713 {
1692 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1714 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1693 1715
1694 if (expect_true (p->w)) 1716 if (expect_true (p->w))
1695 { 1717 {
1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1718 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1697 1719
1698 p->w->pending = 0; 1720 p->w->pending = 0;
1699 EV_CB_INVOKE (p->w, p->events); 1721 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK; 1722 EV_FREQUENT_CHECK;
1701 } 1723 }
… …
1732 1754
1733 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1755 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1734 { 1756 {
1735 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1757 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1736 1758
1737 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1759 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1738 1760
1739 /* first reschedule or stop timer */ 1761 /* first reschedule or stop timer */
1740 if (w->repeat) 1762 if (w->repeat)
1741 { 1763 {
1742 ev_at (w) += w->repeat; 1764 ev_at (w) += w->repeat;
1743 if (ev_at (w) < mn_now) 1765 if (ev_at (w) < mn_now)
1744 ev_at (w) = mn_now; 1766 ev_at (w) = mn_now;
1745 1767
1746 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1768 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1747 1769
1748 ANHE_at_cache (timers [HEAP0]); 1770 ANHE_at_cache (timers [HEAP0]);
1749 downheap (timers, timercnt, HEAP0); 1771 downheap (timers, timercnt, HEAP0);
1750 } 1772 }
1751 else 1773 else
… …
1764 1786
1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1787 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1766 { 1788 {
1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1789 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1768 1790
1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1791 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1770 1792
1771 /* first reschedule or stop timer */ 1793 /* first reschedule or stop timer */
1772 if (w->reschedule_cb) 1794 if (w->reschedule_cb)
1773 { 1795 {
1774 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1796 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1775 1797
1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1798 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1777 1799
1778 ANHE_at_cache (periodics [HEAP0]); 1800 ANHE_at_cache (periodics [HEAP0]);
1779 downheap (periodics, periodiccnt, HEAP0); 1801 downheap (periodics, periodiccnt, HEAP0);
1780 } 1802 }
1781 else if (w->interval) 1803 else if (w->interval)
… …
1909ev_unref (EV_P) 1931ev_unref (EV_P)
1910{ 1932{
1911 --activecnt; 1933 --activecnt;
1912} 1934}
1913 1935
1936void
1937ev_now_update (EV_P)
1938{
1939 time_update (EV_A_ 1e100);
1940}
1941
1914static int loop_done; 1942static int loop_done;
1915 1943
1916void 1944void
1917ev_loop (EV_P_ int flags) 1945ev_loop (EV_P_ int flags)
1918{ 1946{
… …
2126 int fd = w->fd; 2154 int fd = w->fd;
2127 2155
2128 if (expect_false (ev_is_active (w))) 2156 if (expect_false (ev_is_active (w)))
2129 return; 2157 return;
2130 2158
2131 assert (("ev_io_start called with negative fd", fd >= 0)); 2159 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2160 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2132 2161
2133 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
2134 2163
2135 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
2136 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2165 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2137 wlist_add (&anfds[fd].head, (WL)w); 2166 wlist_add (&anfds[fd].head, (WL)w);
2138 2167
2139 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2168 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2140 w->events &= ~EV_IOFDSET; 2169 w->events &= ~EV_IOFDSET;
2141 2170
… …
2147{ 2176{
2148 clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
2149 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
2150 return; 2179 return;
2151 2180
2152 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2181 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2153 2182
2154 EV_FREQUENT_CHECK; 2183 EV_FREQUENT_CHECK;
2155 2184
2156 wlist_del (&anfds[w->fd].head, (WL)w); 2185 wlist_del (&anfds[w->fd].head, (WL)w);
2157 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
… …
2167 if (expect_false (ev_is_active (w))) 2196 if (expect_false (ev_is_active (w)))
2168 return; 2197 return;
2169 2198
2170 ev_at (w) += mn_now; 2199 ev_at (w) += mn_now;
2171 2200
2172 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2201 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2173 2202
2174 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2175 2204
2176 ++timercnt; 2205 ++timercnt;
2177 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2206 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2180 ANHE_at_cache (timers [ev_active (w)]); 2209 ANHE_at_cache (timers [ev_active (w)]);
2181 upheap (timers, ev_active (w)); 2210 upheap (timers, ev_active (w));
2182 2211
2183 EV_FREQUENT_CHECK; 2212 EV_FREQUENT_CHECK;
2184 2213
2185 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2214 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2186} 2215}
2187 2216
2188void noinline 2217void noinline
2189ev_timer_stop (EV_P_ ev_timer *w) 2218ev_timer_stop (EV_P_ ev_timer *w)
2190{ 2219{
… …
2195 EV_FREQUENT_CHECK; 2224 EV_FREQUENT_CHECK;
2196 2225
2197 { 2226 {
2198 int active = ev_active (w); 2227 int active = ev_active (w);
2199 2228
2200 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2229 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2201 2230
2202 --timercnt; 2231 --timercnt;
2203 2232
2204 if (expect_true (active < timercnt + HEAP0)) 2233 if (expect_true (active < timercnt + HEAP0))
2205 { 2234 {
… …
2249 2278
2250 if (w->reschedule_cb) 2279 if (w->reschedule_cb)
2251 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2280 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2252 else if (w->interval) 2281 else if (w->interval)
2253 { 2282 {
2254 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2283 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2255 /* this formula differs from the one in periodic_reify because we do not always round up */ 2284 /* this formula differs from the one in periodic_reify because we do not always round up */
2256 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2285 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2257 } 2286 }
2258 else 2287 else
2259 ev_at (w) = w->offset; 2288 ev_at (w) = w->offset;
… …
2267 ANHE_at_cache (periodics [ev_active (w)]); 2296 ANHE_at_cache (periodics [ev_active (w)]);
2268 upheap (periodics, ev_active (w)); 2297 upheap (periodics, ev_active (w));
2269 2298
2270 EV_FREQUENT_CHECK; 2299 EV_FREQUENT_CHECK;
2271 2300
2272 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2301 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2273} 2302}
2274 2303
2275void noinline 2304void noinline
2276ev_periodic_stop (EV_P_ ev_periodic *w) 2305ev_periodic_stop (EV_P_ ev_periodic *w)
2277{ 2306{
… …
2282 EV_FREQUENT_CHECK; 2311 EV_FREQUENT_CHECK;
2283 2312
2284 { 2313 {
2285 int active = ev_active (w); 2314 int active = ev_active (w);
2286 2315
2287 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2316 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2288 2317
2289 --periodiccnt; 2318 --periodiccnt;
2290 2319
2291 if (expect_true (active < periodiccnt + HEAP0)) 2320 if (expect_true (active < periodiccnt + HEAP0))
2292 { 2321 {
… …
2315 2344
2316void noinline 2345void noinline
2317ev_signal_start (EV_P_ ev_signal *w) 2346ev_signal_start (EV_P_ ev_signal *w)
2318{ 2347{
2319#if EV_MULTIPLICITY 2348#if EV_MULTIPLICITY
2320 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2349 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2321#endif 2350#endif
2322 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
2323 return; 2352 return;
2324 2353
2325 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2354 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2326 2355
2327 evpipe_init (EV_A); 2356 evpipe_init (EV_A);
2328 2357
2329 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
2330 2359
… …
2333 sigset_t full, prev; 2362 sigset_t full, prev;
2334 sigfillset (&full); 2363 sigfillset (&full);
2335 sigprocmask (SIG_SETMASK, &full, &prev); 2364 sigprocmask (SIG_SETMASK, &full, &prev);
2336#endif 2365#endif
2337 2366
2338 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2367 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2339 2368
2340#ifndef _WIN32 2369#ifndef _WIN32
2341 sigprocmask (SIG_SETMASK, &prev, 0); 2370 sigprocmask (SIG_SETMASK, &prev, 0);
2342#endif 2371#endif
2343 } 2372 }
… …
2381 2410
2382void 2411void
2383ev_child_start (EV_P_ ev_child *w) 2412ev_child_start (EV_P_ ev_child *w)
2384{ 2413{
2385#if EV_MULTIPLICITY 2414#if EV_MULTIPLICITY
2386 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2415 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2387#endif 2416#endif
2388 if (expect_false (ev_is_active (w))) 2417 if (expect_false (ev_is_active (w)))
2389 return; 2418 return;
2390 2419
2391 EV_FREQUENT_CHECK; 2420 EV_FREQUENT_CHECK;
… …
2416# ifdef _WIN32 2445# ifdef _WIN32
2417# undef lstat 2446# undef lstat
2418# define lstat(a,b) _stati64 (a,b) 2447# define lstat(a,b) _stati64 (a,b)
2419# endif 2448# endif
2420 2449
2421#define DEF_STAT_INTERVAL 5.0074891 2450#define DEF_STAT_INTERVAL 5.0074891
2451#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2422#define MIN_STAT_INTERVAL 0.1074891 2452#define MIN_STAT_INTERVAL 0.1074891
2423 2453
2424static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2454static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2425 2455
2426#if EV_USE_INOTIFY 2456#if EV_USE_INOTIFY
2427# define EV_INOTIFY_BUFSIZE 8192 2457# define EV_INOTIFY_BUFSIZE 8192
… …
2431{ 2461{
2432 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2462 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2433 2463
2434 if (w->wd < 0) 2464 if (w->wd < 0)
2435 { 2465 {
2466 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2436 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2467 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2437 2468
2438 /* monitor some parent directory for speedup hints */ 2469 /* monitor some parent directory for speedup hints */
2439 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2470 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2440 /* but an efficiency issue only */ 2471 /* but an efficiency issue only */
2441 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2472 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2442 { 2473 {
2443 char path [4096]; 2474 char path [4096];
2444 strcpy (path, w->path); 2475 strcpy (path, w->path);
… …
2448 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2479 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2449 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2480 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2450 2481
2451 char *pend = strrchr (path, '/'); 2482 char *pend = strrchr (path, '/');
2452 2483
2453 if (!pend) 2484 if (!pend || pend == path)
2454 break; /* whoops, no '/', complain to your admin */ 2485 break;
2455 2486
2456 *pend = 0; 2487 *pend = 0;
2457 w->wd = inotify_add_watch (fs_fd, path, mask); 2488 w->wd = inotify_add_watch (fs_fd, path, mask);
2458 } 2489 }
2459 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2490 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2460 } 2491 }
2461 } 2492 }
2462 else
2463 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2464 2493
2465 if (w->wd >= 0) 2494 if (w->wd >= 0)
2495 {
2466 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2496 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2497
2498 /* now local changes will be tracked by inotify, but remote changes won't */
2499 /* unless the filesystem it known to be local, we therefore still poll */
2500 /* also do poll on <2.6.25, but with normal frequency */
2501 struct statfs sfs;
2502
2503 if (fs_2625 && !statfs (w->path, &sfs))
2504 if (sfs.f_type == 0x1373 /* devfs */
2505 || sfs.f_type == 0xEF53 /* ext2/3 */
2506 || sfs.f_type == 0x3153464a /* jfs */
2507 || sfs.f_type == 0x52654973 /* reiser3 */
2508 || sfs.f_type == 0x01021994 /* tempfs */
2509 || sfs.f_type == 0x58465342 /* xfs */)
2510 return;
2511
2512 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2513 ev_timer_again (EV_A_ &w->timer);
2514 }
2467} 2515}
2468 2516
2469static void noinline 2517static void noinline
2470infy_del (EV_P_ ev_stat *w) 2518infy_del (EV_P_ ev_stat *w)
2471{ 2519{
… …
2485 2533
2486static void noinline 2534static void noinline
2487infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2535infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2488{ 2536{
2489 if (slot < 0) 2537 if (slot < 0)
2490 /* overflow, need to check for all hahs slots */ 2538 /* overflow, need to check for all hash slots */
2491 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2539 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2492 infy_wd (EV_A_ slot, wd, ev); 2540 infy_wd (EV_A_ slot, wd, ev);
2493 else 2541 else
2494 { 2542 {
2495 WL w_; 2543 WL w_;
… …
2501 2549
2502 if (w->wd == wd || wd == -1) 2550 if (w->wd == wd || wd == -1)
2503 { 2551 {
2504 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2552 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2505 { 2553 {
2554 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506 w->wd = -1; 2555 w->wd = -1;
2507 infy_add (EV_A_ w); /* re-add, no matter what */ 2556 infy_add (EV_A_ w); /* re-add, no matter what */
2508 } 2557 }
2509 2558
2510 stat_timer_cb (EV_A_ &w->timer, 0); 2559 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2524 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2573 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2525 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2574 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526} 2575}
2527 2576
2528void inline_size 2577void inline_size
2578check_2625 (EV_P)
2579{
2580 /* kernels < 2.6.25 are borked
2581 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2582 */
2583 struct utsname buf;
2584 int major, minor, micro;
2585
2586 if (uname (&buf))
2587 return;
2588
2589 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2590 return;
2591
2592 if (major < 2
2593 || (major == 2 && minor < 6)
2594 || (major == 2 && minor == 6 && micro < 25))
2595 return;
2596
2597 fs_2625 = 1;
2598}
2599
2600void inline_size
2529infy_init (EV_P) 2601infy_init (EV_P)
2530{ 2602{
2531 if (fs_fd != -2) 2603 if (fs_fd != -2)
2532 return; 2604 return;
2605
2606 fs_fd = -1;
2607
2608 check_2625 (EV_A);
2533 2609
2534 fs_fd = inotify_init (); 2610 fs_fd = inotify_init ();
2535 2611
2536 if (fs_fd >= 0) 2612 if (fs_fd >= 0)
2537 { 2613 {
… …
2565 w->wd = -1; 2641 w->wd = -1;
2566 2642
2567 if (fs_fd >= 0) 2643 if (fs_fd >= 0)
2568 infy_add (EV_A_ w); /* re-add, no matter what */ 2644 infy_add (EV_A_ w); /* re-add, no matter what */
2569 else 2645 else
2570 ev_timer_start (EV_A_ &w->timer); 2646 ev_timer_again (EV_A_ &w->timer);
2571 } 2647 }
2572
2573 } 2648 }
2574} 2649}
2575 2650
2576#endif 2651#endif
2577 2652
… …
2613 || w->prev.st_atime != w->attr.st_atime 2688 || w->prev.st_atime != w->attr.st_atime
2614 || w->prev.st_mtime != w->attr.st_mtime 2689 || w->prev.st_mtime != w->attr.st_mtime
2615 || w->prev.st_ctime != w->attr.st_ctime 2690 || w->prev.st_ctime != w->attr.st_ctime
2616 ) { 2691 ) {
2617 #if EV_USE_INOTIFY 2692 #if EV_USE_INOTIFY
2693 if (fs_fd >= 0)
2694 {
2618 infy_del (EV_A_ w); 2695 infy_del (EV_A_ w);
2619 infy_add (EV_A_ w); 2696 infy_add (EV_A_ w);
2620 ev_stat_stat (EV_A_ w); /* avoid race... */ 2697 ev_stat_stat (EV_A_ w); /* avoid race... */
2698 }
2621 #endif 2699 #endif
2622 2700
2623 ev_feed_event (EV_A_ w, EV_STAT); 2701 ev_feed_event (EV_A_ w, EV_STAT);
2624 } 2702 }
2625} 2703}
… …
2628ev_stat_start (EV_P_ ev_stat *w) 2706ev_stat_start (EV_P_ ev_stat *w)
2629{ 2707{
2630 if (expect_false (ev_is_active (w))) 2708 if (expect_false (ev_is_active (w)))
2631 return; 2709 return;
2632 2710
2633 /* since we use memcmp, we need to clear any padding data etc. */
2634 memset (&w->prev, 0, sizeof (ev_statdata));
2635 memset (&w->attr, 0, sizeof (ev_statdata));
2636
2637 ev_stat_stat (EV_A_ w); 2711 ev_stat_stat (EV_A_ w);
2638 2712
2713 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2639 if (w->interval < MIN_STAT_INTERVAL) 2714 w->interval = MIN_STAT_INTERVAL;
2640 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2641 2715
2642 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2716 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2643 ev_set_priority (&w->timer, ev_priority (w)); 2717 ev_set_priority (&w->timer, ev_priority (w));
2644 2718
2645#if EV_USE_INOTIFY 2719#if EV_USE_INOTIFY
2646 infy_init (EV_A); 2720 infy_init (EV_A);
2647 2721
2648 if (fs_fd >= 0) 2722 if (fs_fd >= 0)
2649 infy_add (EV_A_ w); 2723 infy_add (EV_A_ w);
2650 else 2724 else
2651#endif 2725#endif
2652 ev_timer_start (EV_A_ &w->timer); 2726 ev_timer_again (EV_A_ &w->timer);
2653 2727
2654 ev_start (EV_A_ (W)w, 1); 2728 ev_start (EV_A_ (W)w, 1);
2655 2729
2656 EV_FREQUENT_CHECK; 2730 EV_FREQUENT_CHECK;
2657} 2731}
… …
2827 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2901 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2828 } 2902 }
2829 } 2903 }
2830} 2904}
2831 2905
2906static void
2907embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2908{
2909 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2910
2911 ev_embed_stop (EV_A_ w);
2912
2913 {
2914 struct ev_loop *loop = w->other;
2915
2916 ev_loop_fork (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2918 }
2919
2920 ev_embed_start (EV_A_ w);
2921}
2922
2832#if 0 2923#if 0
2833static void 2924static void
2834embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2925embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2835{ 2926{
2836 ev_idle_stop (EV_A_ idle); 2927 ev_idle_stop (EV_A_ idle);
… …
2843 if (expect_false (ev_is_active (w))) 2934 if (expect_false (ev_is_active (w)))
2844 return; 2935 return;
2845 2936
2846 { 2937 {
2847 struct ev_loop *loop = w->other; 2938 struct ev_loop *loop = w->other;
2848 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2939 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2849 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2940 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2850 } 2941 }
2851 2942
2852 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2853 2944
… …
2856 2947
2857 ev_prepare_init (&w->prepare, embed_prepare_cb); 2948 ev_prepare_init (&w->prepare, embed_prepare_cb);
2858 ev_set_priority (&w->prepare, EV_MINPRI); 2949 ev_set_priority (&w->prepare, EV_MINPRI);
2859 ev_prepare_start (EV_A_ &w->prepare); 2950 ev_prepare_start (EV_A_ &w->prepare);
2860 2951
2952 ev_fork_init (&w->fork, embed_fork_cb);
2953 ev_fork_start (EV_A_ &w->fork);
2954
2861 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2955 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2862 2956
2863 ev_start (EV_A_ (W)w, 1); 2957 ev_start (EV_A_ (W)w, 1);
2864 2958
2865 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
… …
2872 if (expect_false (!ev_is_active (w))) 2966 if (expect_false (!ev_is_active (w)))
2873 return; 2967 return;
2874 2968
2875 EV_FREQUENT_CHECK; 2969 EV_FREQUENT_CHECK;
2876 2970
2877 ev_io_stop (EV_A_ &w->io); 2971 ev_io_stop (EV_A_ &w->io);
2878 ev_prepare_stop (EV_A_ &w->prepare); 2972 ev_prepare_stop (EV_A_ &w->prepare);
2879 2973 ev_fork_stop (EV_A_ &w->fork);
2880 ev_stop (EV_A_ (W)w);
2881 2974
2882 EV_FREQUENT_CHECK; 2975 EV_FREQUENT_CHECK;
2883} 2976}
2884#endif 2977#endif
2885 2978
… …
2982once_cb (EV_P_ struct ev_once *once, int revents) 3075once_cb (EV_P_ struct ev_once *once, int revents)
2983{ 3076{
2984 void (*cb)(int revents, void *arg) = once->cb; 3077 void (*cb)(int revents, void *arg) = once->cb;
2985 void *arg = once->arg; 3078 void *arg = once->arg;
2986 3079
2987 ev_io_stop (EV_A_ &once->io); 3080 ev_io_stop (EV_A_ &once->io);
2988 ev_timer_stop (EV_A_ &once->to); 3081 ev_timer_stop (EV_A_ &once->to);
2989 ev_free (once); 3082 ev_free (once);
2990 3083
2991 cb (revents, arg); 3084 cb (revents, arg);
2992} 3085}
2993 3086
2994static void 3087static void
2995once_cb_io (EV_P_ ev_io *w, int revents) 3088once_cb_io (EV_P_ ev_io *w, int revents)
2996{ 3089{
2997 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3090 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3091
3092 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2998} 3093}
2999 3094
3000static void 3095static void
3001once_cb_to (EV_P_ ev_timer *w, int revents) 3096once_cb_to (EV_P_ ev_timer *w, int revents)
3002{ 3097{
3003 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3098 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3099
3100 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3004} 3101}
3005 3102
3006void 3103void
3007ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3104ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3008{ 3105{

Diff Legend

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