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.276 by root, Sun Dec 14 13:03:54 2008 UTC

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
126# define EV_USE_EVENTFD 1 138# define EV_USE_EVENTFD 1
127# else 139# else
128# define EV_USE_EVENTFD 0 140# define EV_USE_EVENTFD 0
129# endif 141# endif
130# endif 142# endif
131 143
132#endif 144#endif
133 145
134#include <math.h> 146#include <math.h>
135#include <stdlib.h> 147#include <stdlib.h>
136#include <fcntl.h> 148#include <fcntl.h>
154#ifndef _WIN32 166#ifndef _WIN32
155# include <sys/time.h> 167# include <sys/time.h>
156# include <sys/wait.h> 168# include <sys/wait.h>
157# include <unistd.h> 169# include <unistd.h>
158#else 170#else
171# include <io.h>
159# define WIN32_LEAN_AND_MEAN 172# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 173# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 174# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 175# define EV_SELECT_IS_WINSOCKET 1
163# endif 176# endif
164#endif 177#endif
165 178
166/* 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 */
167 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
168#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1
192# else
169# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif
170#endif 195#endif
171 196
172#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME 0
174#endif 199#endif
175 200
176#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1
204# else
177# define EV_USE_NANOSLEEP 0 205# define EV_USE_NANOSLEEP 0
206# endif
178#endif 207#endif
179 208
180#ifndef EV_USE_SELECT 209#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 210# define EV_USE_SELECT 1
182#endif 211#endif
235# else 264# else
236# define EV_USE_EVENTFD 0 265# define EV_USE_EVENTFD 0
237# endif 266# endif
238#endif 267#endif
239 268
269#if 0 /* debugging */
270# define EV_VERIFY 3
271# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1
273#endif
274
275#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL
277#endif
278
240#ifndef EV_USE_4HEAP 279#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 280# define EV_USE_4HEAP !EV_MINIMAL
242#endif 281#endif
243 282
244#ifndef EV_HEAP_CACHE_AT 283#ifndef EV_HEAP_CACHE_AT
267# include <sys/select.h> 306# include <sys/select.h>
268# endif 307# endif
269#endif 308#endif
270 309
271#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
272# include <sys/inotify.h> 313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
273#endif 319#endif
274 320
275#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
276# 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
277#endif 332#endif
278 333
279#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
280/* 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 */
281# include <stdint.h> 336# include <stdint.h>
288# endif 343# endif
289#endif 344#endif
290 345
291/**/ 346/**/
292 347
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 348#if EV_VERIFY >= 3
299# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
300#else 350#else
301# define EV_FREQUENT_CHECK do { } while (0) 351# define EV_FREQUENT_CHECK do { } while (0)
302#endif 352#endif
303 353
368{ 418{
369 syserr_cb = cb; 419 syserr_cb = cb;
370} 420}
371 421
372static void noinline 422static void noinline
373syserr (const char *msg) 423ev_syserr (const char *msg)
374{ 424{
375 if (!msg) 425 if (!msg)
376 msg = "(libev) system error"; 426 msg = "(libev) system error";
377 427
378 if (syserr_cb) 428 if (syserr_cb)
429typedef struct 479typedef struct
430{ 480{
431 WL head; 481 WL head;
432 unsigned char events; 482 unsigned char events;
433 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
434#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
435 SOCKET handle; 490 SOCKET handle;
436#endif 491#endif
437} ANFD; 492} ANFD;
438 493
551 struct timeval tv; 606 struct timeval tv;
552 607
553 tv.tv_sec = (time_t)delay; 608 tv.tv_sec = (time_t)delay;
554 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
555 610
611 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */
556 select (0, 0, 0, 0, &tv); 614 select (0, 0, 0, 0, &tv);
557#endif 615#endif
558 } 616 }
559} 617}
560 618
587array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
588{ 646{
589 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
590 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
591} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
592 653
593#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
594 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
595 { \ 656 { \
596 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
640 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
641} 702}
642 703
643/*****************************************************************************/ 704/*****************************************************************************/
644 705
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 706void inline_speed
659fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
660{ 708{
661 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
662 ev_io *w; 710 ev_io *w;
694 events |= (unsigned char)w->events; 742 events |= (unsigned char)w->events;
695 743
696#if EV_SELECT_IS_WINSOCKET 744#if EV_SELECT_IS_WINSOCKET
697 if (events) 745 if (events)
698 { 746 {
699 unsigned long argp; 747 unsigned long arg;
700 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
701 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
702 #else 750 #else
703 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
704 #endif 752 #endif
705 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
706 } 754 }
707#endif 755#endif
708 756
709 { 757 {
710 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
763{ 811{
764 int fd; 812 int fd;
765 813
766 for (fd = 0; fd < anfdmax; ++fd) 814 for (fd = 0; fd < anfdmax; ++fd)
767 if (anfds [fd].events) 815 if (anfds [fd].events)
768 if (!fd_valid (fd) == -1 && errno == EBADF) 816 if (!fd_valid (fd) && errno == EBADF)
769 fd_kill (EV_A_ fd); 817 fd_kill (EV_A_ fd);
770} 818}
771 819
772/* called on ENOMEM in select/poll to kill some fds and retry */ 820/* called on ENOMEM in select/poll to kill some fds and retry */
773static void noinline 821static void noinline
791 839
792 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
793 if (anfds [fd].events) 841 if (anfds [fd].events)
794 { 842 {
795 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
796 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
797 } 846 }
798} 847}
799 848
800/*****************************************************************************/ 849/*****************************************************************************/
932/* rebuild the heap: this function is used only once and executed rarely */ 981/* rebuild the heap: this function is used only once and executed rarely */
933void inline_size 982void inline_size
934reheap (ANHE *heap, int N) 983reheap (ANHE *heap, int N)
935{ 984{
936 int i; 985 int i;
986
937 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 987 /* 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 */ 988 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
939 for (i = 0; i < N; ++i) 989 for (i = 0; i < N; ++i)
940 upheap (heap, i + HEAP0); 990 upheap (heap, i + HEAP0);
941} 991}
942 992
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/*****************************************************************************/ 993/*****************************************************************************/
959 994
960typedef struct 995typedef struct
961{ 996{
962 WL head; 997 WL head;
966static ANSIG *signals; 1001static ANSIG *signals;
967static int signalmax; 1002static int signalmax;
968 1003
969static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
970 1005
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/*****************************************************************************/ 1006/*****************************************************************************/
984 1007
985void inline_speed 1008void inline_speed
986fd_intern (int fd) 1009fd_intern (int fd)
987{ 1010{
988#ifdef _WIN32 1011#ifdef _WIN32
989 int arg = 1; 1012 unsigned long arg = 1;
990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
991#else 1014#else
992 fcntl (fd, F_SETFD, FD_CLOEXEC); 1015 fcntl (fd, F_SETFD, FD_CLOEXEC);
993 fcntl (fd, F_SETFL, O_NONBLOCK); 1016 fcntl (fd, F_SETFL, O_NONBLOCK);
994#endif 1017#endif
1008 } 1031 }
1009 else 1032 else
1010#endif 1033#endif
1011 { 1034 {
1012 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1013 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1014 1037
1015 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1016 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1017 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1018 } 1041 }
1247 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1248 /* it usually doesn't work correctly on anything but sockets and pipes */ 1271 /* it usually doesn't work correctly on anything but sockets and pipes */
1249 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1250#endif 1273#endif
1251#ifdef __APPLE__ 1274#ifdef __APPLE__
1252 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 // flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation
1253 flags &= ~EVBACKEND_POLL; 1276 flags &= ~EVBACKEND_SELECT;
1254#endif 1277#endif
1255 1278
1256 return flags; 1279 return flags;
1257} 1280}
1258 1281
1478 1501
1479 postfork = 0; 1502 postfork = 0;
1480} 1503}
1481 1504
1482#if EV_MULTIPLICITY 1505#if EV_MULTIPLICITY
1506
1483struct ev_loop * 1507struct ev_loop *
1484ev_loop_new (unsigned int flags) 1508ev_loop_new (unsigned int flags)
1485{ 1509{
1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1510 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1487 1511
1507{ 1531{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1532 postfork = 1; /* must be in line with ev_default_fork */
1509} 1533}
1510 1534
1511#if EV_VERIFY 1535#if EV_VERIFY
1512static void 1536static void noinline
1537verify_watcher (EV_P_ W w)
1538{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540
1541 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543}
1544
1545static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N)
1547{
1548 int i;
1549
1550 for (i = HEAP0; i < N + HEAP0; ++i)
1551 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1553 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1554 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 }
1558}
1559
1560static void noinline
1513array_check (W **ws, int cnt) 1561array_verify (EV_P_ W *ws, int cnt)
1514{ 1562{
1515 while (cnt--) 1563 while (cnt--)
1564 {
1516 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]);
1567 }
1517} 1568}
1569#endif
1518 1570
1519static void 1571void
1520ev_loop_verify (EV_P) 1572ev_loop_verify (EV_P)
1521{ 1573{
1574#if EV_VERIFY
1522 int i; 1575 int i;
1576 WL w;
1523 1577
1578 assert (activecnt >= -1);
1579
1580 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1583
1584 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next)
1587 {
1588 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1590 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 }
1592
1593 assert (timermax >= timercnt);
1524 checkheap (timers, timercnt); 1594 verify_heap (EV_A_ timers, timercnt);
1595
1525#if EV_PERIODIC_ENABLE 1596#if EV_PERIODIC_ENABLE
1597 assert (periodicmax >= periodiccnt);
1526 checkheap (periodics, periodiccnt); 1598 verify_heap (EV_A_ periodics, periodiccnt);
1527#endif 1599#endif
1528 1600
1601 for (i = NUMPRI; i--; )
1602 {
1603 assert (pendingmax [i] >= pendingcnt [i]);
1529#if EV_IDLE_ENABLE 1604#if EV_IDLE_ENABLE
1530 for (i = NUMPRI; i--; ) 1605 assert (idleall >= 0);
1606 assert (idlemax [i] >= idlecnt [i]);
1531 array_check ((W **)idles [i], idlecnt [i]); 1607 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1532#endif 1608#endif
1609 }
1610
1533#if EV_FORK_ENABLE 1611#if EV_FORK_ENABLE
1612 assert (forkmax >= forkcnt);
1534 array_check ((W **)forks, forkcnt); 1613 array_verify (EV_A_ (W *)forks, forkcnt);
1535#endif 1614#endif
1536 array_check ((W **)prepares, preparecnt); 1615
1537 array_check ((W **)checks, checkcnt);
1538#if EV_ASYNC_ENABLE 1616#if EV_ASYNC_ENABLE
1617 assert (asyncmax >= asynccnt);
1539 array_check ((W **)asyncs, asynccnt); 1618 array_verify (EV_A_ (W *)asyncs, asynccnt);
1619#endif
1620
1621 assert (preparemax >= preparecnt);
1622 array_verify (EV_A_ (W *)prepares, preparecnt);
1623
1624 assert (checkmax >= checkcnt);
1625 array_verify (EV_A_ (W *)checks, checkcnt);
1626
1627# if 0
1628 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1629 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1540#endif 1630# endif
1541}
1542#endif 1631#endif
1632}
1543 1633
1544#endif 1634#endif /* multiplicity */
1545 1635
1546#if EV_MULTIPLICITY 1636#if EV_MULTIPLICITY
1547struct ev_loop * 1637struct ev_loop *
1548ev_default_loop_init (unsigned int flags) 1638ev_default_loop_init (unsigned int flags)
1549#else 1639#else
1582{ 1672{
1583#if EV_MULTIPLICITY 1673#if EV_MULTIPLICITY
1584 struct ev_loop *loop = ev_default_loop_ptr; 1674 struct ev_loop *loop = ev_default_loop_ptr;
1585#endif 1675#endif
1586 1676
1677 ev_default_loop_ptr = 0;
1678
1587#ifndef _WIN32 1679#ifndef _WIN32
1588 ev_ref (EV_A); /* child watcher */ 1680 ev_ref (EV_A); /* child watcher */
1589 ev_signal_stop (EV_A_ &childev); 1681 ev_signal_stop (EV_A_ &childev);
1590#endif 1682#endif
1591 1683
1597{ 1689{
1598#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1599 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1600#endif 1692#endif
1601 1693
1602 if (backend)
1603 postfork = 1; /* must be in line with ev_loop_fork */ 1694 postfork = 1; /* must be in line with ev_loop_fork */
1604} 1695}
1605 1696
1606/*****************************************************************************/ 1697/*****************************************************************************/
1607 1698
1608void 1699void
1613 1704
1614void inline_speed 1705void inline_speed
1615call_pending (EV_P) 1706call_pending (EV_P)
1616{ 1707{
1617 int pri; 1708 int pri;
1618
1619 EV_FREQUENT_CHECK;
1620 1709
1621 for (pri = NUMPRI; pri--; ) 1710 for (pri = NUMPRI; pri--; )
1622 while (pendingcnt [pri]) 1711 while (pendingcnt [pri])
1623 { 1712 {
1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1713 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1627 { 1716 {
1628 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1717 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1629 1718
1630 p->w->pending = 0; 1719 p->w->pending = 0;
1631 EV_CB_INVOKE (p->w, p->events); 1720 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK;
1632 } 1722 }
1633 } 1723 }
1634
1635 EV_FREQUENT_CHECK;
1636} 1724}
1637 1725
1638#if EV_IDLE_ENABLE 1726#if EV_IDLE_ENABLE
1639void inline_size 1727void inline_size
1640idle_reify (EV_P) 1728idle_reify (EV_P)
1692#if EV_PERIODIC_ENABLE 1780#if EV_PERIODIC_ENABLE
1693void inline_size 1781void inline_size
1694periodics_reify (EV_P) 1782periodics_reify (EV_P)
1695{ 1783{
1696 EV_FREQUENT_CHECK; 1784 EV_FREQUENT_CHECK;
1785
1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1698 { 1787 {
1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1700 1789
1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1707 1796
1708 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1797 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1709 1798
1710 ANHE_at_cache (periodics [HEAP0]); 1799 ANHE_at_cache (periodics [HEAP0]);
1711 downheap (periodics, periodiccnt, HEAP0); 1800 downheap (periodics, periodiccnt, HEAP0);
1712 EV_FREQUENT_CHECK;
1713 } 1801 }
1714 else if (w->interval) 1802 else if (w->interval)
1715 { 1803 {
1716 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1804 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 */ 1805 /* if next trigger time is not sufficiently in the future, put it there */
1842ev_unref (EV_P) 1930ev_unref (EV_P)
1843{ 1931{
1844 --activecnt; 1932 --activecnt;
1845} 1933}
1846 1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939}
1940
1847static int loop_done; 1941static int loop_done;
1848 1942
1849void 1943void
1850ev_loop (EV_P_ int flags) 1944ev_loop (EV_P_ int flags)
1851{ 1945{
1853 1947
1854 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1948 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1855 1949
1856 do 1950 do
1857 { 1951 {
1952#if EV_VERIFY >= 2
1953 ev_loop_verify (EV_A);
1954#endif
1955
1858#ifndef _WIN32 1956#ifndef _WIN32
1859 if (expect_false (curpid)) /* penalise the forking check even more */ 1957 if (expect_false (curpid)) /* penalise the forking check even more */
1860 if (expect_false (getpid () != curpid)) 1958 if (expect_false (getpid () != curpid))
1861 { 1959 {
1862 curpid = getpid (); 1960 curpid = getpid ();
2056 2154
2057 if (expect_false (ev_is_active (w))) 2155 if (expect_false (ev_is_active (w)))
2058 return; 2156 return;
2059 2157
2060 assert (("ev_io_start called with negative fd", fd >= 0)); 2158 assert (("ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2061 2160
2062 EV_FREQUENT_CHECK; 2161 EV_FREQUENT_CHECK;
2063 2162
2064 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2066 wlist_add (&anfds[fd].head, (WL)w); 2165 wlist_add (&anfds[fd].head, (WL)w);
2067 2166
2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2069 w->events &= ~EV_IOFDSET; 2168 w->events &= ~EV_IOFDSET;
2070 2169
2262 sigset_t full, prev; 2361 sigset_t full, prev;
2263 sigfillset (&full); 2362 sigfillset (&full);
2264 sigprocmask (SIG_SETMASK, &full, &prev); 2363 sigprocmask (SIG_SETMASK, &full, &prev);
2265#endif 2364#endif
2266 2365
2267 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2268 2367
2269#ifndef _WIN32 2368#ifndef _WIN32
2270 sigprocmask (SIG_SETMASK, &prev, 0); 2369 sigprocmask (SIG_SETMASK, &prev, 0);
2271#endif 2370#endif
2272 } 2371 }
2345# ifdef _WIN32 2444# ifdef _WIN32
2346# undef lstat 2445# undef lstat
2347# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
2348# endif 2447# endif
2349 2448
2350#define DEF_STAT_INTERVAL 5.0074891 2449#define DEF_STAT_INTERVAL 5.0074891
2450#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2351#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
2352 2452
2353static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2453static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2354 2454
2355#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
2356# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
2360{ 2460{
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); 2461 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 2462
2363 if (w->wd < 0) 2463 if (w->wd < 0)
2364 { 2464 {
2465 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 */ 2466 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2366 2467
2367 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2368 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2369 /* but an efficiency issue only */ 2470 /* but an efficiency issue only */
2370 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2371 { 2472 {
2372 char path [4096]; 2473 char path [4096];
2373 strcpy (path, w->path); 2474 strcpy (path, w->path);
2377 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2478 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2378 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2479 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2379 2480
2380 char *pend = strrchr (path, '/'); 2481 char *pend = strrchr (path, '/');
2381 2482
2382 if (!pend) 2483 if (!pend || pend == path)
2383 break; /* whoops, no '/', complain to your admin */ 2484 break;
2384 2485
2385 *pend = 0; 2486 *pend = 0;
2386 w->wd = inotify_add_watch (fs_fd, path, mask); 2487 w->wd = inotify_add_watch (fs_fd, path, mask);
2387 } 2488 }
2388 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2389 } 2490 }
2390 } 2491 }
2391 else
2392 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2393 2492
2394 if (w->wd >= 0) 2493 if (w->wd >= 0)
2494 {
2395 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2495 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2496
2497 /* now local changes will be tracked by inotify, but remote changes won't */
2498 /* unless the filesystem it known to be local, we therefore still poll */
2499 /* also do poll on <2.6.25, but with normal frequency */
2500 struct statfs sfs;
2501
2502 if (fs_2625 && !statfs (w->path, &sfs))
2503 if (sfs.f_type == 0x1373 /* devfs */
2504 || sfs.f_type == 0xEF53 /* ext2/3 */
2505 || sfs.f_type == 0x3153464a /* jfs */
2506 || sfs.f_type == 0x52654973 /* reiser3 */
2507 || sfs.f_type == 0x01021994 /* tempfs */
2508 || sfs.f_type == 0x58465342 /* xfs */)
2509 return;
2510
2511 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2512 ev_timer_again (EV_A_ &w->timer);
2513 }
2396} 2514}
2397 2515
2398static void noinline 2516static void noinline
2399infy_del (EV_P_ ev_stat *w) 2517infy_del (EV_P_ ev_stat *w)
2400{ 2518{
2414 2532
2415static void noinline 2533static void noinline
2416infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2534infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2417{ 2535{
2418 if (slot < 0) 2536 if (slot < 0)
2419 /* overflow, need to check for all hahs slots */ 2537 /* overflow, need to check for all hash slots */
2420 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2538 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2421 infy_wd (EV_A_ slot, wd, ev); 2539 infy_wd (EV_A_ slot, wd, ev);
2422 else 2540 else
2423 { 2541 {
2424 WL w_; 2542 WL w_;
2430 2548
2431 if (w->wd == wd || wd == -1) 2549 if (w->wd == wd || wd == -1)
2432 { 2550 {
2433 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2551 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2434 { 2552 {
2553 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2435 w->wd = -1; 2554 w->wd = -1;
2436 infy_add (EV_A_ w); /* re-add, no matter what */ 2555 infy_add (EV_A_ w); /* re-add, no matter what */
2437 } 2556 }
2438 2557
2439 stat_timer_cb (EV_A_ &w->timer, 0); 2558 stat_timer_cb (EV_A_ &w->timer, 0);
2453 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2572 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2454 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2573 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2455} 2574}
2456 2575
2457void inline_size 2576void inline_size
2577check_2625 (EV_P)
2578{
2579 /* kernels < 2.6.25 are borked
2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2581 */
2582 struct utsname buf;
2583 int major, minor, micro;
2584
2585 if (uname (&buf))
2586 return;
2587
2588 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2589 return;
2590
2591 if (major < 2
2592 || (major == 2 && minor < 6)
2593 || (major == 2 && minor == 6 && micro < 25))
2594 return;
2595
2596 fs_2625 = 1;
2597}
2598
2599void inline_size
2458infy_init (EV_P) 2600infy_init (EV_P)
2459{ 2601{
2460 if (fs_fd != -2) 2602 if (fs_fd != -2)
2461 return; 2603 return;
2604
2605 fs_fd = -1;
2606
2607 check_2625 (EV_A);
2462 2608
2463 fs_fd = inotify_init (); 2609 fs_fd = inotify_init ();
2464 2610
2465 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2466 { 2612 {
2494 w->wd = -1; 2640 w->wd = -1;
2495 2641
2496 if (fs_fd >= 0) 2642 if (fs_fd >= 0)
2497 infy_add (EV_A_ w); /* re-add, no matter what */ 2643 infy_add (EV_A_ w); /* re-add, no matter what */
2498 else 2644 else
2499 ev_timer_start (EV_A_ &w->timer); 2645 ev_timer_again (EV_A_ &w->timer);
2500 } 2646 }
2501
2502 } 2647 }
2503} 2648}
2504 2649
2650#endif
2651
2652#ifdef _WIN32
2653# define EV_LSTAT(p,b) _stati64 (p, b)
2654#else
2655# define EV_LSTAT(p,b) lstat (p, b)
2505#endif 2656#endif
2506 2657
2507void 2658void
2508ev_stat_stat (EV_P_ ev_stat *w) 2659ev_stat_stat (EV_P_ ev_stat *w)
2509{ 2660{
2536 || w->prev.st_atime != w->attr.st_atime 2687 || w->prev.st_atime != w->attr.st_atime
2537 || w->prev.st_mtime != w->attr.st_mtime 2688 || w->prev.st_mtime != w->attr.st_mtime
2538 || w->prev.st_ctime != w->attr.st_ctime 2689 || w->prev.st_ctime != w->attr.st_ctime
2539 ) { 2690 ) {
2540 #if EV_USE_INOTIFY 2691 #if EV_USE_INOTIFY
2692 if (fs_fd >= 0)
2693 {
2541 infy_del (EV_A_ w); 2694 infy_del (EV_A_ w);
2542 infy_add (EV_A_ w); 2695 infy_add (EV_A_ w);
2543 ev_stat_stat (EV_A_ w); /* avoid race... */ 2696 ev_stat_stat (EV_A_ w); /* avoid race... */
2697 }
2544 #endif 2698 #endif
2545 2699
2546 ev_feed_event (EV_A_ w, EV_STAT); 2700 ev_feed_event (EV_A_ w, EV_STAT);
2547 } 2701 }
2548} 2702}
2551ev_stat_start (EV_P_ ev_stat *w) 2705ev_stat_start (EV_P_ ev_stat *w)
2552{ 2706{
2553 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2554 return; 2708 return;
2555 2709
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); 2710 ev_stat_stat (EV_A_ w);
2561 2711
2712 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2562 if (w->interval < MIN_STAT_INTERVAL) 2713 w->interval = MIN_STAT_INTERVAL;
2563 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2564 2714
2565 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2715 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)); 2716 ev_set_priority (&w->timer, ev_priority (w));
2567 2717
2568#if EV_USE_INOTIFY 2718#if EV_USE_INOTIFY
2569 infy_init (EV_A); 2719 infy_init (EV_A);
2570 2720
2571 if (fs_fd >= 0) 2721 if (fs_fd >= 0)
2572 infy_add (EV_A_ w); 2722 infy_add (EV_A_ w);
2573 else 2723 else
2574#endif 2724#endif
2575 ev_timer_start (EV_A_ &w->timer); 2725 ev_timer_again (EV_A_ &w->timer);
2576 2726
2577 ev_start (EV_A_ (W)w, 1); 2727 ev_start (EV_A_ (W)w, 1);
2578 2728
2579 EV_FREQUENT_CHECK; 2729 EV_FREQUENT_CHECK;
2580} 2730}
2750 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2900 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2751 } 2901 }
2752 } 2902 }
2753} 2903}
2754 2904
2905static void
2906embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2907{
2908 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2909
2910 {
2911 struct ev_loop *loop = w->other;
2912
2913 ev_loop_fork (EV_A);
2914 }
2915}
2916
2755#if 0 2917#if 0
2756static void 2918static void
2757embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2919embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2758{ 2920{
2759 ev_idle_stop (EV_A_ idle); 2921 ev_idle_stop (EV_A_ idle);
2779 2941
2780 ev_prepare_init (&w->prepare, embed_prepare_cb); 2942 ev_prepare_init (&w->prepare, embed_prepare_cb);
2781 ev_set_priority (&w->prepare, EV_MINPRI); 2943 ev_set_priority (&w->prepare, EV_MINPRI);
2782 ev_prepare_start (EV_A_ &w->prepare); 2944 ev_prepare_start (EV_A_ &w->prepare);
2783 2945
2946 ev_fork_init (&w->fork, embed_fork_cb);
2947 ev_fork_start (EV_A_ &w->fork);
2948
2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2949 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2785 2950
2786 ev_start (EV_A_ (W)w, 1); 2951 ev_start (EV_A_ (W)w, 1);
2787 2952
2788 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
2795 if (expect_false (!ev_is_active (w))) 2960 if (expect_false (!ev_is_active (w)))
2796 return; 2961 return;
2797 2962
2798 EV_FREQUENT_CHECK; 2963 EV_FREQUENT_CHECK;
2799 2964
2800 ev_io_stop (EV_A_ &w->io); 2965 ev_io_stop (EV_A_ &w->io);
2801 ev_prepare_stop (EV_A_ &w->prepare); 2966 ev_prepare_stop (EV_A_ &w->prepare);
2802 2967 ev_fork_stop (EV_A_ &w->fork);
2803 ev_stop (EV_A_ (W)w);
2804 2968
2805 EV_FREQUENT_CHECK; 2969 EV_FREQUENT_CHECK;
2806} 2970}
2807#endif 2971#endif
2808 2972
2905once_cb (EV_P_ struct ev_once *once, int revents) 3069once_cb (EV_P_ struct ev_once *once, int revents)
2906{ 3070{
2907 void (*cb)(int revents, void *arg) = once->cb; 3071 void (*cb)(int revents, void *arg) = once->cb;
2908 void *arg = once->arg; 3072 void *arg = once->arg;
2909 3073
2910 ev_io_stop (EV_A_ &once->io); 3074 ev_io_stop (EV_A_ &once->io);
2911 ev_timer_stop (EV_A_ &once->to); 3075 ev_timer_stop (EV_A_ &once->to);
2912 ev_free (once); 3076 ev_free (once);
2913 3077
2914 cb (revents, arg); 3078 cb (revents, arg);
2915} 3079}
2916 3080
2917static void 3081static void
2918once_cb_io (EV_P_ ev_io *w, int revents) 3082once_cb_io (EV_P_ ev_io *w, int revents)
2919{ 3083{
2920 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3084 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3085
3086 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2921} 3087}
2922 3088
2923static void 3089static void
2924once_cb_to (EV_P_ ev_timer *w, int revents) 3090once_cb_to (EV_P_ ev_timer *w, int revents)
2925{ 3091{
2926 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3092 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3093
3094 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2927} 3095}
2928 3096
2929void 3097void
2930ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3098ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2931{ 3099{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines