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

Comparing libev/ev.c (file contents):
Revision 1.264 by root, Mon Oct 13 23:20: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
… …
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
291# include <sys/utsname.h> 311# include <sys/utsname.h>
312# include <sys/statfs.h>
292# include <sys/inotify.h> 313# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 315# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 316# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 317# define EV_USE_INOTIFY 0
297# endif 318# endif
298#endif 319#endif
299 320
300#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
301# 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
302#endif 332#endif
303 333
304#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
305/* 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 */
306# include <stdint.h> 336# include <stdint.h>
… …
388{ 418{
389 syserr_cb = cb; 419 syserr_cb = cb;
390} 420}
391 421
392static void noinline 422static void noinline
393syserr (const char *msg) 423ev_syserr (const char *msg)
394{ 424{
395 if (!msg) 425 if (!msg)
396 msg = "(libev) system error"; 426 msg = "(libev) system error";
397 427
398 if (syserr_cb) 428 if (syserr_cb)
… …
449typedef struct 479typedef struct
450{ 480{
451 WL head; 481 WL head;
452 unsigned char events; 482 unsigned char events;
453 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
454#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
455 SOCKET handle; 490 SOCKET handle;
456#endif 491#endif
457} ANFD; 492} ANFD;
458 493
… …
611{ 646{
612 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
613 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
614} 649}
615 650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
653
616#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
617 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
618 { \ 656 { \
619 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
620 (base) = (type *)array_realloc \ 658 (base) = (type *)array_realloc \
… …
662 for (i = 0; i < eventcnt; ++i) 700 for (i = 0; i < eventcnt; ++i)
663 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
664} 702}
665 703
666/*****************************************************************************/ 704/*****************************************************************************/
667
668void inline_size
669anfds_init (ANFD *base, int count)
670{
671 while (count--)
672 {
673 base->head = 0;
674 base->events = EV_NONE;
675 base->reify = 0;
676
677 ++base;
678 }
679}
680 705
681void inline_speed 706void inline_speed
682fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
683{ 708{
684 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
… …
723 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
724 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
725 #else 750 #else
726 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
727 #endif 752 #endif
728 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));
729 } 754 }
730#endif 755#endif
731 756
732 { 757 {
733 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
814 839
815 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
816 if (anfds [fd].events) 841 if (anfds [fd].events)
817 { 842 {
818 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
819 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
820 } 846 }
821} 847}
822 848
823/*****************************************************************************/ 849/*****************************************************************************/
… …
975static ANSIG *signals; 1001static ANSIG *signals;
976static int signalmax; 1002static int signalmax;
977 1003
978static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
979 1005
980void inline_size
981signals_init (ANSIG *base, int count)
982{
983 while (count--)
984 {
985 base->head = 0;
986 base->gotsig = 0;
987
988 ++base;
989 }
990}
991
992/*****************************************************************************/ 1006/*****************************************************************************/
993 1007
994void inline_speed 1008void inline_speed
995fd_intern (int fd) 1009fd_intern (int fd)
996{ 1010{
… …
1017 } 1031 }
1018 else 1032 else
1019#endif 1033#endif
1020 { 1034 {
1021 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1022 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1023 1037
1024 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1025 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1026 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1027 } 1041 }
… …
1117ev_feed_signal_event (EV_P_ int signum) 1131ev_feed_signal_event (EV_P_ int signum)
1118{ 1132{
1119 WL w; 1133 WL w;
1120 1134
1121#if EV_MULTIPLICITY 1135#if EV_MULTIPLICITY
1122 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));
1123#endif 1137#endif
1124 1138
1125 --signum; 1139 --signum;
1126 1140
1127 if (signum < 0 || signum >= signalmax) 1141 if (signum < 0 || signum >= signalmax)
… …
1256 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1257 /* 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 */
1258 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1259#endif 1273#endif
1260#ifdef __APPLE__ 1274#ifdef __APPLE__
1261 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 /* only select works correctly on that "unix-certified" platform */
1262 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 */
1263#endif 1278#endif
1264 1279
1265 return flags; 1280 return flags;
1266} 1281}
1267 1282
… …
1520 1535
1521#if EV_VERIFY 1536#if EV_VERIFY
1522static void noinline 1537static void noinline
1523verify_watcher (EV_P_ W w) 1538verify_watcher (EV_P_ W w)
1524{ 1539{
1525 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1540 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1526 1541
1527 if (w->pending) 1542 if (w->pending)
1528 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));
1529} 1544}
1530 1545
1531static void noinline 1546static void noinline
1532verify_heap (EV_P_ ANHE *heap, int N) 1547verify_heap (EV_P_ ANHE *heap, int N)
1533{ 1548{
1534 int i; 1549 int i;
1535 1550
1536 for (i = HEAP0; i < N + HEAP0; ++i) 1551 for (i = HEAP0; i < N + HEAP0; ++i)
1537 { 1552 {
1538 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));
1539 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])));
1540 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]))));
1541 1556
1542 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1557 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1543 } 1558 }
1544} 1559}
1545 1560
1546static void noinline 1561static void noinline
1547array_verify (EV_P_ W *ws, int cnt) 1562array_verify (EV_P_ W *ws, int cnt)
1548{ 1563{
1549 while (cnt--) 1564 while (cnt--)
1550 { 1565 {
1551 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1566 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1552 verify_watcher (EV_A_ ws [cnt]); 1567 verify_watcher (EV_A_ ws [cnt]);
1553 } 1568 }
1554} 1569}
1555#endif 1570#endif
1556 1571
… …
1563 1578
1564 assert (activecnt >= -1); 1579 assert (activecnt >= -1);
1565 1580
1566 assert (fdchangemax >= fdchangecnt); 1581 assert (fdchangemax >= fdchangecnt);
1567 for (i = 0; i < fdchangecnt; ++i) 1582 for (i = 0; i < fdchangecnt; ++i)
1568 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1583 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1569 1584
1570 assert (anfdmax >= 0); 1585 assert (anfdmax >= 0);
1571 for (i = 0; i < anfdmax; ++i) 1586 for (i = 0; i < anfdmax; ++i)
1572 for (w = anfds [i].head; w; w = w->next) 1587 for (w = anfds [i].head; w; w = w->next)
1573 { 1588 {
1574 verify_watcher (EV_A_ (W)w); 1589 verify_watcher (EV_A_ (W)w);
1575 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1590 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1576 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));
1577 } 1592 }
1578 1593
1579 assert (timermax >= timercnt); 1594 assert (timermax >= timercnt);
1580 verify_heap (EV_A_ timers, timercnt); 1595 verify_heap (EV_A_ timers, timercnt);
1581 1596
… …
1658{ 1673{
1659#if EV_MULTIPLICITY 1674#if EV_MULTIPLICITY
1660 struct ev_loop *loop = ev_default_loop_ptr; 1675 struct ev_loop *loop = ev_default_loop_ptr;
1661#endif 1676#endif
1662 1677
1678 ev_default_loop_ptr = 0;
1679
1663#ifndef _WIN32 1680#ifndef _WIN32
1664 ev_ref (EV_A); /* child watcher */ 1681 ev_ref (EV_A); /* child watcher */
1665 ev_signal_stop (EV_A_ &childev); 1682 ev_signal_stop (EV_A_ &childev);
1666#endif 1683#endif
1667 1684
… …
1673{ 1690{
1674#if EV_MULTIPLICITY 1691#if EV_MULTIPLICITY
1675 struct ev_loop *loop = ev_default_loop_ptr; 1692 struct ev_loop *loop = ev_default_loop_ptr;
1676#endif 1693#endif
1677 1694
1678 if (backend)
1679 postfork = 1; /* must be in line with ev_loop_fork */ 1695 postfork = 1; /* must be in line with ev_loop_fork */
1680} 1696}
1681 1697
1682/*****************************************************************************/ 1698/*****************************************************************************/
1683 1699
1684void 1700void
… …
1697 { 1713 {
1698 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1714 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1699 1715
1700 if (expect_true (p->w)) 1716 if (expect_true (p->w))
1701 { 1717 {
1702 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1718 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1703 1719
1704 p->w->pending = 0; 1720 p->w->pending = 0;
1705 EV_CB_INVOKE (p->w, p->events); 1721 EV_CB_INVOKE (p->w, p->events);
1706 EV_FREQUENT_CHECK; 1722 EV_FREQUENT_CHECK;
1707 } 1723 }
… …
1738 1754
1739 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1755 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1740 { 1756 {
1741 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1757 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1742 1758
1743 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1759 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1744 1760
1745 /* first reschedule or stop timer */ 1761 /* first reschedule or stop timer */
1746 if (w->repeat) 1762 if (w->repeat)
1747 { 1763 {
1748 ev_at (w) += w->repeat; 1764 ev_at (w) += w->repeat;
1749 if (ev_at (w) < mn_now) 1765 if (ev_at (w) < mn_now)
1750 ev_at (w) = mn_now; 1766 ev_at (w) = mn_now;
1751 1767
1752 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.));
1753 1769
1754 ANHE_at_cache (timers [HEAP0]); 1770 ANHE_at_cache (timers [HEAP0]);
1755 downheap (timers, timercnt, HEAP0); 1771 downheap (timers, timercnt, HEAP0);
1756 } 1772 }
1757 else 1773 else
… …
1770 1786
1771 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1787 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1772 { 1788 {
1773 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1789 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1774 1790
1775 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1791 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1776 1792
1777 /* first reschedule or stop timer */ 1793 /* first reschedule or stop timer */
1778 if (w->reschedule_cb) 1794 if (w->reschedule_cb)
1779 { 1795 {
1780 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1796 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1781 1797
1782 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));
1783 1799
1784 ANHE_at_cache (periodics [HEAP0]); 1800 ANHE_at_cache (periodics [HEAP0]);
1785 downheap (periodics, periodiccnt, HEAP0); 1801 downheap (periodics, periodiccnt, HEAP0);
1786 } 1802 }
1787 else if (w->interval) 1803 else if (w->interval)
… …
2138 int fd = w->fd; 2154 int fd = w->fd;
2139 2155
2140 if (expect_false (ev_is_active (w))) 2156 if (expect_false (ev_is_active (w)))
2141 return; 2157 return;
2142 2158
2143 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))));
2144 2161
2145 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
2146 2163
2147 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
2148 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2165 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149 wlist_add (&anfds[fd].head, (WL)w); 2166 wlist_add (&anfds[fd].head, (WL)w);
2150 2167
2151 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2168 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2152 w->events &= ~EV_IOFDSET; 2169 w->events &= ~EV_IOFDSET;
2153 2170
… …
2159{ 2176{
2160 clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
2161 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
2162 return; 2179 return;
2163 2180
2164 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));
2165 2182
2166 EV_FREQUENT_CHECK; 2183 EV_FREQUENT_CHECK;
2167 2184
2168 wlist_del (&anfds[w->fd].head, (WL)w); 2185 wlist_del (&anfds[w->fd].head, (WL)w);
2169 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
… …
2179 if (expect_false (ev_is_active (w))) 2196 if (expect_false (ev_is_active (w)))
2180 return; 2197 return;
2181 2198
2182 ev_at (w) += mn_now; 2199 ev_at (w) += mn_now;
2183 2200
2184 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.));
2185 2202
2186 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2187 2204
2188 ++timercnt; 2205 ++timercnt;
2189 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2206 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2192 ANHE_at_cache (timers [ev_active (w)]); 2209 ANHE_at_cache (timers [ev_active (w)]);
2193 upheap (timers, ev_active (w)); 2210 upheap (timers, ev_active (w));
2194 2211
2195 EV_FREQUENT_CHECK; 2212 EV_FREQUENT_CHECK;
2196 2213
2197 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2214 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2198} 2215}
2199 2216
2200void noinline 2217void noinline
2201ev_timer_stop (EV_P_ ev_timer *w) 2218ev_timer_stop (EV_P_ ev_timer *w)
2202{ 2219{
… …
2207 EV_FREQUENT_CHECK; 2224 EV_FREQUENT_CHECK;
2208 2225
2209 { 2226 {
2210 int active = ev_active (w); 2227 int active = ev_active (w);
2211 2228
2212 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2229 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2213 2230
2214 --timercnt; 2231 --timercnt;
2215 2232
2216 if (expect_true (active < timercnt + HEAP0)) 2233 if (expect_true (active < timercnt + HEAP0))
2217 { 2234 {
… …
2261 2278
2262 if (w->reschedule_cb) 2279 if (w->reschedule_cb)
2263 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2280 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2264 else if (w->interval) 2281 else if (w->interval)
2265 { 2282 {
2266 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.));
2267 /* 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 */
2268 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;
2269 } 2286 }
2270 else 2287 else
2271 ev_at (w) = w->offset; 2288 ev_at (w) = w->offset;
… …
2279 ANHE_at_cache (periodics [ev_active (w)]); 2296 ANHE_at_cache (periodics [ev_active (w)]);
2280 upheap (periodics, ev_active (w)); 2297 upheap (periodics, ev_active (w));
2281 2298
2282 EV_FREQUENT_CHECK; 2299 EV_FREQUENT_CHECK;
2283 2300
2284 /*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));*/
2285} 2302}
2286 2303
2287void noinline 2304void noinline
2288ev_periodic_stop (EV_P_ ev_periodic *w) 2305ev_periodic_stop (EV_P_ ev_periodic *w)
2289{ 2306{
… …
2294 EV_FREQUENT_CHECK; 2311 EV_FREQUENT_CHECK;
2295 2312
2296 { 2313 {
2297 int active = ev_active (w); 2314 int active = ev_active (w);
2298 2315
2299 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2316 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2300 2317
2301 --periodiccnt; 2318 --periodiccnt;
2302 2319
2303 if (expect_true (active < periodiccnt + HEAP0)) 2320 if (expect_true (active < periodiccnt + HEAP0))
2304 { 2321 {
… …
2327 2344
2328void noinline 2345void noinline
2329ev_signal_start (EV_P_ ev_signal *w) 2346ev_signal_start (EV_P_ ev_signal *w)
2330{ 2347{
2331#if EV_MULTIPLICITY 2348#if EV_MULTIPLICITY
2332 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));
2333#endif 2350#endif
2334 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
2335 return; 2352 return;
2336 2353
2337 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));
2338 2355
2339 evpipe_init (EV_A); 2356 evpipe_init (EV_A);
2340 2357
2341 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
2342 2359
… …
2345 sigset_t full, prev; 2362 sigset_t full, prev;
2346 sigfillset (&full); 2363 sigfillset (&full);
2347 sigprocmask (SIG_SETMASK, &full, &prev); 2364 sigprocmask (SIG_SETMASK, &full, &prev);
2348#endif 2365#endif
2349 2366
2350 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2367 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2351 2368
2352#ifndef _WIN32 2369#ifndef _WIN32
2353 sigprocmask (SIG_SETMASK, &prev, 0); 2370 sigprocmask (SIG_SETMASK, &prev, 0);
2354#endif 2371#endif
2355 } 2372 }
… …
2393 2410
2394void 2411void
2395ev_child_start (EV_P_ ev_child *w) 2412ev_child_start (EV_P_ ev_child *w)
2396{ 2413{
2397#if EV_MULTIPLICITY 2414#if EV_MULTIPLICITY
2398 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));
2399#endif 2416#endif
2400 if (expect_false (ev_is_active (w))) 2417 if (expect_false (ev_is_active (w)))
2401 return; 2418 return;
2402 2419
2403 EV_FREQUENT_CHECK; 2420 EV_FREQUENT_CHECK;
… …
2428# ifdef _WIN32 2445# ifdef _WIN32
2429# undef lstat 2446# undef lstat
2430# define lstat(a,b) _stati64 (a,b) 2447# define lstat(a,b) _stati64 (a,b)
2431# endif 2448# endif
2432 2449
2433#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 */
2434#define MIN_STAT_INTERVAL 0.1074891 2452#define MIN_STAT_INTERVAL 0.1074891
2435 2453
2436static 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);
2437 2455
2438#if EV_USE_INOTIFY 2456#if EV_USE_INOTIFY
2439# define EV_INOTIFY_BUFSIZE 8192 2457# define EV_INOTIFY_BUFSIZE 8192
… …
2443{ 2461{
2444 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);
2445 2463
2446 if (w->wd < 0) 2464 if (w->wd < 0)
2447 { 2465 {
2466 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2448 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 */
2449 2468
2450 /* monitor some parent directory for speedup hints */ 2469 /* monitor some parent directory for speedup hints */
2451 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2470 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2452 /* but an efficiency issue only */ 2471 /* but an efficiency issue only */
2453 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2472 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2454 { 2473 {
2455 char path [4096]; 2474 char path [4096];
2456 strcpy (path, w->path); 2475 strcpy (path, w->path);
… …
2460 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2479 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2461 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2480 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2462 2481
2463 char *pend = strrchr (path, '/'); 2482 char *pend = strrchr (path, '/');
2464 2483
2465 if (!pend) 2484 if (!pend || pend == path)
2466 break; /* whoops, no '/', complain to your admin */ 2485 break;
2467 2486
2468 *pend = 0; 2487 *pend = 0;
2469 w->wd = inotify_add_watch (fs_fd, path, mask); 2488 w->wd = inotify_add_watch (fs_fd, path, mask);
2470 } 2489 }
2471 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2490 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2472 } 2491 }
2473 } 2492 }
2474 else
2475 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2476 2493
2477 if (w->wd >= 0) 2494 if (w->wd >= 0)
2495 {
2478 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 }
2479} 2515}
2480 2516
2481static void noinline 2517static void noinline
2482infy_del (EV_P_ ev_stat *w) 2518infy_del (EV_P_ ev_stat *w)
2483{ 2519{
… …
2513 2549
2514 if (w->wd == wd || wd == -1) 2550 if (w->wd == wd || wd == -1)
2515 { 2551 {
2516 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2552 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2517 { 2553 {
2554 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2518 w->wd = -1; 2555 w->wd = -1;
2519 infy_add (EV_A_ w); /* re-add, no matter what */ 2556 infy_add (EV_A_ w); /* re-add, no matter what */
2520 } 2557 }
2521 2558
2522 stat_timer_cb (EV_A_ &w->timer, 0); 2559 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2536 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)
2537 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2574 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2538} 2575}
2539 2576
2540void inline_size 2577void inline_size
2541infy_init (EV_P) 2578check_2625 (EV_P)
2542{ 2579{
2543 if (fs_fd != -2)
2544 return;
2545
2546 /* kernels < 2.6.25 are borked 2580 /* kernels < 2.6.25 are borked
2547 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2581 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2548 */ 2582 */
2549 {
2550 struct utsname buf; 2583 struct utsname buf;
2551 int major, minor, micro; 2584 int major, minor, micro;
2552 2585
2553 fs_fd = -1;
2554
2555 if (uname (&buf)) 2586 if (uname (&buf))
2556 return; 2587 return;
2557 2588
2558 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2589 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559 return; 2590 return;
2560 2591
2561 if (major < 2 2592 if (major < 2
2562 || (major == 2 && minor < 6) 2593 || (major == 2 && minor < 6)
2563 || (major == 2 && minor == 6 && micro < 25)) 2594 || (major == 2 && minor == 6 && micro < 25))
2564 return; 2595 return;
2565 } 2596
2597 fs_2625 = 1;
2598}
2599
2600void inline_size
2601infy_init (EV_P)
2602{
2603 if (fs_fd != -2)
2604 return;
2605
2606 fs_fd = -1;
2607
2608 check_2625 (EV_A);
2566 2609
2567 fs_fd = inotify_init (); 2610 fs_fd = inotify_init ();
2568 2611
2569 if (fs_fd >= 0) 2612 if (fs_fd >= 0)
2570 { 2613 {
… …
2598 w->wd = -1; 2641 w->wd = -1;
2599 2642
2600 if (fs_fd >= 0) 2643 if (fs_fd >= 0)
2601 infy_add (EV_A_ w); /* re-add, no matter what */ 2644 infy_add (EV_A_ w); /* re-add, no matter what */
2602 else 2645 else
2603 ev_timer_start (EV_A_ &w->timer); 2646 ev_timer_again (EV_A_ &w->timer);
2604 } 2647 }
2605 } 2648 }
2606} 2649}
2607 2650
2608#endif 2651#endif
… …
2663ev_stat_start (EV_P_ ev_stat *w) 2706ev_stat_start (EV_P_ ev_stat *w)
2664{ 2707{
2665 if (expect_false (ev_is_active (w))) 2708 if (expect_false (ev_is_active (w)))
2666 return; 2709 return;
2667 2710
2668 /* since we use memcmp, we need to clear any padding data etc. */
2669 memset (&w->prev, 0, sizeof (ev_statdata));
2670 memset (&w->attr, 0, sizeof (ev_statdata));
2671
2672 ev_stat_stat (EV_A_ w); 2711 ev_stat_stat (EV_A_ w);
2673 2712
2713 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2674 if (w->interval < MIN_STAT_INTERVAL) 2714 w->interval = MIN_STAT_INTERVAL;
2675 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2676 2715
2677 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);
2678 ev_set_priority (&w->timer, ev_priority (w)); 2717 ev_set_priority (&w->timer, ev_priority (w));
2679 2718
2680#if EV_USE_INOTIFY 2719#if EV_USE_INOTIFY
2681 infy_init (EV_A); 2720 infy_init (EV_A);
2682 2721
2683 if (fs_fd >= 0) 2722 if (fs_fd >= 0)
2684 infy_add (EV_A_ w); 2723 infy_add (EV_A_ w);
2685 else 2724 else
2686#endif 2725#endif
2687 ev_timer_start (EV_A_ &w->timer); 2726 ev_timer_again (EV_A_ &w->timer);
2688 2727
2689 ev_start (EV_A_ (W)w, 1); 2728 ev_start (EV_A_ (W)w, 1);
2690 2729
2691 EV_FREQUENT_CHECK; 2730 EV_FREQUENT_CHECK;
2692} 2731}
… …
2867static void 2906static void
2868embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2907embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2869{ 2908{
2870 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2909 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2871 2910
2911 ev_embed_stop (EV_A_ w);
2912
2872 { 2913 {
2873 struct ev_loop *loop = w->other; 2914 struct ev_loop *loop = w->other;
2874 2915
2875 ev_loop_fork (EV_A); 2916 ev_loop_fork (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2876 } 2918 }
2919
2920 ev_embed_start (EV_A_ w);
2877} 2921}
2878 2922
2879#if 0 2923#if 0
2880static void 2924static void
2881embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2925embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2890 if (expect_false (ev_is_active (w))) 2934 if (expect_false (ev_is_active (w)))
2891 return; 2935 return;
2892 2936
2893 { 2937 {
2894 struct ev_loop *loop = w->other; 2938 struct ev_loop *loop = w->other;
2895 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 ()));
2896 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);
2897 } 2941 }
2898 2942
2899 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2900 2944

Diff Legend

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