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

Comparing libev/ev.c (file contents):
Revision 1.265 by root, Thu Oct 23 04:56:49 2008 UTC vs.
Revision 1.279 by root, Fri Feb 6 20:17:43 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
57# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
58# endif 70# endif
59# else 71# else
60# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
62# endif 74# endif
… …
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
174# endif 194# endif
175#endif 195#endif
176 196
177#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 199#endif
180 200
181#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
… …
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>
… …
367typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
368 398
369#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
371 401
372#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
373/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
374/* giving it a reasonably high chance of working on typical architetcures */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
375static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
376#endif 410#endif
377 411
378#ifdef _WIN32 412#ifdef _WIN32
379# include "ev_win32.c" 413# include "ev_win32.c"
… …
388{ 422{
389 syserr_cb = cb; 423 syserr_cb = cb;
390} 424}
391 425
392static void noinline 426static void noinline
393syserr (const char *msg) 427ev_syserr (const char *msg)
394{ 428{
395 if (!msg) 429 if (!msg)
396 msg = "(libev) system error"; 430 msg = "(libev) system error";
397 431
398 if (syserr_cb) 432 if (syserr_cb)
… …
450{ 484{
451 WL head; 485 WL head;
452 unsigned char events; 486 unsigned char events;
453 unsigned char reify; 487 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused; /* currently unused padding */ 489 unsigned char unused;
490#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif
456#if EV_SELECT_IS_WINSOCKET 493#if EV_SELECT_IS_WINSOCKET
457 SOCKET handle; 494 SOCKET handle;
458#endif 495#endif
459} ANFD; 496} ANFD;
460 497
… …
520 557
521ev_tstamp 558ev_tstamp
522ev_time (void) 559ev_time (void)
523{ 560{
524#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
525 struct timespec ts; 564 struct timespec ts;
526 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
527 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
528#else 567 }
568#endif
569
529 struct timeval tv; 570 struct timeval tv;
530 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
531 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
532#endif
533} 573}
534 574
535ev_tstamp inline_size 575ev_tstamp inline_size
536get_clock (void) 576get_clock (void)
537{ 577{
… …
715 #ifdef EV_FD_TO_WIN32_HANDLE 755 #ifdef EV_FD_TO_WIN32_HANDLE
716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
717 #else 757 #else
718 anfd->handle = _get_osfhandle (fd); 758 anfd->handle = _get_osfhandle (fd);
719 #endif 759 #endif
720 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 760 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
721 } 761 }
722#endif 762#endif
723 763
724 { 764 {
725 unsigned char o_events = anfd->events; 765 unsigned char o_events = anfd->events;
… …
806 846
807 for (fd = 0; fd < anfdmax; ++fd) 847 for (fd = 0; fd < anfdmax; ++fd)
808 if (anfds [fd].events) 848 if (anfds [fd].events)
809 { 849 {
810 anfds [fd].events = 0; 850 anfds [fd].events = 0;
851 anfds [fd].emask = 0;
811 fd_change (EV_A_ fd, EV_IOFDSET | 1); 852 fd_change (EV_A_ fd, EV_IOFDSET | 1);
812 } 853 }
813} 854}
814 855
815/*****************************************************************************/ 856/*****************************************************************************/
… …
997 } 1038 }
998 else 1039 else
999#endif 1040#endif
1000 { 1041 {
1001 while (pipe (evpipe)) 1042 while (pipe (evpipe))
1002 syserr ("(libev) error creating signal/async pipe"); 1043 ev_syserr ("(libev) error creating signal/async pipe");
1003 1044
1004 fd_intern (evpipe [0]); 1045 fd_intern (evpipe [0]);
1005 fd_intern (evpipe [1]); 1046 fd_intern (evpipe [1]);
1006 ev_io_set (&pipeev, evpipe [0], EV_READ); 1047 ev_io_set (&pipeev, evpipe [0], EV_READ);
1007 } 1048 }
… …
1097ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1098{ 1139{
1099 WL w; 1140 WL w;
1100 1141
1101#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1102 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1103#endif 1144#endif
1104 1145
1105 --signum; 1146 --signum;
1106 1147
1107 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
… …
1236 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1237 /* it usually doesn't work correctly on anything but sockets and pipes */ 1278 /* it usually doesn't work correctly on anything but sockets and pipes */
1238 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1239#endif 1280#endif
1240#ifdef __APPLE__ 1281#ifdef __APPLE__
1241 // flags &= ~EVBACKEND_KQUEUE; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1242 flags &= ~EVBACKEND_POLL; 1283 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1284 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1243#endif 1285#endif
1244 1286
1245 return flags; 1287 return flags;
1246} 1288}
1247 1289
… …
1284static void noinline 1326static void noinline
1285loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1286{ 1328{
1287 if (!backend) 1329 if (!backend)
1288 { 1330 {
1331#if EV_USE_REALTIME
1332 if (!have_realtime)
1333 {
1334 struct timespec ts;
1335
1336 if (!clock_gettime (CLOCK_REALTIME, &ts))
1337 have_realtime = 1;
1338 }
1339#endif
1340
1289#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1290 { 1343 {
1291 struct timespec ts; 1344 struct timespec ts;
1345
1292 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1293 have_monotonic = 1; 1347 have_monotonic = 1;
1294 } 1348 }
1295#endif 1349#endif
1296 1350
1297 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1298 mn_now = get_clock (); 1352 mn_now = get_clock ();
1299 now_floor = mn_now; 1353 now_floor = mn_now;
… …
1500 1554
1501#if EV_VERIFY 1555#if EV_VERIFY
1502static void noinline 1556static void noinline
1503verify_watcher (EV_P_ W w) 1557verify_watcher (EV_P_ W w)
1504{ 1558{
1505 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1506 1560
1507 if (w->pending) 1561 if (w->pending)
1508 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1562 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1509} 1563}
1510 1564
1511static void noinline 1565static void noinline
1512verify_heap (EV_P_ ANHE *heap, int N) 1566verify_heap (EV_P_ ANHE *heap, int N)
1513{ 1567{
1514 int i; 1568 int i;
1515 1569
1516 for (i = HEAP0; i < N + HEAP0; ++i) 1570 for (i = HEAP0; i < N + HEAP0; ++i)
1517 { 1571 {
1518 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1572 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1519 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1573 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1520 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1574 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1521 1575
1522 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1523 } 1577 }
1524} 1578}
1525 1579
1526static void noinline 1580static void noinline
1527array_verify (EV_P_ W *ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1528{ 1582{
1529 while (cnt--) 1583 while (cnt--)
1530 { 1584 {
1531 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1532 verify_watcher (EV_A_ ws [cnt]); 1586 verify_watcher (EV_A_ ws [cnt]);
1533 } 1587 }
1534} 1588}
1535#endif 1589#endif
1536 1590
… …
1543 1597
1544 assert (activecnt >= -1); 1598 assert (activecnt >= -1);
1545 1599
1546 assert (fdchangemax >= fdchangecnt); 1600 assert (fdchangemax >= fdchangecnt);
1547 for (i = 0; i < fdchangecnt; ++i) 1601 for (i = 0; i < fdchangecnt; ++i)
1548 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1549 1603
1550 assert (anfdmax >= 0); 1604 assert (anfdmax >= 0);
1551 for (i = 0; i < anfdmax; ++i) 1605 for (i = 0; i < anfdmax; ++i)
1552 for (w = anfds [i].head; w; w = w->next) 1606 for (w = anfds [i].head; w; w = w->next)
1553 { 1607 {
1554 verify_watcher (EV_A_ (W)w); 1608 verify_watcher (EV_A_ (W)w);
1555 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1609 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1556 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1610 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1557 } 1611 }
1558 1612
1559 assert (timermax >= timercnt); 1613 assert (timermax >= timercnt);
1560 verify_heap (EV_A_ timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1561 1615
… …
1638{ 1692{
1639#if EV_MULTIPLICITY 1693#if EV_MULTIPLICITY
1640 struct ev_loop *loop = ev_default_loop_ptr; 1694 struct ev_loop *loop = ev_default_loop_ptr;
1641#endif 1695#endif
1642 1696
1697 ev_default_loop_ptr = 0;
1698
1643#ifndef _WIN32 1699#ifndef _WIN32
1644 ev_ref (EV_A); /* child watcher */ 1700 ev_ref (EV_A); /* child watcher */
1645 ev_signal_stop (EV_A_ &childev); 1701 ev_signal_stop (EV_A_ &childev);
1646#endif 1702#endif
1647 1703
… …
1653{ 1709{
1654#if EV_MULTIPLICITY 1710#if EV_MULTIPLICITY
1655 struct ev_loop *loop = ev_default_loop_ptr; 1711 struct ev_loop *loop = ev_default_loop_ptr;
1656#endif 1712#endif
1657 1713
1658 if (backend)
1659 postfork = 1; /* must be in line with ev_loop_fork */ 1714 postfork = 1; /* must be in line with ev_loop_fork */
1660} 1715}
1661 1716
1662/*****************************************************************************/ 1717/*****************************************************************************/
1663 1718
1664void 1719void
… …
1677 { 1732 {
1678 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1679 1734
1680 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1681 { 1736 {
1682 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1683 1738
1684 p->w->pending = 0; 1739 p->w->pending = 0;
1685 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1686 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1687 } 1742 }
… …
1718 1773
1719 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1720 { 1775 {
1721 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1722 1777
1723 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1724 1779
1725 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1726 if (w->repeat) 1781 if (w->repeat)
1727 { 1782 {
1728 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1729 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1730 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1731 1786
1732 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1733 1788
1734 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1735 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1736 } 1791 }
1737 else 1792 else
… …
1750 1805
1751 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1752 { 1807 {
1753 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1754 1809
1755 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1756 1811
1757 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1758 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1759 { 1814 {
1760 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1761 1816
1762 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1763 1818
1764 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1765 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1766 } 1821 }
1767 else if (w->interval) 1822 else if (w->interval)
… …
2118 int fd = w->fd; 2173 int fd = w->fd;
2119 2174
2120 if (expect_false (ev_is_active (w))) 2175 if (expect_false (ev_is_active (w)))
2121 return; 2176 return;
2122 2177
2123 assert (("ev_io_start called with negative fd", fd >= 0)); 2178 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2124 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2125 2180
2126 EV_FREQUENT_CHECK; 2181 EV_FREQUENT_CHECK;
2127 2182
2128 ev_start (EV_A_ (W)w, 1); 2183 ev_start (EV_A_ (W)w, 1);
2129 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2140{ 2195{
2141 clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2142 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2143 return; 2198 return;
2144 2199
2145 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2200 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2146 2201
2147 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2148 2203
2149 wlist_del (&anfds[w->fd].head, (WL)w); 2204 wlist_del (&anfds[w->fd].head, (WL)w);
2150 ev_stop (EV_A_ (W)w); 2205 ev_stop (EV_A_ (W)w);
… …
2160 if (expect_false (ev_is_active (w))) 2215 if (expect_false (ev_is_active (w)))
2161 return; 2216 return;
2162 2217
2163 ev_at (w) += mn_now; 2218 ev_at (w) += mn_now;
2164 2219
2165 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2220 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2166 2221
2167 EV_FREQUENT_CHECK; 2222 EV_FREQUENT_CHECK;
2168 2223
2169 ++timercnt; 2224 ++timercnt;
2170 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2225 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2173 ANHE_at_cache (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2174 upheap (timers, ev_active (w)); 2229 upheap (timers, ev_active (w));
2175 2230
2176 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2177 2232
2178 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2233 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2179} 2234}
2180 2235
2181void noinline 2236void noinline
2182ev_timer_stop (EV_P_ ev_timer *w) 2237ev_timer_stop (EV_P_ ev_timer *w)
2183{ 2238{
… …
2188 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2189 2244
2190 { 2245 {
2191 int active = ev_active (w); 2246 int active = ev_active (w);
2192 2247
2193 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2248 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2194 2249
2195 --timercnt; 2250 --timercnt;
2196 2251
2197 if (expect_true (active < timercnt + HEAP0)) 2252 if (expect_true (active < timercnt + HEAP0))
2198 { 2253 {
… …
2242 2297
2243 if (w->reschedule_cb) 2298 if (w->reschedule_cb)
2244 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2245 else if (w->interval) 2300 else if (w->interval)
2246 { 2301 {
2247 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2302 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2248 /* this formula differs from the one in periodic_reify because we do not always round up */ 2303 /* this formula differs from the one in periodic_reify because we do not always round up */
2249 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2304 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2250 } 2305 }
2251 else 2306 else
2252 ev_at (w) = w->offset; 2307 ev_at (w) = w->offset;
… …
2260 ANHE_at_cache (periodics [ev_active (w)]); 2315 ANHE_at_cache (periodics [ev_active (w)]);
2261 upheap (periodics, ev_active (w)); 2316 upheap (periodics, ev_active (w));
2262 2317
2263 EV_FREQUENT_CHECK; 2318 EV_FREQUENT_CHECK;
2264 2319
2265 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2320 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2266} 2321}
2267 2322
2268void noinline 2323void noinline
2269ev_periodic_stop (EV_P_ ev_periodic *w) 2324ev_periodic_stop (EV_P_ ev_periodic *w)
2270{ 2325{
… …
2275 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2276 2331
2277 { 2332 {
2278 int active = ev_active (w); 2333 int active = ev_active (w);
2279 2334
2280 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2335 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2281 2336
2282 --periodiccnt; 2337 --periodiccnt;
2283 2338
2284 if (expect_true (active < periodiccnt + HEAP0)) 2339 if (expect_true (active < periodiccnt + HEAP0))
2285 { 2340 {
… …
2308 2363
2309void noinline 2364void noinline
2310ev_signal_start (EV_P_ ev_signal *w) 2365ev_signal_start (EV_P_ ev_signal *w)
2311{ 2366{
2312#if EV_MULTIPLICITY 2367#if EV_MULTIPLICITY
2313 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2368 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2314#endif 2369#endif
2315 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2316 return; 2371 return;
2317 2372
2318 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2373 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2319 2374
2320 evpipe_init (EV_A); 2375 evpipe_init (EV_A);
2321 2376
2322 EV_FREQUENT_CHECK; 2377 EV_FREQUENT_CHECK;
2323 2378
… …
2374 2429
2375void 2430void
2376ev_child_start (EV_P_ ev_child *w) 2431ev_child_start (EV_P_ ev_child *w)
2377{ 2432{
2378#if EV_MULTIPLICITY 2433#if EV_MULTIPLICITY
2379 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2434 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2380#endif 2435#endif
2381 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
2382 return; 2437 return;
2383 2438
2384 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
… …
2409# ifdef _WIN32 2464# ifdef _WIN32
2410# undef lstat 2465# undef lstat
2411# define lstat(a,b) _stati64 (a,b) 2466# define lstat(a,b) _stati64 (a,b)
2412# endif 2467# endif
2413 2468
2414#define DEF_STAT_INTERVAL 5.0074891 2469#define DEF_STAT_INTERVAL 5.0074891
2470#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2415#define MIN_STAT_INTERVAL 0.1074891 2471#define MIN_STAT_INTERVAL 0.1074891
2416 2472
2417static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2473static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2418 2474
2419#if EV_USE_INOTIFY 2475#if EV_USE_INOTIFY
2420# define EV_INOTIFY_BUFSIZE 8192 2476# define EV_INOTIFY_BUFSIZE 8192
… …
2424{ 2480{
2425 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); 2481 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);
2426 2482
2427 if (w->wd < 0) 2483 if (w->wd < 0)
2428 { 2484 {
2485 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2429 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2486 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2430 2487
2431 /* monitor some parent directory for speedup hints */ 2488 /* monitor some parent directory for speedup hints */
2432 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2433 /* but an efficiency issue only */ 2490 /* but an efficiency issue only */
2434 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2435 { 2492 {
2436 char path [4096]; 2493 char path [4096];
2437 strcpy (path, w->path); 2494 strcpy (path, w->path);
… …
2441 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2498 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2442 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2499 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2443 2500
2444 char *pend = strrchr (path, '/'); 2501 char *pend = strrchr (path, '/');
2445 2502
2446 if (!pend) 2503 if (!pend || pend == path)
2447 break; /* whoops, no '/', complain to your admin */ 2504 break;
2448 2505
2449 *pend = 0; 2506 *pend = 0;
2450 w->wd = inotify_add_watch (fs_fd, path, mask); 2507 w->wd = inotify_add_watch (fs_fd, path, mask);
2451 } 2508 }
2452 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2453 } 2510 }
2454 } 2511 }
2455 else
2456 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2457 2512
2458 if (w->wd >= 0) 2513 if (w->wd >= 0)
2514 {
2459 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2515 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2516
2517 /* now local changes will be tracked by inotify, but remote changes won't */
2518 /* unless the filesystem it known to be local, we therefore still poll */
2519 /* also do poll on <2.6.25, but with normal frequency */
2520 struct statfs sfs;
2521
2522 if (fs_2625 && !statfs (w->path, &sfs))
2523 if (sfs.f_type == 0x1373 /* devfs */
2524 || sfs.f_type == 0xEF53 /* ext2/3 */
2525 || sfs.f_type == 0x3153464a /* jfs */
2526 || sfs.f_type == 0x52654973 /* reiser3 */
2527 || sfs.f_type == 0x01021994 /* tempfs */
2528 || sfs.f_type == 0x58465342 /* xfs */)
2529 return;
2530
2531 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2532 ev_timer_again (EV_A_ &w->timer);
2533 }
2460} 2534}
2461 2535
2462static void noinline 2536static void noinline
2463infy_del (EV_P_ ev_stat *w) 2537infy_del (EV_P_ ev_stat *w)
2464{ 2538{
… …
2494 2568
2495 if (w->wd == wd || wd == -1) 2569 if (w->wd == wd || wd == -1)
2496 { 2570 {
2497 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2571 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2498 { 2572 {
2573 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2499 w->wd = -1; 2574 w->wd = -1;
2500 infy_add (EV_A_ w); /* re-add, no matter what */ 2575 infy_add (EV_A_ w); /* re-add, no matter what */
2501 } 2576 }
2502 2577
2503 stat_timer_cb (EV_A_ &w->timer, 0); 2578 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2517 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2592 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2518 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2593 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2519} 2594}
2520 2595
2521void inline_size 2596void inline_size
2522infy_init (EV_P) 2597check_2625 (EV_P)
2523{ 2598{
2524 if (fs_fd != -2)
2525 return;
2526
2527 /* kernels < 2.6.25 are borked 2599 /* kernels < 2.6.25 are borked
2528 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2600 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2529 */ 2601 */
2530 {
2531 struct utsname buf; 2602 struct utsname buf;
2532 int major, minor, micro; 2603 int major, minor, micro;
2533 2604
2534 fs_fd = -1;
2535
2536 if (uname (&buf)) 2605 if (uname (&buf))
2537 return; 2606 return;
2538 2607
2539 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2608 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2540 return; 2609 return;
2541 2610
2542 if (major < 2 2611 if (major < 2
2543 || (major == 2 && minor < 6) 2612 || (major == 2 && minor < 6)
2544 || (major == 2 && minor == 6 && micro < 25)) 2613 || (major == 2 && minor == 6 && micro < 25))
2545 return; 2614 return;
2546 } 2615
2616 fs_2625 = 1;
2617}
2618
2619void inline_size
2620infy_init (EV_P)
2621{
2622 if (fs_fd != -2)
2623 return;
2624
2625 fs_fd = -1;
2626
2627 check_2625 (EV_A);
2547 2628
2548 fs_fd = inotify_init (); 2629 fs_fd = inotify_init ();
2549 2630
2550 if (fs_fd >= 0) 2631 if (fs_fd >= 0)
2551 { 2632 {
… …
2579 w->wd = -1; 2660 w->wd = -1;
2580 2661
2581 if (fs_fd >= 0) 2662 if (fs_fd >= 0)
2582 infy_add (EV_A_ w); /* re-add, no matter what */ 2663 infy_add (EV_A_ w); /* re-add, no matter what */
2583 else 2664 else
2584 ev_timer_start (EV_A_ &w->timer); 2665 ev_timer_again (EV_A_ &w->timer);
2585 } 2666 }
2586 } 2667 }
2587} 2668}
2588 2669
2589#endif 2670#endif
… …
2644ev_stat_start (EV_P_ ev_stat *w) 2725ev_stat_start (EV_P_ ev_stat *w)
2645{ 2726{
2646 if (expect_false (ev_is_active (w))) 2727 if (expect_false (ev_is_active (w)))
2647 return; 2728 return;
2648 2729
2649 /* since we use memcmp, we need to clear any padding data etc. */
2650 memset (&w->prev, 0, sizeof (ev_statdata));
2651 memset (&w->attr, 0, sizeof (ev_statdata));
2652
2653 ev_stat_stat (EV_A_ w); 2730 ev_stat_stat (EV_A_ w);
2654 2731
2732 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2655 if (w->interval < MIN_STAT_INTERVAL) 2733 w->interval = MIN_STAT_INTERVAL;
2656 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2657 2734
2658 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2735 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2659 ev_set_priority (&w->timer, ev_priority (w)); 2736 ev_set_priority (&w->timer, ev_priority (w));
2660 2737
2661#if EV_USE_INOTIFY 2738#if EV_USE_INOTIFY
2662 infy_init (EV_A); 2739 infy_init (EV_A);
2663 2740
2664 if (fs_fd >= 0) 2741 if (fs_fd >= 0)
2665 infy_add (EV_A_ w); 2742 infy_add (EV_A_ w);
2666 else 2743 else
2667#endif 2744#endif
2668 ev_timer_start (EV_A_ &w->timer); 2745 ev_timer_again (EV_A_ &w->timer);
2669 2746
2670 ev_start (EV_A_ (W)w, 1); 2747 ev_start (EV_A_ (W)w, 1);
2671 2748
2672 EV_FREQUENT_CHECK; 2749 EV_FREQUENT_CHECK;
2673} 2750}
… …
2848static void 2925static void
2849embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2926embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2850{ 2927{
2851 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2928 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2852 2929
2930 ev_embed_stop (EV_A_ w);
2931
2853 { 2932 {
2854 struct ev_loop *loop = w->other; 2933 struct ev_loop *loop = w->other;
2855 2934
2856 ev_loop_fork (EV_A); 2935 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2857 } 2937 }
2938
2939 ev_embed_start (EV_A_ w);
2858} 2940}
2859 2941
2860#if 0 2942#if 0
2861static void 2943static void
2862embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2944embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2871 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2872 return; 2954 return;
2873 2955
2874 { 2956 {
2875 struct ev_loop *loop = w->other; 2957 struct ev_loop *loop = w->other;
2876 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2958 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2877 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2959 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2878 } 2960 }
2879 2961
2880 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2881 2963

Diff Legend

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