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

Comparing libev/ev.c (file contents):
Revision 1.252 by root, Thu May 22 03:43:32 2008 UTC vs.
Revision 1.278 by root, Tue Jan 6 19:46:56 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
… …
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
… …
277# include <sys/select.h> 306# include <sys/select.h>
278# endif 307# endif
279#endif 308#endif
280 309
281#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
282# 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
283#endif 319#endif
284 320
285#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
286# 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
287#endif 332#endif
288 333
289#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
290/* 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 */
291# include <stdint.h> 336# include <stdint.h>
… …
373{ 418{
374 syserr_cb = cb; 419 syserr_cb = cb;
375} 420}
376 421
377static void noinline 422static void noinline
378syserr (const char *msg) 423ev_syserr (const char *msg)
379{ 424{
380 if (!msg) 425 if (!msg)
381 msg = "(libev) system error"; 426 msg = "(libev) system error";
382 427
383 if (syserr_cb) 428 if (syserr_cb)
… …
434typedef struct 479typedef struct
435{ 480{
436 WL head; 481 WL head;
437 unsigned char events; 482 unsigned char events;
438 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
439#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 490 SOCKET handle;
441#endif 491#endif
442} ANFD; 492} ANFD;
443 493
… …
556 struct timeval tv; 606 struct timeval tv;
557 607
558 tv.tv_sec = (time_t)delay; 608 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 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 */
561 select (0, 0, 0, 0, &tv); 614 select (0, 0, 0, 0, &tv);
562#endif 615#endif
563 } 616 }
564} 617}
565 618
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
593{ 646{
594 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
596} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 653
598#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
600 { \ 656 { \
601 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
… …
645 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
646} 702}
647 703
648/*****************************************************************************/ 704/*****************************************************************************/
649 705
650void inline_size
651anfds_init (ANFD *base, int count)
652{
653 while (count--)
654 {
655 base->head = 0;
656 base->events = EV_NONE;
657 base->reify = 0;
658
659 ++base;
660 }
661}
662
663void inline_speed 706void inline_speed
664fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
665{ 708{
666 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
667 ev_io *w; 710 ev_io *w;
… …
699 events |= (unsigned char)w->events; 742 events |= (unsigned char)w->events;
700 743
701#if EV_SELECT_IS_WINSOCKET 744#if EV_SELECT_IS_WINSOCKET
702 if (events) 745 if (events)
703 { 746 {
704 unsigned long argp; 747 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 750 #else
708 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
709 #endif 752 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 753 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 754 }
712#endif 755#endif
713 756
714 { 757 {
715 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
768{ 811{
769 int fd; 812 int fd;
770 813
771 for (fd = 0; fd < anfdmax; ++fd) 814 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 815 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 816 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 817 fd_kill (EV_A_ fd);
775} 818}
776 819
777/* 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 */
778static void noinline 821static void noinline
… …
796 839
797 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 841 if (anfds [fd].events)
799 { 842 {
800 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
802 } 846 }
803} 847}
804 848
805/*****************************************************************************/ 849/*****************************************************************************/
… …
957static ANSIG *signals; 1001static ANSIG *signals;
958static int signalmax; 1002static int signalmax;
959 1003
960static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
961 1005
962void inline_size
963signals_init (ANSIG *base, int count)
964{
965 while (count--)
966 {
967 base->head = 0;
968 base->gotsig = 0;
969
970 ++base;
971 }
972}
973
974/*****************************************************************************/ 1006/*****************************************************************************/
975 1007
976void inline_speed 1008void inline_speed
977fd_intern (int fd) 1009fd_intern (int fd)
978{ 1010{
979#ifdef _WIN32 1011#ifdef _WIN32
980 int arg = 1; 1012 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 1014#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 1015 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 1016 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 1017#endif
… …
999 } 1031 }
1000 else 1032 else
1001#endif 1033#endif
1002 { 1034 {
1003 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1005 1037
1006 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1009 } 1041 }
… …
1099ev_feed_signal_event (EV_P_ int signum) 1131ev_feed_signal_event (EV_P_ int signum)
1100{ 1132{
1101 WL w; 1133 WL w;
1102 1134
1103#if EV_MULTIPLICITY 1135#if EV_MULTIPLICITY
1104 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1136 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1105#endif 1137#endif
1106 1138
1107 --signum; 1139 --signum;
1108 1140
1109 if (signum < 0 || signum >= signalmax) 1141 if (signum < 0 || signum >= signalmax)
… …
1238 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1239 /* 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 */
1240 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1241#endif 1273#endif
1242#ifdef __APPLE__ 1274#ifdef __APPLE__
1243 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 /* only select works correctly on that "unix-certified" platform */
1244 flags &= ~EVBACKEND_POLL; 1276 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1277 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1245#endif 1278#endif
1246 1279
1247 return flags; 1280 return flags;
1248} 1281}
1249 1282
… …
1499{ 1532{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1533 postfork = 1; /* must be in line with ev_default_fork */
1501} 1534}
1502 1535
1503#if EV_VERIFY 1536#if EV_VERIFY
1504void noinline 1537static void noinline
1505verify_watcher (EV_P_ W w) 1538verify_watcher (EV_P_ W w)
1506{ 1539{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1540 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1541
1509 if (w->pending) 1542 if (w->pending)
1510 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1543 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1511} 1544}
1512 1545
1513static void noinline 1546static void noinline
1514verify_heap (EV_P_ ANHE *heap, int N) 1547verify_heap (EV_P_ ANHE *heap, int N)
1515{ 1548{
1516 int i; 1549 int i;
1517 1550
1518 for (i = HEAP0; i < N + HEAP0; ++i) 1551 for (i = HEAP0; i < N + HEAP0; ++i)
1519 { 1552 {
1520 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1553 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1521 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1554 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1522 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1555 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1523 1556
1524 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1557 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1525 } 1558 }
1526} 1559}
1527 1560
1528static void noinline 1561static void noinline
1529array_verify (EV_P_ W *ws, int cnt) 1562array_verify (EV_P_ W *ws, int cnt)
1530{ 1563{
1531 while (cnt--) 1564 while (cnt--)
1532 { 1565 {
1533 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1566 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1534 verify_watcher (EV_A_ ws [cnt]); 1567 verify_watcher (EV_A_ ws [cnt]);
1535 } 1568 }
1536} 1569}
1537#endif 1570#endif
1538 1571
… …
1545 1578
1546 assert (activecnt >= -1); 1579 assert (activecnt >= -1);
1547 1580
1548 assert (fdchangemax >= fdchangecnt); 1581 assert (fdchangemax >= fdchangecnt);
1549 for (i = 0; i < fdchangecnt; ++i) 1582 for (i = 0; i < fdchangecnt; ++i)
1550 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1583 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1551 1584
1552 assert (anfdmax >= 0); 1585 assert (anfdmax >= 0);
1553 for (i = 0; i < anfdmax; ++i) 1586 for (i = 0; i < anfdmax; ++i)
1554 for (w = anfds [i].head; w; w = w->next) 1587 for (w = anfds [i].head; w; w = w->next)
1555 { 1588 {
1556 verify_watcher (EV_A_ (W)w); 1589 verify_watcher (EV_A_ (W)w);
1557 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1590 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1558 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1591 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1559 } 1592 }
1560 1593
1561 assert (timermax >= timercnt); 1594 assert (timermax >= timercnt);
1562 verify_heap (EV_A_ timers, timercnt); 1595 verify_heap (EV_A_ timers, timercnt);
1563 1596
… …
1640{ 1673{
1641#if EV_MULTIPLICITY 1674#if EV_MULTIPLICITY
1642 struct ev_loop *loop = ev_default_loop_ptr; 1675 struct ev_loop *loop = ev_default_loop_ptr;
1643#endif 1676#endif
1644 1677
1678 ev_default_loop_ptr = 0;
1679
1645#ifndef _WIN32 1680#ifndef _WIN32
1646 ev_ref (EV_A); /* child watcher */ 1681 ev_ref (EV_A); /* child watcher */
1647 ev_signal_stop (EV_A_ &childev); 1682 ev_signal_stop (EV_A_ &childev);
1648#endif 1683#endif
1649 1684
… …
1655{ 1690{
1656#if EV_MULTIPLICITY 1691#if EV_MULTIPLICITY
1657 struct ev_loop *loop = ev_default_loop_ptr; 1692 struct ev_loop *loop = ev_default_loop_ptr;
1658#endif 1693#endif
1659 1694
1660 if (backend)
1661 postfork = 1; /* must be in line with ev_loop_fork */ 1695 postfork = 1; /* must be in line with ev_loop_fork */
1662} 1696}
1663 1697
1664/*****************************************************************************/ 1698/*****************************************************************************/
1665 1699
1666void 1700void
… …
1679 { 1713 {
1680 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1714 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1681 1715
1682 if (expect_true (p->w)) 1716 if (expect_true (p->w))
1683 { 1717 {
1684 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1718 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1685 1719
1686 p->w->pending = 0; 1720 p->w->pending = 0;
1687 EV_CB_INVOKE (p->w, p->events); 1721 EV_CB_INVOKE (p->w, p->events);
1688 EV_FREQUENT_CHECK; 1722 EV_FREQUENT_CHECK;
1689 } 1723 }
… …
1720 1754
1721 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1755 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1722 { 1756 {
1723 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1757 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1724 1758
1725 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1759 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1726 1760
1727 /* first reschedule or stop timer */ 1761 /* first reschedule or stop timer */
1728 if (w->repeat) 1762 if (w->repeat)
1729 { 1763 {
1730 ev_at (w) += w->repeat; 1764 ev_at (w) += w->repeat;
1731 if (ev_at (w) < mn_now) 1765 if (ev_at (w) < mn_now)
1732 ev_at (w) = mn_now; 1766 ev_at (w) = mn_now;
1733 1767
1734 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1768 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1735 1769
1736 ANHE_at_cache (timers [HEAP0]); 1770 ANHE_at_cache (timers [HEAP0]);
1737 downheap (timers, timercnt, HEAP0); 1771 downheap (timers, timercnt, HEAP0);
1738 } 1772 }
1739 else 1773 else
… …
1752 1786
1753 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1787 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1754 { 1788 {
1755 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1789 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1756 1790
1757 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1791 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1758 1792
1759 /* first reschedule or stop timer */ 1793 /* first reschedule or stop timer */
1760 if (w->reschedule_cb) 1794 if (w->reschedule_cb)
1761 { 1795 {
1762 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1796 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1763 1797
1764 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1798 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1765 1799
1766 ANHE_at_cache (periodics [HEAP0]); 1800 ANHE_at_cache (periodics [HEAP0]);
1767 downheap (periodics, periodiccnt, HEAP0); 1801 downheap (periodics, periodiccnt, HEAP0);
1768 } 1802 }
1769 else if (w->interval) 1803 else if (w->interval)
… …
1897ev_unref (EV_P) 1931ev_unref (EV_P)
1898{ 1932{
1899 --activecnt; 1933 --activecnt;
1900} 1934}
1901 1935
1936void
1937ev_now_update (EV_P)
1938{
1939 time_update (EV_A_ 1e100);
1940}
1941
1902static int loop_done; 1942static int loop_done;
1903 1943
1904void 1944void
1905ev_loop (EV_P_ int flags) 1945ev_loop (EV_P_ int flags)
1906{ 1946{
… …
2114 int fd = w->fd; 2154 int fd = w->fd;
2115 2155
2116 if (expect_false (ev_is_active (w))) 2156 if (expect_false (ev_is_active (w)))
2117 return; 2157 return;
2118 2158
2119 assert (("ev_io_start called with negative fd", fd >= 0)); 2159 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2160 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2120 2161
2121 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
2122 2163
2123 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
2124 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2165 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2125 wlist_add (&anfds[fd].head, (WL)w); 2166 wlist_add (&anfds[fd].head, (WL)w);
2126 2167
2127 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2168 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2128 w->events &= ~EV_IOFDSET; 2169 w->events &= ~EV_IOFDSET;
2129 2170
… …
2135{ 2176{
2136 clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
2137 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
2138 return; 2179 return;
2139 2180
2140 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2181 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2141 2182
2142 EV_FREQUENT_CHECK; 2183 EV_FREQUENT_CHECK;
2143 2184
2144 wlist_del (&anfds[w->fd].head, (WL)w); 2185 wlist_del (&anfds[w->fd].head, (WL)w);
2145 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
… …
2155 if (expect_false (ev_is_active (w))) 2196 if (expect_false (ev_is_active (w)))
2156 return; 2197 return;
2157 2198
2158 ev_at (w) += mn_now; 2199 ev_at (w) += mn_now;
2159 2200
2160 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2201 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2161 2202
2162 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2163 2204
2164 ++timercnt; 2205 ++timercnt;
2165 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2206 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2168 ANHE_at_cache (timers [ev_active (w)]); 2209 ANHE_at_cache (timers [ev_active (w)]);
2169 upheap (timers, ev_active (w)); 2210 upheap (timers, ev_active (w));
2170 2211
2171 EV_FREQUENT_CHECK; 2212 EV_FREQUENT_CHECK;
2172 2213
2173 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2214 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2174} 2215}
2175 2216
2176void noinline 2217void noinline
2177ev_timer_stop (EV_P_ ev_timer *w) 2218ev_timer_stop (EV_P_ ev_timer *w)
2178{ 2219{
… …
2183 EV_FREQUENT_CHECK; 2224 EV_FREQUENT_CHECK;
2184 2225
2185 { 2226 {
2186 int active = ev_active (w); 2227 int active = ev_active (w);
2187 2228
2188 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2229 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2189 2230
2190 --timercnt; 2231 --timercnt;
2191 2232
2192 if (expect_true (active < timercnt + HEAP0)) 2233 if (expect_true (active < timercnt + HEAP0))
2193 { 2234 {
… …
2237 2278
2238 if (w->reschedule_cb) 2279 if (w->reschedule_cb)
2239 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2280 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2240 else if (w->interval) 2281 else if (w->interval)
2241 { 2282 {
2242 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2283 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2243 /* this formula differs from the one in periodic_reify because we do not always round up */ 2284 /* this formula differs from the one in periodic_reify because we do not always round up */
2244 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2285 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2245 } 2286 }
2246 else 2287 else
2247 ev_at (w) = w->offset; 2288 ev_at (w) = w->offset;
… …
2255 ANHE_at_cache (periodics [ev_active (w)]); 2296 ANHE_at_cache (periodics [ev_active (w)]);
2256 upheap (periodics, ev_active (w)); 2297 upheap (periodics, ev_active (w));
2257 2298
2258 EV_FREQUENT_CHECK; 2299 EV_FREQUENT_CHECK;
2259 2300
2260 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2301 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2261} 2302}
2262 2303
2263void noinline 2304void noinline
2264ev_periodic_stop (EV_P_ ev_periodic *w) 2305ev_periodic_stop (EV_P_ ev_periodic *w)
2265{ 2306{
… …
2270 EV_FREQUENT_CHECK; 2311 EV_FREQUENT_CHECK;
2271 2312
2272 { 2313 {
2273 int active = ev_active (w); 2314 int active = ev_active (w);
2274 2315
2275 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2316 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2276 2317
2277 --periodiccnt; 2318 --periodiccnt;
2278 2319
2279 if (expect_true (active < periodiccnt + HEAP0)) 2320 if (expect_true (active < periodiccnt + HEAP0))
2280 { 2321 {
… …
2303 2344
2304void noinline 2345void noinline
2305ev_signal_start (EV_P_ ev_signal *w) 2346ev_signal_start (EV_P_ ev_signal *w)
2306{ 2347{
2307#if EV_MULTIPLICITY 2348#if EV_MULTIPLICITY
2308 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2349 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2309#endif 2350#endif
2310 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
2311 return; 2352 return;
2312 2353
2313 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2354 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2314 2355
2315 evpipe_init (EV_A); 2356 evpipe_init (EV_A);
2316 2357
2317 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
2318 2359
… …
2321 sigset_t full, prev; 2362 sigset_t full, prev;
2322 sigfillset (&full); 2363 sigfillset (&full);
2323 sigprocmask (SIG_SETMASK, &full, &prev); 2364 sigprocmask (SIG_SETMASK, &full, &prev);
2324#endif 2365#endif
2325 2366
2326 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2367 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2327 2368
2328#ifndef _WIN32 2369#ifndef _WIN32
2329 sigprocmask (SIG_SETMASK, &prev, 0); 2370 sigprocmask (SIG_SETMASK, &prev, 0);
2330#endif 2371#endif
2331 } 2372 }
… …
2369 2410
2370void 2411void
2371ev_child_start (EV_P_ ev_child *w) 2412ev_child_start (EV_P_ ev_child *w)
2372{ 2413{
2373#if EV_MULTIPLICITY 2414#if EV_MULTIPLICITY
2374 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2415 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2375#endif 2416#endif
2376 if (expect_false (ev_is_active (w))) 2417 if (expect_false (ev_is_active (w)))
2377 return; 2418 return;
2378 2419
2379 EV_FREQUENT_CHECK; 2420 EV_FREQUENT_CHECK;
… …
2404# ifdef _WIN32 2445# ifdef _WIN32
2405# undef lstat 2446# undef lstat
2406# define lstat(a,b) _stati64 (a,b) 2447# define lstat(a,b) _stati64 (a,b)
2407# endif 2448# endif
2408 2449
2409#define DEF_STAT_INTERVAL 5.0074891 2450#define DEF_STAT_INTERVAL 5.0074891
2451#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2410#define MIN_STAT_INTERVAL 0.1074891 2452#define MIN_STAT_INTERVAL 0.1074891
2411 2453
2412static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2454static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2413 2455
2414#if EV_USE_INOTIFY 2456#if EV_USE_INOTIFY
2415# define EV_INOTIFY_BUFSIZE 8192 2457# define EV_INOTIFY_BUFSIZE 8192
… …
2419{ 2461{
2420 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); 2462 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);
2421 2463
2422 if (w->wd < 0) 2464 if (w->wd < 0)
2423 { 2465 {
2466 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2424 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2467 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2425 2468
2426 /* monitor some parent directory for speedup hints */ 2469 /* monitor some parent directory for speedup hints */
2427 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2470 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2428 /* but an efficiency issue only */ 2471 /* but an efficiency issue only */
2429 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2472 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2430 { 2473 {
2431 char path [4096]; 2474 char path [4096];
2432 strcpy (path, w->path); 2475 strcpy (path, w->path);
… …
2436 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2479 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2437 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2480 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2438 2481
2439 char *pend = strrchr (path, '/'); 2482 char *pend = strrchr (path, '/');
2440 2483
2441 if (!pend) 2484 if (!pend || pend == path)
2442 break; /* whoops, no '/', complain to your admin */ 2485 break;
2443 2486
2444 *pend = 0; 2487 *pend = 0;
2445 w->wd = inotify_add_watch (fs_fd, path, mask); 2488 w->wd = inotify_add_watch (fs_fd, path, mask);
2446 } 2489 }
2447 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2490 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2448 } 2491 }
2449 } 2492 }
2450 else
2451 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2452 2493
2453 if (w->wd >= 0) 2494 if (w->wd >= 0)
2495 {
2454 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2496 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2497
2498 /* now local changes will be tracked by inotify, but remote changes won't */
2499 /* unless the filesystem it known to be local, we therefore still poll */
2500 /* also do poll on <2.6.25, but with normal frequency */
2501 struct statfs sfs;
2502
2503 if (fs_2625 && !statfs (w->path, &sfs))
2504 if (sfs.f_type == 0x1373 /* devfs */
2505 || sfs.f_type == 0xEF53 /* ext2/3 */
2506 || sfs.f_type == 0x3153464a /* jfs */
2507 || sfs.f_type == 0x52654973 /* reiser3 */
2508 || sfs.f_type == 0x01021994 /* tempfs */
2509 || sfs.f_type == 0x58465342 /* xfs */)
2510 return;
2511
2512 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2513 ev_timer_again (EV_A_ &w->timer);
2514 }
2455} 2515}
2456 2516
2457static void noinline 2517static void noinline
2458infy_del (EV_P_ ev_stat *w) 2518infy_del (EV_P_ ev_stat *w)
2459{ 2519{
… …
2473 2533
2474static void noinline 2534static void noinline
2475infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2535infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2476{ 2536{
2477 if (slot < 0) 2537 if (slot < 0)
2478 /* overflow, need to check for all hahs slots */ 2538 /* overflow, need to check for all hash slots */
2479 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2539 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2480 infy_wd (EV_A_ slot, wd, ev); 2540 infy_wd (EV_A_ slot, wd, ev);
2481 else 2541 else
2482 { 2542 {
2483 WL w_; 2543 WL w_;
… …
2489 2549
2490 if (w->wd == wd || wd == -1) 2550 if (w->wd == wd || wd == -1)
2491 { 2551 {
2492 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2552 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2493 { 2553 {
2554 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2494 w->wd = -1; 2555 w->wd = -1;
2495 infy_add (EV_A_ w); /* re-add, no matter what */ 2556 infy_add (EV_A_ w); /* re-add, no matter what */
2496 } 2557 }
2497 2558
2498 stat_timer_cb (EV_A_ &w->timer, 0); 2559 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2512 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2573 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2513 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2574 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2514} 2575}
2515 2576
2516void inline_size 2577void inline_size
2578check_2625 (EV_P)
2579{
2580 /* kernels < 2.6.25 are borked
2581 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2582 */
2583 struct utsname buf;
2584 int major, minor, micro;
2585
2586 if (uname (&buf))
2587 return;
2588
2589 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2590 return;
2591
2592 if (major < 2
2593 || (major == 2 && minor < 6)
2594 || (major == 2 && minor == 6 && micro < 25))
2595 return;
2596
2597 fs_2625 = 1;
2598}
2599
2600void inline_size
2517infy_init (EV_P) 2601infy_init (EV_P)
2518{ 2602{
2519 if (fs_fd != -2) 2603 if (fs_fd != -2)
2520 return; 2604 return;
2605
2606 fs_fd = -1;
2607
2608 check_2625 (EV_A);
2521 2609
2522 fs_fd = inotify_init (); 2610 fs_fd = inotify_init ();
2523 2611
2524 if (fs_fd >= 0) 2612 if (fs_fd >= 0)
2525 { 2613 {
… …
2553 w->wd = -1; 2641 w->wd = -1;
2554 2642
2555 if (fs_fd >= 0) 2643 if (fs_fd >= 0)
2556 infy_add (EV_A_ w); /* re-add, no matter what */ 2644 infy_add (EV_A_ w); /* re-add, no matter what */
2557 else 2645 else
2558 ev_timer_start (EV_A_ &w->timer); 2646 ev_timer_again (EV_A_ &w->timer);
2559 } 2647 }
2560
2561 } 2648 }
2562} 2649}
2563 2650
2651#endif
2652
2653#ifdef _WIN32
2654# define EV_LSTAT(p,b) _stati64 (p, b)
2655#else
2656# define EV_LSTAT(p,b) lstat (p, b)
2564#endif 2657#endif
2565 2658
2566void 2659void
2567ev_stat_stat (EV_P_ ev_stat *w) 2660ev_stat_stat (EV_P_ ev_stat *w)
2568{ 2661{
… …
2595 || w->prev.st_atime != w->attr.st_atime 2688 || w->prev.st_atime != w->attr.st_atime
2596 || w->prev.st_mtime != w->attr.st_mtime 2689 || w->prev.st_mtime != w->attr.st_mtime
2597 || w->prev.st_ctime != w->attr.st_ctime 2690 || w->prev.st_ctime != w->attr.st_ctime
2598 ) { 2691 ) {
2599 #if EV_USE_INOTIFY 2692 #if EV_USE_INOTIFY
2693 if (fs_fd >= 0)
2694 {
2600 infy_del (EV_A_ w); 2695 infy_del (EV_A_ w);
2601 infy_add (EV_A_ w); 2696 infy_add (EV_A_ w);
2602 ev_stat_stat (EV_A_ w); /* avoid race... */ 2697 ev_stat_stat (EV_A_ w); /* avoid race... */
2698 }
2603 #endif 2699 #endif
2604 2700
2605 ev_feed_event (EV_A_ w, EV_STAT); 2701 ev_feed_event (EV_A_ w, EV_STAT);
2606 } 2702 }
2607} 2703}
… …
2610ev_stat_start (EV_P_ ev_stat *w) 2706ev_stat_start (EV_P_ ev_stat *w)
2611{ 2707{
2612 if (expect_false (ev_is_active (w))) 2708 if (expect_false (ev_is_active (w)))
2613 return; 2709 return;
2614 2710
2615 /* since we use memcmp, we need to clear any padding data etc. */
2616 memset (&w->prev, 0, sizeof (ev_statdata));
2617 memset (&w->attr, 0, sizeof (ev_statdata));
2618
2619 ev_stat_stat (EV_A_ w); 2711 ev_stat_stat (EV_A_ w);
2620 2712
2713 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2621 if (w->interval < MIN_STAT_INTERVAL) 2714 w->interval = MIN_STAT_INTERVAL;
2622 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 2715
2624 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2716 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2625 ev_set_priority (&w->timer, ev_priority (w)); 2717 ev_set_priority (&w->timer, ev_priority (w));
2626 2718
2627#if EV_USE_INOTIFY 2719#if EV_USE_INOTIFY
2628 infy_init (EV_A); 2720 infy_init (EV_A);
2629 2721
2630 if (fs_fd >= 0) 2722 if (fs_fd >= 0)
2631 infy_add (EV_A_ w); 2723 infy_add (EV_A_ w);
2632 else 2724 else
2633#endif 2725#endif
2634 ev_timer_start (EV_A_ &w->timer); 2726 ev_timer_again (EV_A_ &w->timer);
2635 2727
2636 ev_start (EV_A_ (W)w, 1); 2728 ev_start (EV_A_ (W)w, 1);
2637 2729
2638 EV_FREQUENT_CHECK; 2730 EV_FREQUENT_CHECK;
2639} 2731}
… …
2809 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2901 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2810 } 2902 }
2811 } 2903 }
2812} 2904}
2813 2905
2906static void
2907embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2908{
2909 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2910
2911 ev_embed_stop (EV_A_ w);
2912
2913 {
2914 struct ev_loop *loop = w->other;
2915
2916 ev_loop_fork (EV_A);
2917 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2918 }
2919
2920 ev_embed_start (EV_A_ w);
2921}
2922
2814#if 0 2923#if 0
2815static void 2924static void
2816embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2925embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2817{ 2926{
2818 ev_idle_stop (EV_A_ idle); 2927 ev_idle_stop (EV_A_ idle);
… …
2825 if (expect_false (ev_is_active (w))) 2934 if (expect_false (ev_is_active (w)))
2826 return; 2935 return;
2827 2936
2828 { 2937 {
2829 struct ev_loop *loop = w->other; 2938 struct ev_loop *loop = w->other;
2830 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2939 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2831 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2940 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2832 } 2941 }
2833 2942
2834 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2835 2944
… …
2838 2947
2839 ev_prepare_init (&w->prepare, embed_prepare_cb); 2948 ev_prepare_init (&w->prepare, embed_prepare_cb);
2840 ev_set_priority (&w->prepare, EV_MINPRI); 2949 ev_set_priority (&w->prepare, EV_MINPRI);
2841 ev_prepare_start (EV_A_ &w->prepare); 2950 ev_prepare_start (EV_A_ &w->prepare);
2842 2951
2952 ev_fork_init (&w->fork, embed_fork_cb);
2953 ev_fork_start (EV_A_ &w->fork);
2954
2843 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2955 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2844 2956
2845 ev_start (EV_A_ (W)w, 1); 2957 ev_start (EV_A_ (W)w, 1);
2846 2958
2847 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
… …
2854 if (expect_false (!ev_is_active (w))) 2966 if (expect_false (!ev_is_active (w)))
2855 return; 2967 return;
2856 2968
2857 EV_FREQUENT_CHECK; 2969 EV_FREQUENT_CHECK;
2858 2970
2859 ev_io_stop (EV_A_ &w->io); 2971 ev_io_stop (EV_A_ &w->io);
2860 ev_prepare_stop (EV_A_ &w->prepare); 2972 ev_prepare_stop (EV_A_ &w->prepare);
2861 2973 ev_fork_stop (EV_A_ &w->fork);
2862 ev_stop (EV_A_ (W)w);
2863 2974
2864 EV_FREQUENT_CHECK; 2975 EV_FREQUENT_CHECK;
2865} 2976}
2866#endif 2977#endif
2867 2978
… …
2964once_cb (EV_P_ struct ev_once *once, int revents) 3075once_cb (EV_P_ struct ev_once *once, int revents)
2965{ 3076{
2966 void (*cb)(int revents, void *arg) = once->cb; 3077 void (*cb)(int revents, void *arg) = once->cb;
2967 void *arg = once->arg; 3078 void *arg = once->arg;
2968 3079
2969 ev_io_stop (EV_A_ &once->io); 3080 ev_io_stop (EV_A_ &once->io);
2970 ev_timer_stop (EV_A_ &once->to); 3081 ev_timer_stop (EV_A_ &once->to);
2971 ev_free (once); 3082 ev_free (once);
2972 3083
2973 cb (revents, arg); 3084 cb (revents, arg);
2974} 3085}
2975 3086
2976static void 3087static void
2977once_cb_io (EV_P_ ev_io *w, int revents) 3088once_cb_io (EV_P_ ev_io *w, int revents)
2978{ 3089{
2979 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3090 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3091
3092 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2980} 3093}
2981 3094
2982static void 3095static void
2983once_cb_to (EV_P_ ev_timer *w, int revents) 3096once_cb_to (EV_P_ ev_timer *w, int revents)
2984{ 3097{
2985 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3098 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3099
3100 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2986} 3101}
2987 3102
2988void 3103void
2989ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3104ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2990{ 3105{

Diff Legend

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