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

Comparing libev/ev.c (file contents):
Revision 1.249 by root, Wed May 21 23:30:52 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
… …
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
238#endif 247#endif
239 248
240#if 0 /* debugging */ 249#if 0 /* debugging */
241# define EV_VERIFY 1 250# define EV_VERIFY 3
242# define EV_USE_4HEAP 1 251# define EV_USE_4HEAP 1
243# define EV_HEAP_CACHE_AT 1 252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
244#endif 257#endif
245 258
246#ifndef EV_USE_4HEAP 259#ifndef EV_USE_4HEAP
247# define EV_USE_4HEAP !EV_MINIMAL 260# define EV_USE_4HEAP !EV_MINIMAL
248#endif 261#endif
… …
273# include <sys/select.h> 286# include <sys/select.h>
274# endif 287# endif
275#endif 288#endif
276 289
277#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
292# include <sys/statfs.h>
278# 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
279#endif 299#endif
280 300
281#if EV_SELECT_IS_WINSOCKET 301#if EV_SELECT_IS_WINSOCKET
282# include <winsock.h> 302# include <winsock.h>
283#endif 303#endif
… …
294# endif 314# endif
295#endif 315#endif
296 316
297/**/ 317/**/
298 318
299/* EV_VERIFY: enable internal consistency checks
300 * undefined or zero: no verification done or available
301 * 1 or higher: ev_loop_verify function available
302 * 2 or higher: ev_loop_verify is called frequently
303 */
304#if EV_VERIFY >= 1 319#if EV_VERIFY >= 3
305# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 320# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
306#else 321#else
307# define EV_FREQUENT_CHECK do { } while (0) 322# define EV_FREQUENT_CHECK do { } while (0)
308#endif 323#endif
309 324
… …
374{ 389{
375 syserr_cb = cb; 390 syserr_cb = cb;
376} 391}
377 392
378static void noinline 393static void noinline
379syserr (const char *msg) 394ev_syserr (const char *msg)
380{ 395{
381 if (!msg) 396 if (!msg)
382 msg = "(libev) system error"; 397 msg = "(libev) system error";
383 398
384 if (syserr_cb) 399 if (syserr_cb)
… …
435typedef struct 450typedef struct
436{ 451{
437 WL head; 452 WL head;
438 unsigned char events; 453 unsigned char events;
439 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
440#if EV_SELECT_IS_WINSOCKET 460#if EV_SELECT_IS_WINSOCKET
441 SOCKET handle; 461 SOCKET handle;
442#endif 462#endif
443} ANFD; 463} ANFD;
444 464
… …
557 struct timeval tv; 577 struct timeval tv;
558 578
559 tv.tv_sec = (time_t)delay; 579 tv.tv_sec = (time_t)delay;
560 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
561 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 */
562 select (0, 0, 0, 0, &tv); 585 select (0, 0, 0, 0, &tv);
563#endif 586#endif
564 } 587 }
565} 588}
566 589
… …
593array_realloc (int elem, void *base, int *cur, int cnt) 616array_realloc (int elem, void *base, int *cur, int cnt)
594{ 617{
595 *cur = array_nextsize (elem, *cur, cnt); 618 *cur = array_nextsize (elem, *cur, cnt);
596 return ev_realloc (base, elem * *cur); 619 return ev_realloc (base, elem * *cur);
597} 620}
621
622#define array_init_zero(base,count) \
623 memset ((void *)(base), 0, sizeof (*(base)) * (count))
598 624
599#define array_needsize(type,base,cur,cnt,init) \ 625#define array_needsize(type,base,cur,cnt,init) \
600 if (expect_false ((cnt) > (cur))) \ 626 if (expect_false ((cnt) > (cur))) \
601 { \ 627 { \
602 int ocur_ = (cur); \ 628 int ocur_ = (cur); \
… …
646 ev_feed_event (EV_A_ events [i], type); 672 ev_feed_event (EV_A_ events [i], type);
647} 673}
648 674
649/*****************************************************************************/ 675/*****************************************************************************/
650 676
651void inline_size
652anfds_init (ANFD *base, int count)
653{
654 while (count--)
655 {
656 base->head = 0;
657 base->events = EV_NONE;
658 base->reify = 0;
659
660 ++base;
661 }
662}
663
664void inline_speed 677void inline_speed
665fd_event (EV_P_ int fd, int revents) 678fd_event (EV_P_ int fd, int revents)
666{ 679{
667 ANFD *anfd = anfds + fd; 680 ANFD *anfd = anfds + fd;
668 ev_io *w; 681 ev_io *w;
… …
700 events |= (unsigned char)w->events; 713 events |= (unsigned char)w->events;
701 714
702#if EV_SELECT_IS_WINSOCKET 715#if EV_SELECT_IS_WINSOCKET
703 if (events) 716 if (events)
704 { 717 {
705 unsigned long argp; 718 unsigned long arg;
706 #ifdef EV_FD_TO_WIN32_HANDLE 719 #ifdef EV_FD_TO_WIN32_HANDLE
707 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
708 #else 721 #else
709 anfd->handle = _get_osfhandle (fd); 722 anfd->handle = _get_osfhandle (fd);
710 #endif 723 #endif
711 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));
712 } 725 }
713#endif 726#endif
714 727
715 { 728 {
716 unsigned char o_events = anfd->events; 729 unsigned char o_events = anfd->events;
… …
769{ 782{
770 int fd; 783 int fd;
771 784
772 for (fd = 0; fd < anfdmax; ++fd) 785 for (fd = 0; fd < anfdmax; ++fd)
773 if (anfds [fd].events) 786 if (anfds [fd].events)
774 if (!fd_valid (fd) == -1 && errno == EBADF) 787 if (!fd_valid (fd) && errno == EBADF)
775 fd_kill (EV_A_ fd); 788 fd_kill (EV_A_ fd);
776} 789}
777 790
778/* 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 */
779static void noinline 792static void noinline
… …
797 810
798 for (fd = 0; fd < anfdmax; ++fd) 811 for (fd = 0; fd < anfdmax; ++fd)
799 if (anfds [fd].events) 812 if (anfds [fd].events)
800 { 813 {
801 anfds [fd].events = 0; 814 anfds [fd].events = 0;
815 anfds [fd].emask = 0;
802 fd_change (EV_A_ fd, EV_IOFDSET | 1); 816 fd_change (EV_A_ fd, EV_IOFDSET | 1);
803 } 817 }
804} 818}
805 819
806/*****************************************************************************/ 820/*****************************************************************************/
… …
938/* 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 */
939void inline_size 953void inline_size
940reheap (ANHE *heap, int N) 954reheap (ANHE *heap, int N)
941{ 955{
942 int i; 956 int i;
957
943 /* 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 */
944 /* 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 */
945 for (i = 0; i < N; ++i) 960 for (i = 0; i < N; ++i)
946 upheap (heap, i + HEAP0); 961 upheap (heap, i + HEAP0);
947} 962}
948 963
949#if EV_VERIFY
950static void
951checkheap (ANHE *heap, int N)
952{
953 int i;
954
955 for (i = HEAP0; i < N + HEAP0; ++i)
956 {
957 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
958 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
959 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
960 }
961}
962#endif
963
964/*****************************************************************************/ 964/*****************************************************************************/
965 965
966typedef struct 966typedef struct
967{ 967{
968 WL head; 968 WL head;
… …
972static ANSIG *signals; 972static ANSIG *signals;
973static int signalmax; 973static int signalmax;
974 974
975static EV_ATOMIC_T gotsig; 975static EV_ATOMIC_T gotsig;
976 976
977void inline_size
978signals_init (ANSIG *base, int count)
979{
980 while (count--)
981 {
982 base->head = 0;
983 base->gotsig = 0;
984
985 ++base;
986 }
987}
988
989/*****************************************************************************/ 977/*****************************************************************************/
990 978
991void inline_speed 979void inline_speed
992fd_intern (int fd) 980fd_intern (int fd)
993{ 981{
994#ifdef _WIN32 982#ifdef _WIN32
995 int arg = 1; 983 unsigned long arg = 1;
996 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
997#else 985#else
998 fcntl (fd, F_SETFD, FD_CLOEXEC); 986 fcntl (fd, F_SETFD, FD_CLOEXEC);
999 fcntl (fd, F_SETFL, O_NONBLOCK); 987 fcntl (fd, F_SETFL, O_NONBLOCK);
1000#endif 988#endif
… …
1014 } 1002 }
1015 else 1003 else
1016#endif 1004#endif
1017 { 1005 {
1018 while (pipe (evpipe)) 1006 while (pipe (evpipe))
1019 syserr ("(libev) error creating signal/async pipe"); 1007 ev_syserr ("(libev) error creating signal/async pipe");
1020 1008
1021 fd_intern (evpipe [0]); 1009 fd_intern (evpipe [0]);
1022 fd_intern (evpipe [1]); 1010 fd_intern (evpipe [1]);
1023 ev_io_set (&pipeev, evpipe [0], EV_READ); 1011 ev_io_set (&pipeev, evpipe [0], EV_READ);
1024 } 1012 }
… …
1484 1472
1485 postfork = 0; 1473 postfork = 0;
1486} 1474}
1487 1475
1488#if EV_MULTIPLICITY 1476#if EV_MULTIPLICITY
1477
1489struct ev_loop * 1478struct ev_loop *
1490ev_loop_new (unsigned int flags) 1479ev_loop_new (unsigned int flags)
1491{ 1480{
1492 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));
1493 1482
… …
1513{ 1502{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1503 postfork = 1; /* must be in line with ev_default_fork */
1515} 1504}
1516 1505
1517#if EV_VERIFY 1506#if EV_VERIFY
1518static 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
1519array_check (W **ws, int cnt) 1532array_verify (EV_P_ W *ws, int cnt)
1520{ 1533{
1521 while (cnt--) 1534 while (cnt--)
1535 {
1522 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 }
1523} 1539}
1540#endif
1524 1541
1525static void 1542void
1526ev_loop_verify (EV_P) 1543ev_loop_verify (EV_P)
1527{ 1544{
1545#if EV_VERIFY
1528 int i; 1546 int i;
1547 WL w;
1529 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);
1530 checkheap (timers, timercnt); 1565 verify_heap (EV_A_ timers, timercnt);
1566
1531#if EV_PERIODIC_ENABLE 1567#if EV_PERIODIC_ENABLE
1568 assert (periodicmax >= periodiccnt);
1532 checkheap (periodics, periodiccnt); 1569 verify_heap (EV_A_ periodics, periodiccnt);
1533#endif 1570#endif
1534 1571
1572 for (i = NUMPRI; i--; )
1573 {
1574 assert (pendingmax [i] >= pendingcnt [i]);
1535#if EV_IDLE_ENABLE 1575#if EV_IDLE_ENABLE
1536 for (i = NUMPRI; i--; ) 1576 assert (idleall >= 0);
1577 assert (idlemax [i] >= idlecnt [i]);
1537 array_check ((W **)idles [i], idlecnt [i]); 1578 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1538#endif 1579#endif
1580 }
1581
1539#if EV_FORK_ENABLE 1582#if EV_FORK_ENABLE
1583 assert (forkmax >= forkcnt);
1540 array_check ((W **)forks, forkcnt); 1584 array_verify (EV_A_ (W *)forks, forkcnt);
1541#endif 1585#endif
1542 array_check ((W **)prepares, preparecnt); 1586
1543 array_check ((W **)checks, checkcnt);
1544#if EV_ASYNC_ENABLE 1587#if EV_ASYNC_ENABLE
1588 assert (asyncmax >= asynccnt);
1545 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)
1546#endif 1601# endif
1547}
1548#endif 1602#endif
1603}
1549 1604
1550#endif 1605#endif /* multiplicity */
1551 1606
1552#if EV_MULTIPLICITY 1607#if EV_MULTIPLICITY
1553struct ev_loop * 1608struct ev_loop *
1554ev_default_loop_init (unsigned int flags) 1609ev_default_loop_init (unsigned int flags)
1555#else 1610#else
… …
1588{ 1643{
1589#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1590 struct ev_loop *loop = ev_default_loop_ptr; 1645 struct ev_loop *loop = ev_default_loop_ptr;
1591#endif 1646#endif
1592 1647
1648 ev_default_loop_ptr = 0;
1649
1593#ifndef _WIN32 1650#ifndef _WIN32
1594 ev_ref (EV_A); /* child watcher */ 1651 ev_ref (EV_A); /* child watcher */
1595 ev_signal_stop (EV_A_ &childev); 1652 ev_signal_stop (EV_A_ &childev);
1596#endif 1653#endif
1597 1654
… …
1603{ 1660{
1604#if EV_MULTIPLICITY 1661#if EV_MULTIPLICITY
1605 struct ev_loop *loop = ev_default_loop_ptr; 1662 struct ev_loop *loop = ev_default_loop_ptr;
1606#endif 1663#endif
1607 1664
1608 if (backend)
1609 postfork = 1; /* must be in line with ev_loop_fork */ 1665 postfork = 1; /* must be in line with ev_loop_fork */
1610} 1666}
1611 1667
1612/*****************************************************************************/ 1668/*****************************************************************************/
1613 1669
1614void 1670void
… …
1619 1675
1620void inline_speed 1676void inline_speed
1621call_pending (EV_P) 1677call_pending (EV_P)
1622{ 1678{
1623 int pri; 1679 int pri;
1624
1625 EV_FREQUENT_CHECK;
1626 1680
1627 for (pri = NUMPRI; pri--; ) 1681 for (pri = NUMPRI; pri--; )
1628 while (pendingcnt [pri]) 1682 while (pendingcnt [pri])
1629 { 1683 {
1630 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
… …
1633 { 1687 {
1634 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1635 1689
1636 p->w->pending = 0; 1690 p->w->pending = 0;
1637 EV_CB_INVOKE (p->w, p->events); 1691 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK;
1638 } 1693 }
1639 } 1694 }
1640
1641 EV_FREQUENT_CHECK;
1642} 1695}
1643 1696
1644#if EV_IDLE_ENABLE 1697#if EV_IDLE_ENABLE
1645void inline_size 1698void inline_size
1646idle_reify (EV_P) 1699idle_reify (EV_P)
… …
1698#if EV_PERIODIC_ENABLE 1751#if EV_PERIODIC_ENABLE
1699void inline_size 1752void inline_size
1700periodics_reify (EV_P) 1753periodics_reify (EV_P)
1701{ 1754{
1702 EV_FREQUENT_CHECK; 1755 EV_FREQUENT_CHECK;
1756
1703 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1704 { 1758 {
1705 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1706 1760
1707 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
1713 1767
1714 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));
1715 1769
1716 ANHE_at_cache (periodics [HEAP0]); 1770 ANHE_at_cache (periodics [HEAP0]);
1717 downheap (periodics, periodiccnt, HEAP0); 1771 downheap (periodics, periodiccnt, HEAP0);
1718 EV_FREQUENT_CHECK;
1719 } 1772 }
1720 else if (w->interval) 1773 else if (w->interval)
1721 { 1774 {
1722 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;
1723 /* 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 */
… …
1848ev_unref (EV_P) 1901ev_unref (EV_P)
1849{ 1902{
1850 --activecnt; 1903 --activecnt;
1851} 1904}
1852 1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1853static int loop_done; 1912static int loop_done;
1854 1913
1855void 1914void
1856ev_loop (EV_P_ int flags) 1915ev_loop (EV_P_ int flags)
1857{ 1916{
… …
1859 1918
1860 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 */
1861 1920
1862 do 1921 do
1863 { 1922 {
1923#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A);
1925#endif
1926
1864#ifndef _WIN32 1927#ifndef _WIN32
1865 if (expect_false (curpid)) /* penalise the forking check even more */ 1928 if (expect_false (curpid)) /* penalise the forking check even more */
1866 if (expect_false (getpid () != curpid)) 1929 if (expect_false (getpid () != curpid))
1867 { 1930 {
1868 curpid = getpid (); 1931 curpid = getpid ();
… …
2062 2125
2063 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
2064 return; 2127 return;
2065 2128
2066 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))));
2067 2131
2068 EV_FREQUENT_CHECK; 2132 EV_FREQUENT_CHECK;
2069 2133
2070 ev_start (EV_A_ (W)w, 1); 2134 ev_start (EV_A_ (W)w, 1);
2071 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2072 wlist_add (&anfds[fd].head, (WL)w); 2136 wlist_add (&anfds[fd].head, (WL)w);
2073 2137
2074 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2075 w->events &= ~EV_IOFDSET; 2139 w->events &= ~EV_IOFDSET;
2076 2140
… …
2268 sigset_t full, prev; 2332 sigset_t full, prev;
2269 sigfillset (&full); 2333 sigfillset (&full);
2270 sigprocmask (SIG_SETMASK, &full, &prev); 2334 sigprocmask (SIG_SETMASK, &full, &prev);
2271#endif 2335#endif
2272 2336
2273 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2274 2338
2275#ifndef _WIN32 2339#ifndef _WIN32
2276 sigprocmask (SIG_SETMASK, &prev, 0); 2340 sigprocmask (SIG_SETMASK, &prev, 0);
2277#endif 2341#endif
2278 } 2342 }
… …
2351# ifdef _WIN32 2415# ifdef _WIN32
2352# undef lstat 2416# undef lstat
2353# define lstat(a,b) _stati64 (a,b) 2417# define lstat(a,b) _stati64 (a,b)
2354# endif 2418# endif
2355 2419
2356#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 */
2357#define MIN_STAT_INTERVAL 0.1074891 2422#define MIN_STAT_INTERVAL 0.1074891
2358 2423
2359static 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);
2360 2425
2361#if EV_USE_INOTIFY 2426#if EV_USE_INOTIFY
2362# define EV_INOTIFY_BUFSIZE 8192 2427# define EV_INOTIFY_BUFSIZE 8192
… …
2366{ 2431{
2367 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);
2368 2433
2369 if (w->wd < 0) 2434 if (w->wd < 0)
2370 { 2435 {
2436 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2371 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 */
2372 2438
2373 /* monitor some parent directory for speedup hints */ 2439 /* monitor some parent directory for speedup hints */
2374 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2440 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2375 /* but an efficiency issue only */ 2441 /* but an efficiency issue only */
2376 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2442 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2377 { 2443 {
2378 char path [4096]; 2444 char path [4096];
2379 strcpy (path, w->path); 2445 strcpy (path, w->path);
… …
2393 } 2459 }
2394 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2395 } 2461 }
2396 } 2462 }
2397 else 2463 else
2398 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2464 {
2399
2400 if (w->wd >= 0)
2401 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 }
2402} 2484}
2403 2485
2404static void noinline 2486static void noinline
2405infy_del (EV_P_ ev_stat *w) 2487infy_del (EV_P_ ev_stat *w)
2406{ 2488{
… …
2420 2502
2421static void noinline 2503static void noinline
2422infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2504infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2423{ 2505{
2424 if (slot < 0) 2506 if (slot < 0)
2425 /* overflow, need to check for all hahs slots */ 2507 /* overflow, need to check for all hash slots */
2426 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2508 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2427 infy_wd (EV_A_ slot, wd, ev); 2509 infy_wd (EV_A_ slot, wd, ev);
2428 else 2510 else
2429 { 2511 {
2430 WL w_; 2512 WL w_;
… …
2459 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)
2460 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2542 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2461} 2543}
2462 2544
2463void 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
2464infy_init (EV_P) 2569infy_init (EV_P)
2465{ 2570{
2466 if (fs_fd != -2) 2571 if (fs_fd != -2)
2467 return; 2572 return;
2573
2574 fs_fd = -1;
2575
2576 check_2625 (EV_A);
2468 2577
2469 fs_fd = inotify_init (); 2578 fs_fd = inotify_init ();
2470 2579
2471 if (fs_fd >= 0) 2580 if (fs_fd >= 0)
2472 { 2581 {
… …
2500 w->wd = -1; 2609 w->wd = -1;
2501 2610
2502 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2503 infy_add (EV_A_ w); /* re-add, no matter what */ 2612 infy_add (EV_A_ w); /* re-add, no matter what */
2504 else 2613 else
2505 ev_timer_start (EV_A_ &w->timer); 2614 ev_timer_again (EV_A_ &w->timer);
2506 } 2615 }
2507
2508 } 2616 }
2509} 2617}
2510 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)
2511#endif 2625#endif
2512 2626
2513void 2627void
2514ev_stat_stat (EV_P_ ev_stat *w) 2628ev_stat_stat (EV_P_ ev_stat *w)
2515{ 2629{
… …
2542 || w->prev.st_atime != w->attr.st_atime 2656 || w->prev.st_atime != w->attr.st_atime
2543 || w->prev.st_mtime != w->attr.st_mtime 2657 || w->prev.st_mtime != w->attr.st_mtime
2544 || w->prev.st_ctime != w->attr.st_ctime 2658 || w->prev.st_ctime != w->attr.st_ctime
2545 ) { 2659 ) {
2546 #if EV_USE_INOTIFY 2660 #if EV_USE_INOTIFY
2661 if (fs_fd >= 0)
2662 {
2547 infy_del (EV_A_ w); 2663 infy_del (EV_A_ w);
2548 infy_add (EV_A_ w); 2664 infy_add (EV_A_ w);
2549 ev_stat_stat (EV_A_ w); /* avoid race... */ 2665 ev_stat_stat (EV_A_ w); /* avoid race... */
2666 }
2550 #endif 2667 #endif
2551 2668
2552 ev_feed_event (EV_A_ w, EV_STAT); 2669 ev_feed_event (EV_A_ w, EV_STAT);
2553 } 2670 }
2554} 2671}
… …
2557ev_stat_start (EV_P_ ev_stat *w) 2674ev_stat_start (EV_P_ ev_stat *w)
2558{ 2675{
2559 if (expect_false (ev_is_active (w))) 2676 if (expect_false (ev_is_active (w)))
2560 return; 2677 return;
2561 2678
2562 /* since we use memcmp, we need to clear any padding data etc. */
2563 memset (&w->prev, 0, sizeof (ev_statdata));
2564 memset (&w->attr, 0, sizeof (ev_statdata));
2565
2566 ev_stat_stat (EV_A_ w); 2679 ev_stat_stat (EV_A_ w);
2567 2680
2681 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2568 if (w->interval < MIN_STAT_INTERVAL) 2682 w->interval = MIN_STAT_INTERVAL;
2569 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2570 2683
2571 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);
2572 ev_set_priority (&w->timer, ev_priority (w)); 2685 ev_set_priority (&w->timer, ev_priority (w));
2573 2686
2574#if EV_USE_INOTIFY 2687#if EV_USE_INOTIFY
2575 infy_init (EV_A); 2688 infy_init (EV_A);
2576 2689
2577 if (fs_fd >= 0) 2690 if (fs_fd >= 0)
2578 infy_add (EV_A_ w); 2691 infy_add (EV_A_ w);
2579 else 2692 else
2580#endif 2693#endif
2581 ev_timer_start (EV_A_ &w->timer); 2694 ev_timer_again (EV_A_ &w->timer);
2582 2695
2583 ev_start (EV_A_ (W)w, 1); 2696 ev_start (EV_A_ (W)w, 1);
2584 2697
2585 EV_FREQUENT_CHECK; 2698 EV_FREQUENT_CHECK;
2586} 2699}
… …
2756 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2869 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2757 } 2870 }
2758 } 2871 }
2759} 2872}
2760 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
2761#if 0 2886#if 0
2762static void 2887static void
2763embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2888embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2764{ 2889{
2765 ev_idle_stop (EV_A_ idle); 2890 ev_idle_stop (EV_A_ idle);
… …
2785 2910
2786 ev_prepare_init (&w->prepare, embed_prepare_cb); 2911 ev_prepare_init (&w->prepare, embed_prepare_cb);
2787 ev_set_priority (&w->prepare, EV_MINPRI); 2912 ev_set_priority (&w->prepare, EV_MINPRI);
2788 ev_prepare_start (EV_A_ &w->prepare); 2913 ev_prepare_start (EV_A_ &w->prepare);
2789 2914
2915 ev_fork_init (&w->fork, embed_fork_cb);
2916 ev_fork_start (EV_A_ &w->fork);
2917
2790 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2918 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2791 2919
2792 ev_start (EV_A_ (W)w, 1); 2920 ev_start (EV_A_ (W)w, 1);
2793 2921
2794 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
… …
2801 if (expect_false (!ev_is_active (w))) 2929 if (expect_false (!ev_is_active (w)))
2802 return; 2930 return;
2803 2931
2804 EV_FREQUENT_CHECK; 2932 EV_FREQUENT_CHECK;
2805 2933
2806 ev_io_stop (EV_A_ &w->io); 2934 ev_io_stop (EV_A_ &w->io);
2807 ev_prepare_stop (EV_A_ &w->prepare); 2935 ev_prepare_stop (EV_A_ &w->prepare);
2808 2936 ev_fork_stop (EV_A_ &w->fork);
2809 ev_stop (EV_A_ (W)w);
2810 2937
2811 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2812} 2939}
2813#endif 2940#endif
2814 2941
… …
2911once_cb (EV_P_ struct ev_once *once, int revents) 3038once_cb (EV_P_ struct ev_once *once, int revents)
2912{ 3039{
2913 void (*cb)(int revents, void *arg) = once->cb; 3040 void (*cb)(int revents, void *arg) = once->cb;
2914 void *arg = once->arg; 3041 void *arg = once->arg;
2915 3042
2916 ev_io_stop (EV_A_ &once->io); 3043 ev_io_stop (EV_A_ &once->io);
2917 ev_timer_stop (EV_A_ &once->to); 3044 ev_timer_stop (EV_A_ &once->to);
2918 ev_free (once); 3045 ev_free (once);
2919 3046
2920 cb (revents, arg); 3047 cb (revents, arg);
2921} 3048}
2922 3049
2923static void 3050static void
2924once_cb_io (EV_P_ ev_io *w, int revents) 3051once_cb_io (EV_P_ ev_io *w, int revents)
2925{ 3052{
2926 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));
2927} 3056}
2928 3057
2929static void 3058static void
2930once_cb_to (EV_P_ ev_timer *w, int revents) 3059once_cb_to (EV_P_ ev_timer *w, int revents)
2931{ 3060{
2932 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));
2933} 3064}
2934 3065
2935void 3066void
2936ev_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)
2937{ 3068{

Diff Legend

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