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

Comparing libev/ev.c (file contents):
Revision 1.248 by root, Wed May 21 23:25:21 2008 UTC vs.
Revision 1.273 by root, Mon Nov 3 14:27:06 2008 UTC

… …
126# define EV_USE_EVENTFD 1 126# define EV_USE_EVENTFD 1
127# else 127# else
128# define EV_USE_EVENTFD 0 128# define EV_USE_EVENTFD 0
129# endif 129# endif
130# endif 130# endif
131 131
132#endif 132#endif
133 133
134#include <math.h> 134#include <math.h>
135#include <stdlib.h> 135#include <stdlib.h>
136#include <fcntl.h> 136#include <fcntl.h>
… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
235# else 244# else
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
238#endif 247#endif
239 248
249#if 0 /* debugging */
250# define EV_VERIFY 3
251# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
257#endif
258
240#ifndef EV_USE_4HEAP 259#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 260# define EV_USE_4HEAP !EV_MINIMAL
242#endif 261#endif
243 262
244#ifndef EV_HEAP_CACHE_AT 263#ifndef EV_HEAP_CACHE_AT
… …
267# include <sys/select.h> 286# include <sys/select.h>
268# endif 287# endif
269#endif 288#endif
270 289
271#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
292# include <sys/statfs.h>
272# include <sys/inotify.h> 293# include <sys/inotify.h>
294/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
295# ifndef IN_DONT_FOLLOW
296# undef EV_USE_INOTIFY
297# define EV_USE_INOTIFY 0
298# endif
273#endif 299#endif
274 300
275#if EV_SELECT_IS_WINSOCKET 301#if EV_SELECT_IS_WINSOCKET
276# include <winsock.h> 302# include <winsock.h>
277#endif 303#endif
… …
288# endif 314# endif
289#endif 315#endif
290 316
291/**/ 317/**/
292 318
293/* undefined or zero: no verification done or available */
294/* 1 or higher: ev_loop_verify function available */
295/* 2 or higher: ev_loop_verify is called frequently */
296#define EV_VERIFY 1
297
298#if EV_VERIFY > 1 319#if EV_VERIFY >= 3
299# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 320# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
300#else 321#else
301# define EV_FREQUENT_CHECK do { } while (0) 322# define EV_FREQUENT_CHECK do { } while (0)
302#endif 323#endif
303 324
… …
368{ 389{
369 syserr_cb = cb; 390 syserr_cb = cb;
370} 391}
371 392
372static void noinline 393static void noinline
373syserr (const char *msg) 394ev_syserr (const char *msg)
374{ 395{
375 if (!msg) 396 if (!msg)
376 msg = "(libev) system error"; 397 msg = "(libev) system error";
377 398
378 if (syserr_cb) 399 if (syserr_cb)
… …
429typedef struct 450typedef struct
430{ 451{
431 WL head; 452 WL head;
432 unsigned char events; 453 unsigned char events;
433 unsigned char reify; 454 unsigned char reify;
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused;
457#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif
434#if EV_SELECT_IS_WINSOCKET 460#if EV_SELECT_IS_WINSOCKET
435 SOCKET handle; 461 SOCKET handle;
436#endif 462#endif
437} ANFD; 463} ANFD;
438 464
… …
551 struct timeval tv; 577 struct timeval tv;
552 578
553 tv.tv_sec = (time_t)delay; 579 tv.tv_sec = (time_t)delay;
554 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
555 581
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */
556 select (0, 0, 0, 0, &tv); 585 select (0, 0, 0, 0, &tv);
557#endif 586#endif
558 } 587 }
559} 588}
560 589
… …
587array_realloc (int elem, void *base, int *cur, int cnt) 616array_realloc (int elem, void *base, int *cur, int cnt)
588{ 617{
589 *cur = array_nextsize (elem, *cur, cnt); 618 *cur = array_nextsize (elem, *cur, cnt);
590 return ev_realloc (base, elem * *cur); 619 return ev_realloc (base, elem * *cur);
591} 620}
621
622#define array_init_zero(base,count) \
623 memset ((void *)(base), 0, sizeof (*(base)) * (count))
592 624
593#define array_needsize(type,base,cur,cnt,init) \ 625#define array_needsize(type,base,cur,cnt,init) \
594 if (expect_false ((cnt) > (cur))) \ 626 if (expect_false ((cnt) > (cur))) \
595 { \ 627 { \
596 int ocur_ = (cur); \ 628 int ocur_ = (cur); \
… …
640 ev_feed_event (EV_A_ events [i], type); 672 ev_feed_event (EV_A_ events [i], type);
641} 673}
642 674
643/*****************************************************************************/ 675/*****************************************************************************/
644 676
645void inline_size
646anfds_init (ANFD *base, int count)
647{
648 while (count--)
649 {
650 base->head = 0;
651 base->events = EV_NONE;
652 base->reify = 0;
653
654 ++base;
655 }
656}
657
658void inline_speed 677void inline_speed
659fd_event (EV_P_ int fd, int revents) 678fd_event (EV_P_ int fd, int revents)
660{ 679{
661 ANFD *anfd = anfds + fd; 680 ANFD *anfd = anfds + fd;
662 ev_io *w; 681 ev_io *w;
… …
694 events |= (unsigned char)w->events; 713 events |= (unsigned char)w->events;
695 714
696#if EV_SELECT_IS_WINSOCKET 715#if EV_SELECT_IS_WINSOCKET
697 if (events) 716 if (events)
698 { 717 {
699 unsigned long argp; 718 unsigned long arg;
700 #ifdef EV_FD_TO_WIN32_HANDLE 719 #ifdef EV_FD_TO_WIN32_HANDLE
701 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
702 #else 721 #else
703 anfd->handle = _get_osfhandle (fd); 722 anfd->handle = _get_osfhandle (fd);
704 #endif 723 #endif
705 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 724 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
706 } 725 }
707#endif 726#endif
708 727
709 { 728 {
710 unsigned char o_events = anfd->events; 729 unsigned char o_events = anfd->events;
… …
763{ 782{
764 int fd; 783 int fd;
765 784
766 for (fd = 0; fd < anfdmax; ++fd) 785 for (fd = 0; fd < anfdmax; ++fd)
767 if (anfds [fd].events) 786 if (anfds [fd].events)
768 if (!fd_valid (fd) == -1 && errno == EBADF) 787 if (!fd_valid (fd) && errno == EBADF)
769 fd_kill (EV_A_ fd); 788 fd_kill (EV_A_ fd);
770} 789}
771 790
772/* called on ENOMEM in select/poll to kill some fds and retry */ 791/* called on ENOMEM in select/poll to kill some fds and retry */
773static void noinline 792static void noinline
… …
791 810
792 for (fd = 0; fd < anfdmax; ++fd) 811 for (fd = 0; fd < anfdmax; ++fd)
793 if (anfds [fd].events) 812 if (anfds [fd].events)
794 { 813 {
795 anfds [fd].events = 0; 814 anfds [fd].events = 0;
815 anfds [fd].emask = 0;
796 fd_change (EV_A_ fd, EV_IOFDSET | 1); 816 fd_change (EV_A_ fd, EV_IOFDSET | 1);
797 } 817 }
798} 818}
799 819
800/*****************************************************************************/ 820/*****************************************************************************/
… …
932/* rebuild the heap: this function is used only once and executed rarely */ 952/* rebuild the heap: this function is used only once and executed rarely */
933void inline_size 953void inline_size
934reheap (ANHE *heap, int N) 954reheap (ANHE *heap, int N)
935{ 955{
936 int i; 956 int i;
957
937 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
938 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */ 959 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
939 for (i = 0; i < N; ++i) 960 for (i = 0; i < N; ++i)
940 upheap (heap, i + HEAP0); 961 upheap (heap, i + HEAP0);
941} 962}
942 963
943#if EV_VERIFY
944static void
945checkheap (ANHE *heap, int N)
946{
947 int i;
948
949 for (i = HEAP0; i < N + HEAP0; ++i)
950 {
951 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
952 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
953 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
954 }
955}
956#endif
957
958/*****************************************************************************/ 964/*****************************************************************************/
959 965
960typedef struct 966typedef struct
961{ 967{
962 WL head; 968 WL head;
… …
966static ANSIG *signals; 972static ANSIG *signals;
967static int signalmax; 973static int signalmax;
968 974
969static EV_ATOMIC_T gotsig; 975static EV_ATOMIC_T gotsig;
970 976
971void inline_size
972signals_init (ANSIG *base, int count)
973{
974 while (count--)
975 {
976 base->head = 0;
977 base->gotsig = 0;
978
979 ++base;
980 }
981}
982
983/*****************************************************************************/ 977/*****************************************************************************/
984 978
985void inline_speed 979void inline_speed
986fd_intern (int fd) 980fd_intern (int fd)
987{ 981{
988#ifdef _WIN32 982#ifdef _WIN32
989 int arg = 1; 983 unsigned long arg = 1;
990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
991#else 985#else
992 fcntl (fd, F_SETFD, FD_CLOEXEC); 986 fcntl (fd, F_SETFD, FD_CLOEXEC);
993 fcntl (fd, F_SETFL, O_NONBLOCK); 987 fcntl (fd, F_SETFL, O_NONBLOCK);
994#endif 988#endif
… …
1008 } 1002 }
1009 else 1003 else
1010#endif 1004#endif
1011 { 1005 {
1012 while (pipe (evpipe)) 1006 while (pipe (evpipe))
1013 syserr ("(libev) error creating signal/async pipe"); 1007 ev_syserr ("(libev) error creating signal/async pipe");
1014 1008
1015 fd_intern (evpipe [0]); 1009 fd_intern (evpipe [0]);
1016 fd_intern (evpipe [1]); 1010 fd_intern (evpipe [1]);
1017 ev_io_set (&pipeev, evpipe [0], EV_READ); 1011 ev_io_set (&pipeev, evpipe [0], EV_READ);
1018 } 1012 }
… …
1478 1472
1479 postfork = 0; 1473 postfork = 0;
1480} 1474}
1481 1475
1482#if EV_MULTIPLICITY 1476#if EV_MULTIPLICITY
1477
1483struct ev_loop * 1478struct ev_loop *
1484ev_loop_new (unsigned int flags) 1479ev_loop_new (unsigned int flags)
1485{ 1480{
1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1481 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1487 1482
… …
1507{ 1502{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1503 postfork = 1; /* must be in line with ev_default_fork */
1509} 1504}
1510 1505
1511#if EV_VERIFY 1506#if EV_VERIFY
1512static void 1507static void noinline
1508verify_watcher (EV_P_ W w)
1509{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511
1512 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514}
1515
1516static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N)
1518{
1519 int i;
1520
1521 for (i = HEAP0; i < N + HEAP0; ++i)
1522 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1524 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1525 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 }
1529}
1530
1531static void noinline
1513array_check (W **ws, int cnt) 1532array_verify (EV_P_ W *ws, int cnt)
1514{ 1533{
1515 while (cnt--) 1534 while (cnt--)
1535 {
1516 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]);
1538 }
1517} 1539}
1540#endif
1518 1541
1519static void 1542void
1520ev_loop_verify (EV_P) 1543ev_loop_verify (EV_P)
1521{ 1544{
1545#if EV_VERIFY
1522 int i; 1546 int i;
1547 WL w;
1523 1548
1549 assert (activecnt >= -1);
1550
1551 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1554
1555 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next)
1558 {
1559 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1561 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 }
1563
1564 assert (timermax >= timercnt);
1524 checkheap (timers, timercnt); 1565 verify_heap (EV_A_ timers, timercnt);
1566
1525#if EV_PERIODIC_ENABLE 1567#if EV_PERIODIC_ENABLE
1568 assert (periodicmax >= periodiccnt);
1526 checkheap (periodics, periodiccnt); 1569 verify_heap (EV_A_ periodics, periodiccnt);
1527#endif 1570#endif
1528 1571
1572 for (i = NUMPRI; i--; )
1573 {
1574 assert (pendingmax [i] >= pendingcnt [i]);
1529#if EV_IDLE_ENABLE 1575#if EV_IDLE_ENABLE
1530 for (i = NUMPRI; i--; ) 1576 assert (idleall >= 0);
1577 assert (idlemax [i] >= idlecnt [i]);
1531 array_check ((W **)idles [i], idlecnt [i]); 1578 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1532#endif 1579#endif
1580 }
1581
1533#if EV_FORK_ENABLE 1582#if EV_FORK_ENABLE
1583 assert (forkmax >= forkcnt);
1534 array_check ((W **)forks, forkcnt); 1584 array_verify (EV_A_ (W *)forks, forkcnt);
1535#endif 1585#endif
1536 array_check ((W **)prepares, preparecnt); 1586
1537 array_check ((W **)checks, checkcnt);
1538#if EV_ASYNC_ENABLE 1587#if EV_ASYNC_ENABLE
1588 assert (asyncmax >= asynccnt);
1539 array_check ((W **)asyncs, asynccnt); 1589 array_verify (EV_A_ (W *)asyncs, asynccnt);
1590#endif
1591
1592 assert (preparemax >= preparecnt);
1593 array_verify (EV_A_ (W *)prepares, preparecnt);
1594
1595 assert (checkmax >= checkcnt);
1596 array_verify (EV_A_ (W *)checks, checkcnt);
1597
1598# if 0
1599 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1600 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1540#endif 1601# endif
1541}
1542#endif 1602#endif
1603}
1543 1604
1544#endif 1605#endif /* multiplicity */
1545 1606
1546#if EV_MULTIPLICITY 1607#if EV_MULTIPLICITY
1547struct ev_loop * 1608struct ev_loop *
1548ev_default_loop_init (unsigned int flags) 1609ev_default_loop_init (unsigned int flags)
1549#else 1610#else
… …
1582{ 1643{
1583#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1584 struct ev_loop *loop = ev_default_loop_ptr; 1645 struct ev_loop *loop = ev_default_loop_ptr;
1585#endif 1646#endif
1586 1647
1648 ev_default_loop_ptr = 0;
1649
1587#ifndef _WIN32 1650#ifndef _WIN32
1588 ev_ref (EV_A); /* child watcher */ 1651 ev_ref (EV_A); /* child watcher */
1589 ev_signal_stop (EV_A_ &childev); 1652 ev_signal_stop (EV_A_ &childev);
1590#endif 1653#endif
1591 1654
… …
1597{ 1660{
1598#if EV_MULTIPLICITY 1661#if EV_MULTIPLICITY
1599 struct ev_loop *loop = ev_default_loop_ptr; 1662 struct ev_loop *loop = ev_default_loop_ptr;
1600#endif 1663#endif
1601 1664
1602 if (backend)
1603 postfork = 1; /* must be in line with ev_loop_fork */ 1665 postfork = 1; /* must be in line with ev_loop_fork */
1604} 1666}
1605 1667
1606/*****************************************************************************/ 1668/*****************************************************************************/
1607 1669
1608void 1670void
… …
1613 1675
1614void inline_speed 1676void inline_speed
1615call_pending (EV_P) 1677call_pending (EV_P)
1616{ 1678{
1617 int pri; 1679 int pri;
1618
1619 EV_FREQUENT_CHECK;
1620 1680
1621 for (pri = NUMPRI; pri--; ) 1681 for (pri = NUMPRI; pri--; )
1622 while (pendingcnt [pri]) 1682 while (pendingcnt [pri])
1623 { 1683 {
1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
… …
1627 { 1687 {
1628 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1629 1689
1630 p->w->pending = 0; 1690 p->w->pending = 0;
1631 EV_CB_INVOKE (p->w, p->events); 1691 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK;
1632 } 1693 }
1633 } 1694 }
1634
1635 EV_FREQUENT_CHECK;
1636} 1695}
1637 1696
1638#if EV_IDLE_ENABLE 1697#if EV_IDLE_ENABLE
1639void inline_size 1698void inline_size
1640idle_reify (EV_P) 1699idle_reify (EV_P)
… …
1692#if EV_PERIODIC_ENABLE 1751#if EV_PERIODIC_ENABLE
1693void inline_size 1752void inline_size
1694periodics_reify (EV_P) 1753periodics_reify (EV_P)
1695{ 1754{
1696 EV_FREQUENT_CHECK; 1755 EV_FREQUENT_CHECK;
1756
1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1698 { 1758 {
1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1700 1760
1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
1707 1767
1708 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1709 1769
1710 ANHE_at_cache (periodics [HEAP0]); 1770 ANHE_at_cache (periodics [HEAP0]);
1711 downheap (periodics, periodiccnt, HEAP0); 1771 downheap (periodics, periodiccnt, HEAP0);
1712 EV_FREQUENT_CHECK;
1713 } 1772 }
1714 else if (w->interval) 1773 else if (w->interval)
1715 { 1774 {
1716 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1775 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1717 /* if next trigger time is not sufficiently in the future, put it there */ 1776 /* if next trigger time is not sufficiently in the future, put it there */
… …
1842ev_unref (EV_P) 1901ev_unref (EV_P)
1843{ 1902{
1844 --activecnt; 1903 --activecnt;
1845} 1904}
1846 1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1847static int loop_done; 1912static int loop_done;
1848 1913
1849void 1914void
1850ev_loop (EV_P_ int flags) 1915ev_loop (EV_P_ int flags)
1851{ 1916{
… …
1853 1918
1854 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1919 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1855 1920
1856 do 1921 do
1857 { 1922 {
1923#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A);
1925#endif
1926
1858#ifndef _WIN32 1927#ifndef _WIN32
1859 if (expect_false (curpid)) /* penalise the forking check even more */ 1928 if (expect_false (curpid)) /* penalise the forking check even more */
1860 if (expect_false (getpid () != curpid)) 1929 if (expect_false (getpid () != curpid))
1861 { 1930 {
1862 curpid = getpid (); 1931 curpid = getpid ();
… …
2056 2125
2057 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
2058 return; 2127 return;
2059 2128
2060 assert (("ev_io_start called with negative fd", fd >= 0)); 2129 assert (("ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2061 2131
2062 EV_FREQUENT_CHECK; 2132 EV_FREQUENT_CHECK;
2063 2133
2064 ev_start (EV_A_ (W)w, 1); 2134 ev_start (EV_A_ (W)w, 1);
2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2066 wlist_add (&anfds[fd].head, (WL)w); 2136 wlist_add (&anfds[fd].head, (WL)w);
2067 2137
2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2069 w->events &= ~EV_IOFDSET; 2139 w->events &= ~EV_IOFDSET;
2070 2140
… …
2262 sigset_t full, prev; 2332 sigset_t full, prev;
2263 sigfillset (&full); 2333 sigfillset (&full);
2264 sigprocmask (SIG_SETMASK, &full, &prev); 2334 sigprocmask (SIG_SETMASK, &full, &prev);
2265#endif 2335#endif
2266 2336
2267 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2268 2338
2269#ifndef _WIN32 2339#ifndef _WIN32
2270 sigprocmask (SIG_SETMASK, &prev, 0); 2340 sigprocmask (SIG_SETMASK, &prev, 0);
2271#endif 2341#endif
2272 } 2342 }
… …
2345# ifdef _WIN32 2415# ifdef _WIN32
2346# undef lstat 2416# undef lstat
2347# define lstat(a,b) _stati64 (a,b) 2417# define lstat(a,b) _stati64 (a,b)
2348# endif 2418# endif
2349 2419
2350#define DEF_STAT_INTERVAL 5.0074891 2420#define DEF_STAT_INTERVAL 5.0074891
2421#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2351#define MIN_STAT_INTERVAL 0.1074891 2422#define MIN_STAT_INTERVAL 0.1074891
2352 2423
2353static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2424static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2354 2425
2355#if EV_USE_INOTIFY 2426#if EV_USE_INOTIFY
2356# define EV_INOTIFY_BUFSIZE 8192 2427# define EV_INOTIFY_BUFSIZE 8192
… …
2360{ 2431{
2361 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); 2432 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2362 2433
2363 if (w->wd < 0) 2434 if (w->wd < 0)
2364 { 2435 {
2436 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2365 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2437 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2366 2438
2367 /* monitor some parent directory for speedup hints */ 2439 /* monitor some parent directory for speedup hints */
2368 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2440 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2369 /* but an efficiency issue only */ 2441 /* but an efficiency issue only */
2370 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2442 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2371 { 2443 {
2372 char path [4096]; 2444 char path [4096];
2373 strcpy (path, w->path); 2445 strcpy (path, w->path);
… …
2387 } 2459 }
2388 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2389 } 2461 }
2390 } 2462 }
2391 else 2463 else
2392 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2464 {
2393
2394 if (w->wd >= 0)
2395 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466
2467 /* now local changes will be tracked by inotify, but remote changes won't */
2468 /* unless the filesystem it known to be local, we therefore still poll */
2469 /* also do poll on <2.6.25, but with normal frequency */
2470 struct statfs sfs;
2471
2472 if (fs_2625 && !statfs (w->path, &sfs))
2473 if (sfs.f_type == 0x1373 /* devfs */
2474 || sfs.f_type == 0xEF53 /* ext2/3 */
2475 || sfs.f_type == 0x3153464a /* jfs */
2476 || sfs.f_type == 0x52654973 /* reiser3 */
2477 || sfs.f_type == 0x01021994 /* tempfs */
2478 || sfs.f_type == 0x58465342 /* xfs */)
2479 return;
2480
2481 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2482 ev_timer_again (EV_A_ &w->timer);
2483 }
2396} 2484}
2397 2485
2398static void noinline 2486static void noinline
2399infy_del (EV_P_ ev_stat *w) 2487infy_del (EV_P_ ev_stat *w)
2400{ 2488{
… …
2414 2502
2415static void noinline 2503static void noinline
2416infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2504infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2417{ 2505{
2418 if (slot < 0) 2506 if (slot < 0)
2419 /* overflow, need to check for all hahs slots */ 2507 /* overflow, need to check for all hash slots */
2420 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2508 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2421 infy_wd (EV_A_ slot, wd, ev); 2509 infy_wd (EV_A_ slot, wd, ev);
2422 else 2510 else
2423 { 2511 {
2424 WL w_; 2512 WL w_;
… …
2453 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2541 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2454 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2542 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2455} 2543}
2456 2544
2457void inline_size 2545void inline_size
2546check_2625 (EV_P)
2547{
2548 /* kernels < 2.6.25 are borked
2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2550 */
2551 struct utsname buf;
2552 int major, minor, micro;
2553
2554 if (uname (&buf))
2555 return;
2556
2557 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2558 return;
2559
2560 if (major < 2
2561 || (major == 2 && minor < 6)
2562 || (major == 2 && minor == 6 && micro < 25))
2563 return;
2564
2565 fs_2625 = 1;
2566}
2567
2568void inline_size
2458infy_init (EV_P) 2569infy_init (EV_P)
2459{ 2570{
2460 if (fs_fd != -2) 2571 if (fs_fd != -2)
2461 return; 2572 return;
2573
2574 fs_fd = -1;
2575
2576 check_2625 (EV_A);
2462 2577
2463 fs_fd = inotify_init (); 2578 fs_fd = inotify_init ();
2464 2579
2465 if (fs_fd >= 0) 2580 if (fs_fd >= 0)
2466 { 2581 {
… …
2494 w->wd = -1; 2609 w->wd = -1;
2495 2610
2496 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2497 infy_add (EV_A_ w); /* re-add, no matter what */ 2612 infy_add (EV_A_ w); /* re-add, no matter what */
2498 else 2613 else
2499 ev_timer_start (EV_A_ &w->timer); 2614 ev_timer_again (EV_A_ &w->timer);
2500 } 2615 }
2501
2502 } 2616 }
2503} 2617}
2504 2618
2619#endif
2620
2621#ifdef _WIN32
2622# define EV_LSTAT(p,b) _stati64 (p, b)
2623#else
2624# define EV_LSTAT(p,b) lstat (p, b)
2505#endif 2625#endif
2506 2626
2507void 2627void
2508ev_stat_stat (EV_P_ ev_stat *w) 2628ev_stat_stat (EV_P_ ev_stat *w)
2509{ 2629{
… …
2536 || w->prev.st_atime != w->attr.st_atime 2656 || w->prev.st_atime != w->attr.st_atime
2537 || w->prev.st_mtime != w->attr.st_mtime 2657 || w->prev.st_mtime != w->attr.st_mtime
2538 || w->prev.st_ctime != w->attr.st_ctime 2658 || w->prev.st_ctime != w->attr.st_ctime
2539 ) { 2659 ) {
2540 #if EV_USE_INOTIFY 2660 #if EV_USE_INOTIFY
2661 if (fs_fd >= 0)
2662 {
2541 infy_del (EV_A_ w); 2663 infy_del (EV_A_ w);
2542 infy_add (EV_A_ w); 2664 infy_add (EV_A_ w);
2543 ev_stat_stat (EV_A_ w); /* avoid race... */ 2665 ev_stat_stat (EV_A_ w); /* avoid race... */
2666 }
2544 #endif 2667 #endif
2545 2668
2546 ev_feed_event (EV_A_ w, EV_STAT); 2669 ev_feed_event (EV_A_ w, EV_STAT);
2547 } 2670 }
2548} 2671}
… …
2551ev_stat_start (EV_P_ ev_stat *w) 2674ev_stat_start (EV_P_ ev_stat *w)
2552{ 2675{
2553 if (expect_false (ev_is_active (w))) 2676 if (expect_false (ev_is_active (w)))
2554 return; 2677 return;
2555 2678
2556 /* since we use memcmp, we need to clear any padding data etc. */
2557 memset (&w->prev, 0, sizeof (ev_statdata));
2558 memset (&w->attr, 0, sizeof (ev_statdata));
2559
2560 ev_stat_stat (EV_A_ w); 2679 ev_stat_stat (EV_A_ w);
2561 2680
2681 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2562 if (w->interval < MIN_STAT_INTERVAL) 2682 w->interval = MIN_STAT_INTERVAL;
2563 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2564 2683
2565 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2684 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2566 ev_set_priority (&w->timer, ev_priority (w)); 2685 ev_set_priority (&w->timer, ev_priority (w));
2567 2686
2568#if EV_USE_INOTIFY 2687#if EV_USE_INOTIFY
2569 infy_init (EV_A); 2688 infy_init (EV_A);
2570 2689
2571 if (fs_fd >= 0) 2690 if (fs_fd >= 0)
2572 infy_add (EV_A_ w); 2691 infy_add (EV_A_ w);
2573 else 2692 else
2574#endif 2693#endif
2575 ev_timer_start (EV_A_ &w->timer); 2694 ev_timer_again (EV_A_ &w->timer);
2576 2695
2577 ev_start (EV_A_ (W)w, 1); 2696 ev_start (EV_A_ (W)w, 1);
2578 2697
2579 EV_FREQUENT_CHECK; 2698 EV_FREQUENT_CHECK;
2580} 2699}
… …
2750 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2869 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2751 } 2870 }
2752 } 2871 }
2753} 2872}
2754 2873
2874static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878
2879 {
2880 struct ev_loop *loop = w->other;
2881
2882 ev_loop_fork (EV_A);
2883 }
2884}
2885
2755#if 0 2886#if 0
2756static void 2887static void
2757embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2888embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2758{ 2889{
2759 ev_idle_stop (EV_A_ idle); 2890 ev_idle_stop (EV_A_ idle);
… …
2779 2910
2780 ev_prepare_init (&w->prepare, embed_prepare_cb); 2911 ev_prepare_init (&w->prepare, embed_prepare_cb);
2781 ev_set_priority (&w->prepare, EV_MINPRI); 2912 ev_set_priority (&w->prepare, EV_MINPRI);
2782 ev_prepare_start (EV_A_ &w->prepare); 2913 ev_prepare_start (EV_A_ &w->prepare);
2783 2914
2915 ev_fork_init (&w->fork, embed_fork_cb);
2916 ev_fork_start (EV_A_ &w->fork);
2917
2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2918 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2785 2919
2786 ev_start (EV_A_ (W)w, 1); 2920 ev_start (EV_A_ (W)w, 1);
2787 2921
2788 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
… …
2795 if (expect_false (!ev_is_active (w))) 2929 if (expect_false (!ev_is_active (w)))
2796 return; 2930 return;
2797 2931
2798 EV_FREQUENT_CHECK; 2932 EV_FREQUENT_CHECK;
2799 2933
2800 ev_io_stop (EV_A_ &w->io); 2934 ev_io_stop (EV_A_ &w->io);
2801 ev_prepare_stop (EV_A_ &w->prepare); 2935 ev_prepare_stop (EV_A_ &w->prepare);
2802 2936 ev_fork_stop (EV_A_ &w->fork);
2803 ev_stop (EV_A_ (W)w);
2804 2937
2805 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2806} 2939}
2807#endif 2940#endif
2808 2941
… …
2905once_cb (EV_P_ struct ev_once *once, int revents) 3038once_cb (EV_P_ struct ev_once *once, int revents)
2906{ 3039{
2907 void (*cb)(int revents, void *arg) = once->cb; 3040 void (*cb)(int revents, void *arg) = once->cb;
2908 void *arg = once->arg; 3041 void *arg = once->arg;
2909 3042
2910 ev_io_stop (EV_A_ &once->io); 3043 ev_io_stop (EV_A_ &once->io);
2911 ev_timer_stop (EV_A_ &once->to); 3044 ev_timer_stop (EV_A_ &once->to);
2912 ev_free (once); 3045 ev_free (once);
2913 3046
2914 cb (revents, arg); 3047 cb (revents, arg);
2915} 3048}
2916 3049
2917static void 3050static void
2918once_cb_io (EV_P_ ev_io *w, int revents) 3051once_cb_io (EV_P_ ev_io *w, int revents)
2919{ 3052{
2920 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3053 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3054
3055 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2921} 3056}
2922 3057
2923static void 3058static void
2924once_cb_to (EV_P_ ev_timer *w, int revents) 3059once_cb_to (EV_P_ ev_timer *w, int revents)
2925{ 3060{
2926 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3061 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3062
3063 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2927} 3064}
2928 3065
2929void 3066void
2930ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3067ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2931{ 3068{

Diff Legend

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