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.266 by root, Fri Oct 24 08:15:33 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>
272# include <sys/inotify.h> 292# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0
297# endif
273#endif 298#endif
274 299
275#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
276# include <winsock.h> 301# include <winsock.h>
277#endif 302#endif
… …
288# endif 313# endif
289#endif 314#endif
290 315
291/**/ 316/**/
292 317
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 318#if EV_VERIFY >= 3
299# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
300#else 320#else
301# define EV_FREQUENT_CHECK do { } while (0) 321# define EV_FREQUENT_CHECK do { } while (0)
302#endif 322#endif
303 323
… …
429typedef struct 449typedef struct
430{ 450{
431 WL head; 451 WL head;
432 unsigned char events; 452 unsigned char events;
433 unsigned char reify; 453 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused; /* currently unused padding */
434#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
435 SOCKET handle; 457 SOCKET handle;
436#endif 458#endif
437} ANFD; 459} ANFD;
438 460
… …
551 struct timeval tv; 573 struct timeval tv;
552 574
553 tv.tv_sec = (time_t)delay; 575 tv.tv_sec = (time_t)delay;
554 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 576 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
555 577
578 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
579 /* somehting nto guaranteed by newer posix versions, but guaranteed */
580 /* by older ones */
556 select (0, 0, 0, 0, &tv); 581 select (0, 0, 0, 0, &tv);
557#endif 582#endif
558 } 583 }
559} 584}
560 585
… …
587array_realloc (int elem, void *base, int *cur, int cnt) 612array_realloc (int elem, void *base, int *cur, int cnt)
588{ 613{
589 *cur = array_nextsize (elem, *cur, cnt); 614 *cur = array_nextsize (elem, *cur, cnt);
590 return ev_realloc (base, elem * *cur); 615 return ev_realloc (base, elem * *cur);
591} 616}
617
618#define array_init_zero(base,count) \
619 memset ((void *)(base), 0, sizeof (*(base)) * (count))
592 620
593#define array_needsize(type,base,cur,cnt,init) \ 621#define array_needsize(type,base,cur,cnt,init) \
594 if (expect_false ((cnt) > (cur))) \ 622 if (expect_false ((cnt) > (cur))) \
595 { \ 623 { \
596 int ocur_ = (cur); \ 624 int ocur_ = (cur); \
… …
640 ev_feed_event (EV_A_ events [i], type); 668 ev_feed_event (EV_A_ events [i], type);
641} 669}
642 670
643/*****************************************************************************/ 671/*****************************************************************************/
644 672
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 673void inline_speed
659fd_event (EV_P_ int fd, int revents) 674fd_event (EV_P_ int fd, int revents)
660{ 675{
661 ANFD *anfd = anfds + fd; 676 ANFD *anfd = anfds + fd;
662 ev_io *w; 677 ev_io *w;
… …
694 events |= (unsigned char)w->events; 709 events |= (unsigned char)w->events;
695 710
696#if EV_SELECT_IS_WINSOCKET 711#if EV_SELECT_IS_WINSOCKET
697 if (events) 712 if (events)
698 { 713 {
699 unsigned long argp; 714 unsigned long arg;
700 #ifdef EV_FD_TO_WIN32_HANDLE 715 #ifdef EV_FD_TO_WIN32_HANDLE
701 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
702 #else 717 #else
703 anfd->handle = _get_osfhandle (fd); 718 anfd->handle = _get_osfhandle (fd);
704 #endif 719 #endif
705 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 720 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
706 } 721 }
707#endif 722#endif
708 723
709 { 724 {
710 unsigned char o_events = anfd->events; 725 unsigned char o_events = anfd->events;
… …
763{ 778{
764 int fd; 779 int fd;
765 780
766 for (fd = 0; fd < anfdmax; ++fd) 781 for (fd = 0; fd < anfdmax; ++fd)
767 if (anfds [fd].events) 782 if (anfds [fd].events)
768 if (!fd_valid (fd) == -1 && errno == EBADF) 783 if (!fd_valid (fd) && errno == EBADF)
769 fd_kill (EV_A_ fd); 784 fd_kill (EV_A_ fd);
770} 785}
771 786
772/* called on ENOMEM in select/poll to kill some fds and retry */ 787/* called on ENOMEM in select/poll to kill some fds and retry */
773static void noinline 788static void noinline
… …
932/* rebuild the heap: this function is used only once and executed rarely */ 947/* rebuild the heap: this function is used only once and executed rarely */
933void inline_size 948void inline_size
934reheap (ANHE *heap, int N) 949reheap (ANHE *heap, int N)
935{ 950{
936 int i; 951 int i;
952
937 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 953 /* 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 */ 954 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
939 for (i = 0; i < N; ++i) 955 for (i = 0; i < N; ++i)
940 upheap (heap, i + HEAP0); 956 upheap (heap, i + HEAP0);
941} 957}
942 958
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/*****************************************************************************/ 959/*****************************************************************************/
959 960
960typedef struct 961typedef struct
961{ 962{
962 WL head; 963 WL head;
… …
966static ANSIG *signals; 967static ANSIG *signals;
967static int signalmax; 968static int signalmax;
968 969
969static EV_ATOMIC_T gotsig; 970static EV_ATOMIC_T gotsig;
970 971
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/*****************************************************************************/ 972/*****************************************************************************/
984 973
985void inline_speed 974void inline_speed
986fd_intern (int fd) 975fd_intern (int fd)
987{ 976{
988#ifdef _WIN32 977#ifdef _WIN32
989 int arg = 1; 978 unsigned long arg = 1;
990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 979 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
991#else 980#else
992 fcntl (fd, F_SETFD, FD_CLOEXEC); 981 fcntl (fd, F_SETFD, FD_CLOEXEC);
993 fcntl (fd, F_SETFL, O_NONBLOCK); 982 fcntl (fd, F_SETFL, O_NONBLOCK);
994#endif 983#endif
… …
1478 1467
1479 postfork = 0; 1468 postfork = 0;
1480} 1469}
1481 1470
1482#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1472
1483struct ev_loop * 1473struct ev_loop *
1484ev_loop_new (unsigned int flags) 1474ev_loop_new (unsigned int flags)
1485{ 1475{
1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1476 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1487 1477
… …
1507{ 1497{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1498 postfork = 1; /* must be in line with ev_default_fork */
1509} 1499}
1510 1500
1511#if EV_VERIFY 1501#if EV_VERIFY
1512static void 1502static void noinline
1503verify_watcher (EV_P_ W w)
1504{
1505 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1506
1507 if (w->pending)
1508 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1509}
1510
1511static void noinline
1512verify_heap (EV_P_ ANHE *heap, int N)
1513{
1514 int i;
1515
1516 for (i = HEAP0; i < N + HEAP0; ++i)
1517 {
1518 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1519 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1520 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1521
1522 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1523 }
1524}
1525
1526static void noinline
1513array_check (W **ws, int cnt) 1527array_verify (EV_P_ W *ws, int cnt)
1514{ 1528{
1515 while (cnt--) 1529 while (cnt--)
1530 {
1516 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1531 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1532 verify_watcher (EV_A_ ws [cnt]);
1533 }
1517} 1534}
1535#endif
1518 1536
1519static void 1537void
1520ev_loop_verify (EV_P) 1538ev_loop_verify (EV_P)
1521{ 1539{
1540#if EV_VERIFY
1522 int i; 1541 int i;
1542 WL w;
1523 1543
1544 assert (activecnt >= -1);
1545
1546 assert (fdchangemax >= fdchangecnt);
1547 for (i = 0; i < fdchangecnt; ++i)
1548 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1549
1550 assert (anfdmax >= 0);
1551 for (i = 0; i < anfdmax; ++i)
1552 for (w = anfds [i].head; w; w = w->next)
1553 {
1554 verify_watcher (EV_A_ (W)w);
1555 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1556 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1557 }
1558
1559 assert (timermax >= timercnt);
1524 checkheap (timers, timercnt); 1560 verify_heap (EV_A_ timers, timercnt);
1561
1525#if EV_PERIODIC_ENABLE 1562#if EV_PERIODIC_ENABLE
1563 assert (periodicmax >= periodiccnt);
1526 checkheap (periodics, periodiccnt); 1564 verify_heap (EV_A_ periodics, periodiccnt);
1527#endif 1565#endif
1528 1566
1567 for (i = NUMPRI; i--; )
1568 {
1569 assert (pendingmax [i] >= pendingcnt [i]);
1529#if EV_IDLE_ENABLE 1570#if EV_IDLE_ENABLE
1530 for (i = NUMPRI; i--; ) 1571 assert (idleall >= 0);
1572 assert (idlemax [i] >= idlecnt [i]);
1531 array_check ((W **)idles [i], idlecnt [i]); 1573 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1532#endif 1574#endif
1575 }
1576
1533#if EV_FORK_ENABLE 1577#if EV_FORK_ENABLE
1578 assert (forkmax >= forkcnt);
1534 array_check ((W **)forks, forkcnt); 1579 array_verify (EV_A_ (W *)forks, forkcnt);
1535#endif 1580#endif
1536 array_check ((W **)prepares, preparecnt); 1581
1537 array_check ((W **)checks, checkcnt);
1538#if EV_ASYNC_ENABLE 1582#if EV_ASYNC_ENABLE
1583 assert (asyncmax >= asynccnt);
1539 array_check ((W **)asyncs, asynccnt); 1584 array_verify (EV_A_ (W *)asyncs, asynccnt);
1585#endif
1586
1587 assert (preparemax >= preparecnt);
1588 array_verify (EV_A_ (W *)prepares, preparecnt);
1589
1590 assert (checkmax >= checkcnt);
1591 array_verify (EV_A_ (W *)checks, checkcnt);
1592
1593# if 0
1594 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1595 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1540#endif 1596# endif
1541}
1542#endif 1597#endif
1598}
1543 1599
1544#endif 1600#endif /* multiplicity */
1545 1601
1546#if EV_MULTIPLICITY 1602#if EV_MULTIPLICITY
1547struct ev_loop * 1603struct ev_loop *
1548ev_default_loop_init (unsigned int flags) 1604ev_default_loop_init (unsigned int flags)
1549#else 1605#else
… …
1582{ 1638{
1583#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1584 struct ev_loop *loop = ev_default_loop_ptr; 1640 struct ev_loop *loop = ev_default_loop_ptr;
1585#endif 1641#endif
1586 1642
1643 ev_default_loop_ptr = 0;
1644
1587#ifndef _WIN32 1645#ifndef _WIN32
1588 ev_ref (EV_A); /* child watcher */ 1646 ev_ref (EV_A); /* child watcher */
1589 ev_signal_stop (EV_A_ &childev); 1647 ev_signal_stop (EV_A_ &childev);
1590#endif 1648#endif
1591 1649
… …
1613 1671
1614void inline_speed 1672void inline_speed
1615call_pending (EV_P) 1673call_pending (EV_P)
1616{ 1674{
1617 int pri; 1675 int pri;
1618
1619 EV_FREQUENT_CHECK;
1620 1676
1621 for (pri = NUMPRI; pri--; ) 1677 for (pri = NUMPRI; pri--; )
1622 while (pendingcnt [pri]) 1678 while (pendingcnt [pri])
1623 { 1679 {
1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1680 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
… …
1627 { 1683 {
1628 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1684 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1629 1685
1630 p->w->pending = 0; 1686 p->w->pending = 0;
1631 EV_CB_INVOKE (p->w, p->events); 1687 EV_CB_INVOKE (p->w, p->events);
1688 EV_FREQUENT_CHECK;
1632 } 1689 }
1633 } 1690 }
1634
1635 EV_FREQUENT_CHECK;
1636} 1691}
1637 1692
1638#if EV_IDLE_ENABLE 1693#if EV_IDLE_ENABLE
1639void inline_size 1694void inline_size
1640idle_reify (EV_P) 1695idle_reify (EV_P)
… …
1692#if EV_PERIODIC_ENABLE 1747#if EV_PERIODIC_ENABLE
1693void inline_size 1748void inline_size
1694periodics_reify (EV_P) 1749periodics_reify (EV_P)
1695{ 1750{
1696 EV_FREQUENT_CHECK; 1751 EV_FREQUENT_CHECK;
1752
1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1753 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1698 { 1754 {
1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1755 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1700 1756
1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1757 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
1707 1763
1708 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1764 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1709 1765
1710 ANHE_at_cache (periodics [HEAP0]); 1766 ANHE_at_cache (periodics [HEAP0]);
1711 downheap (periodics, periodiccnt, HEAP0); 1767 downheap (periodics, periodiccnt, HEAP0);
1712 EV_FREQUENT_CHECK;
1713 } 1768 }
1714 else if (w->interval) 1769 else if (w->interval)
1715 { 1770 {
1716 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1771 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 */ 1772 /* if next trigger time is not sufficiently in the future, put it there */
… …
1842ev_unref (EV_P) 1897ev_unref (EV_P)
1843{ 1898{
1844 --activecnt; 1899 --activecnt;
1845} 1900}
1846 1901
1902void
1903ev_now_update (EV_P)
1904{
1905 time_update (EV_A_ 1e100);
1906}
1907
1847static int loop_done; 1908static int loop_done;
1848 1909
1849void 1910void
1850ev_loop (EV_P_ int flags) 1911ev_loop (EV_P_ int flags)
1851{ 1912{
… …
1853 1914
1854 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1915 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1855 1916
1856 do 1917 do
1857 { 1918 {
1919#if EV_VERIFY >= 2
1920 ev_loop_verify (EV_A);
1921#endif
1922
1858#ifndef _WIN32 1923#ifndef _WIN32
1859 if (expect_false (curpid)) /* penalise the forking check even more */ 1924 if (expect_false (curpid)) /* penalise the forking check even more */
1860 if (expect_false (getpid () != curpid)) 1925 if (expect_false (getpid () != curpid))
1861 { 1926 {
1862 curpid = getpid (); 1927 curpid = getpid ();
… …
2056 2121
2057 if (expect_false (ev_is_active (w))) 2122 if (expect_false (ev_is_active (w)))
2058 return; 2123 return;
2059 2124
2060 assert (("ev_io_start called with negative fd", fd >= 0)); 2125 assert (("ev_io_start called with negative fd", fd >= 0));
2126 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2061 2127
2062 EV_FREQUENT_CHECK; 2128 EV_FREQUENT_CHECK;
2063 2129
2064 ev_start (EV_A_ (W)w, 1); 2130 ev_start (EV_A_ (W)w, 1);
2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2131 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2066 wlist_add (&anfds[fd].head, (WL)w); 2132 wlist_add (&anfds[fd].head, (WL)w);
2067 2133
2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2134 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2069 w->events &= ~EV_IOFDSET; 2135 w->events &= ~EV_IOFDSET;
2070 2136
… …
2262 sigset_t full, prev; 2328 sigset_t full, prev;
2263 sigfillset (&full); 2329 sigfillset (&full);
2264 sigprocmask (SIG_SETMASK, &full, &prev); 2330 sigprocmask (SIG_SETMASK, &full, &prev);
2265#endif 2331#endif
2266 2332
2267 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2333 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2268 2334
2269#ifndef _WIN32 2335#ifndef _WIN32
2270 sigprocmask (SIG_SETMASK, &prev, 0); 2336 sigprocmask (SIG_SETMASK, &prev, 0);
2271#endif 2337#endif
2272 } 2338 }
… …
2414 2480
2415static void noinline 2481static void noinline
2416infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2482infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2417{ 2483{
2418 if (slot < 0) 2484 if (slot < 0)
2419 /* overflow, need to check for all hahs slots */ 2485 /* overflow, need to check for all hash slots */
2420 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2486 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2421 infy_wd (EV_A_ slot, wd, ev); 2487 infy_wd (EV_A_ slot, wd, ev);
2422 else 2488 else
2423 { 2489 {
2424 WL w_; 2490 WL w_;
… …
2458infy_init (EV_P) 2524infy_init (EV_P)
2459{ 2525{
2460 if (fs_fd != -2) 2526 if (fs_fd != -2)
2461 return; 2527 return;
2462 2528
2529 /* kernels < 2.6.25 are borked
2530 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2531 */
2532 {
2533 struct utsname buf;
2534 int major, minor, micro;
2535
2536 fs_fd = -1;
2537
2538 if (uname (&buf))
2539 return;
2540
2541 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2542 return;
2543
2544 if (major < 2
2545 || (major == 2 && minor < 6)
2546 || (major == 2 && minor == 6 && micro < 25))
2547 return;
2548 }
2549
2463 fs_fd = inotify_init (); 2550 fs_fd = inotify_init ();
2464 2551
2465 if (fs_fd >= 0) 2552 if (fs_fd >= 0)
2466 { 2553 {
2467 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2554 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2496 if (fs_fd >= 0) 2583 if (fs_fd >= 0)
2497 infy_add (EV_A_ w); /* re-add, no matter what */ 2584 infy_add (EV_A_ w); /* re-add, no matter what */
2498 else 2585 else
2499 ev_timer_start (EV_A_ &w->timer); 2586 ev_timer_start (EV_A_ &w->timer);
2500 } 2587 }
2501
2502 } 2588 }
2503} 2589}
2504 2590
2591#endif
2592
2593#ifdef _WIN32
2594# define EV_LSTAT(p,b) _stati64 (p, b)
2595#else
2596# define EV_LSTAT(p,b) lstat (p, b)
2505#endif 2597#endif
2506 2598
2507void 2599void
2508ev_stat_stat (EV_P_ ev_stat *w) 2600ev_stat_stat (EV_P_ ev_stat *w)
2509{ 2601{
… …
2536 || w->prev.st_atime != w->attr.st_atime 2628 || w->prev.st_atime != w->attr.st_atime
2537 || w->prev.st_mtime != w->attr.st_mtime 2629 || w->prev.st_mtime != w->attr.st_mtime
2538 || w->prev.st_ctime != w->attr.st_ctime 2630 || w->prev.st_ctime != w->attr.st_ctime
2539 ) { 2631 ) {
2540 #if EV_USE_INOTIFY 2632 #if EV_USE_INOTIFY
2633 if (fs_fd >= 0)
2634 {
2541 infy_del (EV_A_ w); 2635 infy_del (EV_A_ w);
2542 infy_add (EV_A_ w); 2636 infy_add (EV_A_ w);
2543 ev_stat_stat (EV_A_ w); /* avoid race... */ 2637 ev_stat_stat (EV_A_ w); /* avoid race... */
2638 }
2544 #endif 2639 #endif
2545 2640
2546 ev_feed_event (EV_A_ w, EV_STAT); 2641 ev_feed_event (EV_A_ w, EV_STAT);
2547 } 2642 }
2548} 2643}
… …
2750 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2845 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2751 } 2846 }
2752 } 2847 }
2753} 2848}
2754 2849
2850static void
2851embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2852{
2853 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2854
2855 {
2856 struct ev_loop *loop = w->other;
2857
2858 ev_loop_fork (EV_A);
2859 }
2860}
2861
2755#if 0 2862#if 0
2756static void 2863static void
2757embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2864embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2758{ 2865{
2759 ev_idle_stop (EV_A_ idle); 2866 ev_idle_stop (EV_A_ idle);
… …
2779 2886
2780 ev_prepare_init (&w->prepare, embed_prepare_cb); 2887 ev_prepare_init (&w->prepare, embed_prepare_cb);
2781 ev_set_priority (&w->prepare, EV_MINPRI); 2888 ev_set_priority (&w->prepare, EV_MINPRI);
2782 ev_prepare_start (EV_A_ &w->prepare); 2889 ev_prepare_start (EV_A_ &w->prepare);
2783 2890
2891 ev_fork_init (&w->fork, embed_fork_cb);
2892 ev_fork_start (EV_A_ &w->fork);
2893
2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2894 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2785 2895
2786 ev_start (EV_A_ (W)w, 1); 2896 ev_start (EV_A_ (W)w, 1);
2787 2897
2788 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
… …
2795 if (expect_false (!ev_is_active (w))) 2905 if (expect_false (!ev_is_active (w)))
2796 return; 2906 return;
2797 2907
2798 EV_FREQUENT_CHECK; 2908 EV_FREQUENT_CHECK;
2799 2909
2800 ev_io_stop (EV_A_ &w->io); 2910 ev_io_stop (EV_A_ &w->io);
2801 ev_prepare_stop (EV_A_ &w->prepare); 2911 ev_prepare_stop (EV_A_ &w->prepare);
2802 2912 ev_fork_stop (EV_A_ &w->fork);
2803 ev_stop (EV_A_ (W)w);
2804 2913
2805 EV_FREQUENT_CHECK; 2914 EV_FREQUENT_CHECK;
2806} 2915}
2807#endif 2916#endif
2808 2917
… …
2905once_cb (EV_P_ struct ev_once *once, int revents) 3014once_cb (EV_P_ struct ev_once *once, int revents)
2906{ 3015{
2907 void (*cb)(int revents, void *arg) = once->cb; 3016 void (*cb)(int revents, void *arg) = once->cb;
2908 void *arg = once->arg; 3017 void *arg = once->arg;
2909 3018
2910 ev_io_stop (EV_A_ &once->io); 3019 ev_io_stop (EV_A_ &once->io);
2911 ev_timer_stop (EV_A_ &once->to); 3020 ev_timer_stop (EV_A_ &once->to);
2912 ev_free (once); 3021 ev_free (once);
2913 3022
2914 cb (revents, arg); 3023 cb (revents, arg);
2915} 3024}
2916 3025
2917static void 3026static void
2918once_cb_io (EV_P_ ev_io *w, int revents) 3027once_cb_io (EV_P_ ev_io *w, int revents)
2919{ 3028{
2920 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3029 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3030
3031 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2921} 3032}
2922 3033
2923static void 3034static void
2924once_cb_to (EV_P_ ev_timer *w, int revents) 3035once_cb_to (EV_P_ ev_timer *w, int revents)
2925{ 3036{
2926 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3037 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3038
3039 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2927} 3040}
2928 3041
2929void 3042void
2930ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3043ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2931{ 3044{

Diff Legend

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