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.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)
449typedef struct 483typedef struct
450{ 484{
451 WL head; 485 WL head;
452 unsigned char events; 486 unsigned char events;
453 unsigned char reify; 487 unsigned char reify;
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused;
490#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif
454#if EV_SELECT_IS_WINSOCKET 493#if EV_SELECT_IS_WINSOCKET
455 SOCKET handle; 494 SOCKET handle;
456#endif 495#endif
457} ANFD; 496} ANFD;
458 497
518 557
519ev_tstamp 558ev_tstamp
520ev_time (void) 559ev_time (void)
521{ 560{
522#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
523 struct timespec ts; 564 struct timespec ts;
524 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
525 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
526#else 567 }
568#endif
569
527 struct timeval tv; 570 struct timeval tv;
528 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
529 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
530#endif
531} 573}
532 574
533ev_tstamp inline_size 575ev_tstamp inline_size
534get_clock (void) 576get_clock (void)
535{ 577{
610array_realloc (int elem, void *base, int *cur, int cnt) 652array_realloc (int elem, void *base, int *cur, int cnt)
611{ 653{
612 *cur = array_nextsize (elem, *cur, cnt); 654 *cur = array_nextsize (elem, *cur, cnt);
613 return ev_realloc (base, elem * *cur); 655 return ev_realloc (base, elem * *cur);
614} 656}
657
658#define array_init_zero(base,count) \
659 memset ((void *)(base), 0, sizeof (*(base)) * (count))
615 660
616#define array_needsize(type,base,cur,cnt,init) \ 661#define array_needsize(type,base,cur,cnt,init) \
617 if (expect_false ((cnt) > (cur))) \ 662 if (expect_false ((cnt) > (cur))) \
618 { \ 663 { \
619 int ocur_ = (cur); \ 664 int ocur_ = (cur); \
662 for (i = 0; i < eventcnt; ++i) 707 for (i = 0; i < eventcnt; ++i)
663 ev_feed_event (EV_A_ events [i], type); 708 ev_feed_event (EV_A_ events [i], type);
664} 709}
665 710
666/*****************************************************************************/ 711/*****************************************************************************/
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 712
681void inline_speed 713void inline_speed
682fd_event (EV_P_ int fd, int revents) 714fd_event (EV_P_ int fd, int revents)
683{ 715{
684 ANFD *anfd = anfds + fd; 716 ANFD *anfd = anfds + fd;
723 #ifdef EV_FD_TO_WIN32_HANDLE 755 #ifdef EV_FD_TO_WIN32_HANDLE
724 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
725 #else 757 #else
726 anfd->handle = _get_osfhandle (fd); 758 anfd->handle = _get_osfhandle (fd);
727 #endif 759 #endif
728 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));
729 } 761 }
730#endif 762#endif
731 763
732 { 764 {
733 unsigned char o_events = anfd->events; 765 unsigned char o_events = anfd->events;
814 846
815 for (fd = 0; fd < anfdmax; ++fd) 847 for (fd = 0; fd < anfdmax; ++fd)
816 if (anfds [fd].events) 848 if (anfds [fd].events)
817 { 849 {
818 anfds [fd].events = 0; 850 anfds [fd].events = 0;
851 anfds [fd].emask = 0;
819 fd_change (EV_A_ fd, EV_IOFDSET | 1); 852 fd_change (EV_A_ fd, EV_IOFDSET | 1);
820 } 853 }
821} 854}
822 855
823/*****************************************************************************/ 856/*****************************************************************************/
975static ANSIG *signals; 1008static ANSIG *signals;
976static int signalmax; 1009static int signalmax;
977 1010
978static EV_ATOMIC_T gotsig; 1011static EV_ATOMIC_T gotsig;
979 1012
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/*****************************************************************************/ 1013/*****************************************************************************/
993 1014
994void inline_speed 1015void inline_speed
995fd_intern (int fd) 1016fd_intern (int fd)
996{ 1017{
1017 } 1038 }
1018 else 1039 else
1019#endif 1040#endif
1020 { 1041 {
1021 while (pipe (evpipe)) 1042 while (pipe (evpipe))
1022 syserr ("(libev) error creating signal/async pipe"); 1043 ev_syserr ("(libev) error creating signal/async pipe");
1023 1044
1024 fd_intern (evpipe [0]); 1045 fd_intern (evpipe [0]);
1025 fd_intern (evpipe [1]); 1046 fd_intern (evpipe [1]);
1026 ev_io_set (&pipeev, evpipe [0], EV_READ); 1047 ev_io_set (&pipeev, evpipe [0], EV_READ);
1027 } 1048 }
1117ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1118{ 1139{
1119 WL w; 1140 WL w;
1120 1141
1121#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1122 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));
1123#endif 1144#endif
1124 1145
1125 --signum; 1146 --signum;
1126 1147
1127 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
1256 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1257 /* 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 */
1258 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1259#endif 1280#endif
1260#ifdef __APPLE__ 1281#ifdef __APPLE__
1261 // flags &= ~EVBACKEND_KQUEUE; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1262 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 */
1263#endif 1285#endif
1264 1286
1265 return flags; 1287 return flags;
1266} 1288}
1267 1289
1304static void noinline 1326static void noinline
1305loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1306{ 1328{
1307 if (!backend) 1329 if (!backend)
1308 { 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
1309#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1310 { 1343 {
1311 struct timespec ts; 1344 struct timespec ts;
1345
1312 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1313 have_monotonic = 1; 1347 have_monotonic = 1;
1314 } 1348 }
1315#endif 1349#endif
1316 1350
1317 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1318 mn_now = get_clock (); 1352 mn_now = get_clock ();
1319 now_floor = mn_now; 1353 now_floor = mn_now;
1520 1554
1521#if EV_VERIFY 1555#if EV_VERIFY
1522static void noinline 1556static void noinline
1523verify_watcher (EV_P_ W w) 1557verify_watcher (EV_P_ W w)
1524{ 1558{
1525 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1526 1560
1527 if (w->pending) 1561 if (w->pending)
1528 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));
1529} 1563}
1530 1564
1531static void noinline 1565static void noinline
1532verify_heap (EV_P_ ANHE *heap, int N) 1566verify_heap (EV_P_ ANHE *heap, int N)
1533{ 1567{
1534 int i; 1568 int i;
1535 1569
1536 for (i = HEAP0; i < N + HEAP0; ++i) 1570 for (i = HEAP0; i < N + HEAP0; ++i)
1537 { 1571 {
1538 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));
1539 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])));
1540 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]))));
1541 1575
1542 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1543 } 1577 }
1544} 1578}
1545 1579
1546static void noinline 1580static void noinline
1547array_verify (EV_P_ W *ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1548{ 1582{
1549 while (cnt--) 1583 while (cnt--)
1550 { 1584 {
1551 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1552 verify_watcher (EV_A_ ws [cnt]); 1586 verify_watcher (EV_A_ ws [cnt]);
1553 } 1587 }
1554} 1588}
1555#endif 1589#endif
1556 1590
1563 1597
1564 assert (activecnt >= -1); 1598 assert (activecnt >= -1);
1565 1599
1566 assert (fdchangemax >= fdchangecnt); 1600 assert (fdchangemax >= fdchangecnt);
1567 for (i = 0; i < fdchangecnt; ++i) 1601 for (i = 0; i < fdchangecnt; ++i)
1568 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1569 1603
1570 assert (anfdmax >= 0); 1604 assert (anfdmax >= 0);
1571 for (i = 0; i < anfdmax; ++i) 1605 for (i = 0; i < anfdmax; ++i)
1572 for (w = anfds [i].head; w; w = w->next) 1606 for (w = anfds [i].head; w; w = w->next)
1573 { 1607 {
1574 verify_watcher (EV_A_ (W)w); 1608 verify_watcher (EV_A_ (W)w);
1575 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1609 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)); 1610 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1577 } 1611 }
1578 1612
1579 assert (timermax >= timercnt); 1613 assert (timermax >= timercnt);
1580 verify_heap (EV_A_ timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1581 1615
1658{ 1692{
1659#if EV_MULTIPLICITY 1693#if EV_MULTIPLICITY
1660 struct ev_loop *loop = ev_default_loop_ptr; 1694 struct ev_loop *loop = ev_default_loop_ptr;
1661#endif 1695#endif
1662 1696
1697 ev_default_loop_ptr = 0;
1698
1663#ifndef _WIN32 1699#ifndef _WIN32
1664 ev_ref (EV_A); /* child watcher */ 1700 ev_ref (EV_A); /* child watcher */
1665 ev_signal_stop (EV_A_ &childev); 1701 ev_signal_stop (EV_A_ &childev);
1666#endif 1702#endif
1667 1703
1673{ 1709{
1674#if EV_MULTIPLICITY 1710#if EV_MULTIPLICITY
1675 struct ev_loop *loop = ev_default_loop_ptr; 1711 struct ev_loop *loop = ev_default_loop_ptr;
1676#endif 1712#endif
1677 1713
1678 if (backend)
1679 postfork = 1; /* must be in line with ev_loop_fork */ 1714 postfork = 1; /* must be in line with ev_loop_fork */
1680} 1715}
1681 1716
1682/*****************************************************************************/ 1717/*****************************************************************************/
1683 1718
1684void 1719void
1697 { 1732 {
1698 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1699 1734
1700 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1701 { 1736 {
1702 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1703 1738
1704 p->w->pending = 0; 1739 p->w->pending = 0;
1705 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1706 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1707 } 1742 }
1738 1773
1739 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1740 { 1775 {
1741 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1742 1777
1743 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1744 1779
1745 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1746 if (w->repeat) 1781 if (w->repeat)
1747 { 1782 {
1748 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1749 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1750 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1751 1786
1752 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.));
1753 1788
1754 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1755 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1756 } 1791 }
1757 else 1792 else
1770 1805
1771 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1772 { 1807 {
1773 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1774 1809
1775 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1776 1811
1777 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1778 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1779 { 1814 {
1780 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1781 1816
1782 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));
1783 1818
1784 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1785 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1786 } 1821 }
1787 else if (w->interval) 1822 else if (w->interval)
2138 int fd = w->fd; 2173 int fd = w->fd;
2139 2174
2140 if (expect_false (ev_is_active (w))) 2175 if (expect_false (ev_is_active (w)))
2141 return; 2176 return;
2142 2177
2143 assert (("ev_io_start called with negative fd", fd >= 0)); 2178 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2144 2180
2145 EV_FREQUENT_CHECK; 2181 EV_FREQUENT_CHECK;
2146 2182
2147 ev_start (EV_A_ (W)w, 1); 2183 ev_start (EV_A_ (W)w, 1);
2148 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149 wlist_add (&anfds[fd].head, (WL)w); 2185 wlist_add (&anfds[fd].head, (WL)w);
2150 2186
2151 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2187 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2152 w->events &= ~EV_IOFDSET; 2188 w->events &= ~EV_IOFDSET;
2153 2189
2159{ 2195{
2160 clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2161 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2162 return; 2198 return;
2163 2199
2164 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));
2165 2201
2166 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2167 2203
2168 wlist_del (&anfds[w->fd].head, (WL)w); 2204 wlist_del (&anfds[w->fd].head, (WL)w);
2169 ev_stop (EV_A_ (W)w); 2205 ev_stop (EV_A_ (W)w);
2179 if (expect_false (ev_is_active (w))) 2215 if (expect_false (ev_is_active (w)))
2180 return; 2216 return;
2181 2217
2182 ev_at (w) += mn_now; 2218 ev_at (w) += mn_now;
2183 2219
2184 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.));
2185 2221
2186 EV_FREQUENT_CHECK; 2222 EV_FREQUENT_CHECK;
2187 2223
2188 ++timercnt; 2224 ++timercnt;
2189 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2225 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2192 ANHE_at_cache (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2193 upheap (timers, ev_active (w)); 2229 upheap (timers, ev_active (w));
2194 2230
2195 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2196 2232
2197 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2233 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2198} 2234}
2199 2235
2200void noinline 2236void noinline
2201ev_timer_stop (EV_P_ ev_timer *w) 2237ev_timer_stop (EV_P_ ev_timer *w)
2202{ 2238{
2207 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2208 2244
2209 { 2245 {
2210 int active = ev_active (w); 2246 int active = ev_active (w);
2211 2247
2212 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2248 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2213 2249
2214 --timercnt; 2250 --timercnt;
2215 2251
2216 if (expect_true (active < timercnt + HEAP0)) 2252 if (expect_true (active < timercnt + HEAP0))
2217 { 2253 {
2261 2297
2262 if (w->reschedule_cb) 2298 if (w->reschedule_cb)
2263 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2264 else if (w->interval) 2300 else if (w->interval)
2265 { 2301 {
2266 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.));
2267 /* 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 */
2268 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;
2269 } 2305 }
2270 else 2306 else
2271 ev_at (w) = w->offset; 2307 ev_at (w) = w->offset;
2279 ANHE_at_cache (periodics [ev_active (w)]); 2315 ANHE_at_cache (periodics [ev_active (w)]);
2280 upheap (periodics, ev_active (w)); 2316 upheap (periodics, ev_active (w));
2281 2317
2282 EV_FREQUENT_CHECK; 2318 EV_FREQUENT_CHECK;
2283 2319
2284 /*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));*/
2285} 2321}
2286 2322
2287void noinline 2323void noinline
2288ev_periodic_stop (EV_P_ ev_periodic *w) 2324ev_periodic_stop (EV_P_ ev_periodic *w)
2289{ 2325{
2294 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2295 2331
2296 { 2332 {
2297 int active = ev_active (w); 2333 int active = ev_active (w);
2298 2334
2299 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2335 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2300 2336
2301 --periodiccnt; 2337 --periodiccnt;
2302 2338
2303 if (expect_true (active < periodiccnt + HEAP0)) 2339 if (expect_true (active < periodiccnt + HEAP0))
2304 { 2340 {
2327 2363
2328void noinline 2364void noinline
2329ev_signal_start (EV_P_ ev_signal *w) 2365ev_signal_start (EV_P_ ev_signal *w)
2330{ 2366{
2331#if EV_MULTIPLICITY 2367#if EV_MULTIPLICITY
2332 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));
2333#endif 2369#endif
2334 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2335 return; 2371 return;
2336 2372
2337 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));
2338 2374
2339 evpipe_init (EV_A); 2375 evpipe_init (EV_A);
2340 2376
2341 EV_FREQUENT_CHECK; 2377 EV_FREQUENT_CHECK;
2342 2378
2345 sigset_t full, prev; 2381 sigset_t full, prev;
2346 sigfillset (&full); 2382 sigfillset (&full);
2347 sigprocmask (SIG_SETMASK, &full, &prev); 2383 sigprocmask (SIG_SETMASK, &full, &prev);
2348#endif 2384#endif
2349 2385
2350 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2386 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2351 2387
2352#ifndef _WIN32 2388#ifndef _WIN32
2353 sigprocmask (SIG_SETMASK, &prev, 0); 2389 sigprocmask (SIG_SETMASK, &prev, 0);
2354#endif 2390#endif
2355 } 2391 }
2393 2429
2394void 2430void
2395ev_child_start (EV_P_ ev_child *w) 2431ev_child_start (EV_P_ ev_child *w)
2396{ 2432{
2397#if EV_MULTIPLICITY 2433#if EV_MULTIPLICITY
2398 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));
2399#endif 2435#endif
2400 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
2401 return; 2437 return;
2402 2438
2403 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
2428# ifdef _WIN32 2464# ifdef _WIN32
2429# undef lstat 2465# undef lstat
2430# define lstat(a,b) _stati64 (a,b) 2466# define lstat(a,b) _stati64 (a,b)
2431# endif 2467# endif
2432 2468
2433#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 */
2434#define MIN_STAT_INTERVAL 0.1074891 2471#define MIN_STAT_INTERVAL 0.1074891
2435 2472
2436static 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);
2437 2474
2438#if EV_USE_INOTIFY 2475#if EV_USE_INOTIFY
2439# define EV_INOTIFY_BUFSIZE 8192 2476# define EV_INOTIFY_BUFSIZE 8192
2443{ 2480{
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); 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);
2445 2482
2446 if (w->wd < 0) 2483 if (w->wd < 0)
2447 { 2484 {
2485 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 */ 2486 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2449 2487
2450 /* monitor some parent directory for speedup hints */ 2488 /* monitor some parent directory for speedup hints */
2451 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2452 /* but an efficiency issue only */ 2490 /* but an efficiency issue only */
2453 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2454 { 2492 {
2455 char path [4096]; 2493 char path [4096];
2456 strcpy (path, w->path); 2494 strcpy (path, w->path);
2460 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2498 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2461 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2499 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2462 2500
2463 char *pend = strrchr (path, '/'); 2501 char *pend = strrchr (path, '/');
2464 2502
2465 if (!pend) 2503 if (!pend || pend == path)
2466 break; /* whoops, no '/', complain to your admin */ 2504 break;
2467 2505
2468 *pend = 0; 2506 *pend = 0;
2469 w->wd = inotify_add_watch (fs_fd, path, mask); 2507 w->wd = inotify_add_watch (fs_fd, path, mask);
2470 } 2508 }
2471 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2472 } 2510 }
2473 } 2511 }
2474 else
2475 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2476 2512
2477 if (w->wd >= 0) 2513 if (w->wd >= 0)
2514 {
2478 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 }
2479} 2534}
2480 2535
2481static void noinline 2536static void noinline
2482infy_del (EV_P_ ev_stat *w) 2537infy_del (EV_P_ ev_stat *w)
2483{ 2538{
2513 2568
2514 if (w->wd == wd || wd == -1) 2569 if (w->wd == wd || wd == -1)
2515 { 2570 {
2516 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2571 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2517 { 2572 {
2573 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2518 w->wd = -1; 2574 w->wd = -1;
2519 infy_add (EV_A_ w); /* re-add, no matter what */ 2575 infy_add (EV_A_ w); /* re-add, no matter what */
2520 } 2576 }
2521 2577
2522 stat_timer_cb (EV_A_ &w->timer, 0); 2578 stat_timer_cb (EV_A_ &w->timer, 0);
2536 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)
2537 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2593 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2538} 2594}
2539 2595
2540void inline_size 2596void inline_size
2541infy_init (EV_P) 2597check_2625 (EV_P)
2542{ 2598{
2543 if (fs_fd != -2)
2544 return;
2545
2546 /* kernels < 2.6.25 are borked 2599 /* kernels < 2.6.25 are borked
2547 * 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
2548 */ 2601 */
2549 {
2550 struct utsname buf; 2602 struct utsname buf;
2551 int major, minor, micro; 2603 int major, minor, micro;
2552 2604
2553 fs_fd = -1;
2554
2555 if (uname (&buf)) 2605 if (uname (&buf))
2556 return; 2606 return;
2557 2607
2558 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2608 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559 return; 2609 return;
2560 2610
2561 if (major < 2 2611 if (major < 2
2562 || (major == 2 && minor < 6) 2612 || (major == 2 && minor < 6)
2563 || (major == 2 && minor == 6 && micro < 25)) 2613 || (major == 2 && minor == 6 && micro < 25))
2564 return; 2614 return;
2565 } 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);
2566 2628
2567 fs_fd = inotify_init (); 2629 fs_fd = inotify_init ();
2568 2630
2569 if (fs_fd >= 0) 2631 if (fs_fd >= 0)
2570 { 2632 {
2598 w->wd = -1; 2660 w->wd = -1;
2599 2661
2600 if (fs_fd >= 0) 2662 if (fs_fd >= 0)
2601 infy_add (EV_A_ w); /* re-add, no matter what */ 2663 infy_add (EV_A_ w); /* re-add, no matter what */
2602 else 2664 else
2603 ev_timer_start (EV_A_ &w->timer); 2665 ev_timer_again (EV_A_ &w->timer);
2604 } 2666 }
2605 } 2667 }
2606} 2668}
2607 2669
2608#endif 2670#endif
2663ev_stat_start (EV_P_ ev_stat *w) 2725ev_stat_start (EV_P_ ev_stat *w)
2664{ 2726{
2665 if (expect_false (ev_is_active (w))) 2727 if (expect_false (ev_is_active (w)))
2666 return; 2728 return;
2667 2729
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); 2730 ev_stat_stat (EV_A_ w);
2673 2731
2732 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2674 if (w->interval < MIN_STAT_INTERVAL) 2733 w->interval = MIN_STAT_INTERVAL;
2675 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2676 2734
2677 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);
2678 ev_set_priority (&w->timer, ev_priority (w)); 2736 ev_set_priority (&w->timer, ev_priority (w));
2679 2737
2680#if EV_USE_INOTIFY 2738#if EV_USE_INOTIFY
2681 infy_init (EV_A); 2739 infy_init (EV_A);
2682 2740
2683 if (fs_fd >= 0) 2741 if (fs_fd >= 0)
2684 infy_add (EV_A_ w); 2742 infy_add (EV_A_ w);
2685 else 2743 else
2686#endif 2744#endif
2687 ev_timer_start (EV_A_ &w->timer); 2745 ev_timer_again (EV_A_ &w->timer);
2688 2746
2689 ev_start (EV_A_ (W)w, 1); 2747 ev_start (EV_A_ (W)w, 1);
2690 2748
2691 EV_FREQUENT_CHECK; 2749 EV_FREQUENT_CHECK;
2692} 2750}
2867static void 2925static void
2868embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2926embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2869{ 2927{
2870 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));
2871 2929
2930 ev_embed_stop (EV_A_ w);
2931
2872 { 2932 {
2873 struct ev_loop *loop = w->other; 2933 struct ev_loop *loop = w->other;
2874 2934
2875 ev_loop_fork (EV_A); 2935 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2876 } 2937 }
2938
2939 ev_embed_start (EV_A_ w);
2877} 2940}
2878 2941
2879#if 0 2942#if 0
2880static void 2943static void
2881embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2944embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2890 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2891 return; 2954 return;
2892 2955
2893 { 2956 {
2894 struct ev_loop *loop = w->other; 2957 struct ev_loop *loop = w->other;
2895 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 ()));
2896 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);
2897 } 2960 }
2898 2961
2899 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2900 2963

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines