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

Comparing libev/ev.c (file contents):
Revision 1.253 by root, Sat May 31 03:13:27 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 */
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
167 188
168#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
169# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
171# else 192# else
… …
285# include <sys/select.h> 306# include <sys/select.h>
286# endif 307# endif
287#endif 308#endif
288 309
289#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
290# 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
291#endif 319#endif
292 320
293#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
294# 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
295#endif 332#endif
296 333
297#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
298/* 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 */
299# include <stdint.h> 336# include <stdint.h>
… …
381{ 418{
382 syserr_cb = cb; 419 syserr_cb = cb;
383} 420}
384 421
385static void noinline 422static void noinline
386syserr (const char *msg) 423ev_syserr (const char *msg)
387{ 424{
388 if (!msg) 425 if (!msg)
389 msg = "(libev) system error"; 426 msg = "(libev) system error";
390 427
391 if (syserr_cb) 428 if (syserr_cb)
… …
442typedef struct 479typedef struct
443{ 480{
444 WL head; 481 WL head;
445 unsigned char events; 482 unsigned char events;
446 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
447#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
448 SOCKET handle; 490 SOCKET handle;
449#endif 491#endif
450} ANFD; 492} ANFD;
451 493
… …
564 struct timeval tv; 606 struct timeval tv;
565 607
566 tv.tv_sec = (time_t)delay; 608 tv.tv_sec = (time_t)delay;
567 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568 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 */
569 select (0, 0, 0, 0, &tv); 614 select (0, 0, 0, 0, &tv);
570#endif 615#endif
571 } 616 }
572} 617}
573 618
… …
600array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
601{ 646{
602 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
603 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
604} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
605 653
606#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
607 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
608 { \ 656 { \
609 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
… …
653 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
654} 702}
655 703
656/*****************************************************************************/ 704/*****************************************************************************/
657 705
658void inline_size
659anfds_init (ANFD *base, int count)
660{
661 while (count--)
662 {
663 base->head = 0;
664 base->events = EV_NONE;
665 base->reify = 0;
666
667 ++base;
668 }
669}
670
671void inline_speed 706void inline_speed
672fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
673{ 708{
674 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
675 ev_io *w; 710 ev_io *w;
… …
707 events |= (unsigned char)w->events; 742 events |= (unsigned char)w->events;
708 743
709#if EV_SELECT_IS_WINSOCKET 744#if EV_SELECT_IS_WINSOCKET
710 if (events) 745 if (events)
711 { 746 {
712 unsigned long argp; 747 unsigned long arg;
713 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
714 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
715 #else 750 #else
716 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
717 #endif 752 #endif
718 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));
719 } 754 }
720#endif 755#endif
721 756
722 { 757 {
723 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
776{ 811{
777 int fd; 812 int fd;
778 813
779 for (fd = 0; fd < anfdmax; ++fd) 814 for (fd = 0; fd < anfdmax; ++fd)
780 if (anfds [fd].events) 815 if (anfds [fd].events)
781 if (!fd_valid (fd) == -1 && errno == EBADF) 816 if (!fd_valid (fd) && errno == EBADF)
782 fd_kill (EV_A_ fd); 817 fd_kill (EV_A_ fd);
783} 818}
784 819
785/* 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 */
786static void noinline 821static void noinline
… …
804 839
805 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
806 if (anfds [fd].events) 841 if (anfds [fd].events)
807 { 842 {
808 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
809 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
810 } 846 }
811} 847}
812 848
813/*****************************************************************************/ 849/*****************************************************************************/
… …
965static ANSIG *signals; 1001static ANSIG *signals;
966static int signalmax; 1002static int signalmax;
967 1003
968static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
969 1005
970void inline_size
971signals_init (ANSIG *base, int count)
972{
973 while (count--)
974 {
975 base->head = 0;
976 base->gotsig = 0;
977
978 ++base;
979 }
980}
981
982/*****************************************************************************/ 1006/*****************************************************************************/
983 1007
984void inline_speed 1008void inline_speed
985fd_intern (int fd) 1009fd_intern (int fd)
986{ 1010{
987#ifdef _WIN32 1011#ifdef _WIN32
988 int arg = 1; 1012 unsigned long arg = 1;
989 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
990#else 1014#else
991 fcntl (fd, F_SETFD, FD_CLOEXEC); 1015 fcntl (fd, F_SETFD, FD_CLOEXEC);
992 fcntl (fd, F_SETFL, O_NONBLOCK); 1016 fcntl (fd, F_SETFL, O_NONBLOCK);
993#endif 1017#endif
… …
1007 } 1031 }
1008 else 1032 else
1009#endif 1033#endif
1010 { 1034 {
1011 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1012 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1013 1037
1014 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1015 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1016 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1017 } 1041 }
… …
1107ev_feed_signal_event (EV_P_ int signum) 1131ev_feed_signal_event (EV_P_ int signum)
1108{ 1132{
1109 WL w; 1133 WL w;
1110 1134
1111#if EV_MULTIPLICITY 1135#if EV_MULTIPLICITY
1112 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));
1113#endif 1137#endif
1114 1138
1115 --signum; 1139 --signum;
1116 1140
1117 if (signum < 0 || signum >= signalmax) 1141 if (signum < 0 || signum >= signalmax)
… …
1246 /* kqueue is borked on everything but netbsd apparently */ 1270 /* kqueue is borked on everything but netbsd apparently */
1247 /* 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 */
1248 flags &= ~EVBACKEND_KQUEUE; 1272 flags &= ~EVBACKEND_KQUEUE;
1249#endif 1273#endif
1250#ifdef __APPLE__ 1274#ifdef __APPLE__
1251 // flags &= ~EVBACKEND_KQUEUE; for documentation 1275 /* only select works correctly on that "unix-certified" platform */
1252 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 */
1253#endif 1278#endif
1254 1279
1255 return flags; 1280 return flags;
1256} 1281}
1257 1282
… …
1507{ 1532{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1533 postfork = 1; /* must be in line with ev_default_fork */
1509} 1534}
1510 1535
1511#if EV_VERIFY 1536#if EV_VERIFY
1512void noinline 1537static void noinline
1513verify_watcher (EV_P_ W w) 1538verify_watcher (EV_P_ W w)
1514{ 1539{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1540 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516 1541
1517 if (w->pending) 1542 if (w->pending)
1518 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));
1519} 1544}
1520 1545
1521static void noinline 1546static void noinline
1522verify_heap (EV_P_ ANHE *heap, int N) 1547verify_heap (EV_P_ ANHE *heap, int N)
1523{ 1548{
1524 int i; 1549 int i;
1525 1550
1526 for (i = HEAP0; i < N + HEAP0; ++i) 1551 for (i = HEAP0; i < N + HEAP0; ++i)
1527 { 1552 {
1528 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));
1529 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])));
1530 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]))));
1531 1556
1532 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1557 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1533 } 1558 }
1534} 1559}
1535 1560
1536static void noinline 1561static void noinline
1537array_verify (EV_P_ W *ws, int cnt) 1562array_verify (EV_P_ W *ws, int cnt)
1538{ 1563{
1539 while (cnt--) 1564 while (cnt--)
1540 { 1565 {
1541 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1566 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1542 verify_watcher (EV_A_ ws [cnt]); 1567 verify_watcher (EV_A_ ws [cnt]);
1543 } 1568 }
1544} 1569}
1545#endif 1570#endif
1546 1571
… …
1553 1578
1554 assert (activecnt >= -1); 1579 assert (activecnt >= -1);
1555 1580
1556 assert (fdchangemax >= fdchangecnt); 1581 assert (fdchangemax >= fdchangecnt);
1557 for (i = 0; i < fdchangecnt; ++i) 1582 for (i = 0; i < fdchangecnt; ++i)
1558 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1583 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1559 1584
1560 assert (anfdmax >= 0); 1585 assert (anfdmax >= 0);
1561 for (i = 0; i < anfdmax; ++i) 1586 for (i = 0; i < anfdmax; ++i)
1562 for (w = anfds [i].head; w; w = w->next) 1587 for (w = anfds [i].head; w; w = w->next)
1563 { 1588 {
1564 verify_watcher (EV_A_ (W)w); 1589 verify_watcher (EV_A_ (W)w);
1565 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1590 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1566 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));
1567 } 1592 }
1568 1593
1569 assert (timermax >= timercnt); 1594 assert (timermax >= timercnt);
1570 verify_heap (EV_A_ timers, timercnt); 1595 verify_heap (EV_A_ timers, timercnt);
1571 1596
… …
1648{ 1673{
1649#if EV_MULTIPLICITY 1674#if EV_MULTIPLICITY
1650 struct ev_loop *loop = ev_default_loop_ptr; 1675 struct ev_loop *loop = ev_default_loop_ptr;
1651#endif 1676#endif
1652 1677
1678 ev_default_loop_ptr = 0;
1679
1653#ifndef _WIN32 1680#ifndef _WIN32
1654 ev_ref (EV_A); /* child watcher */ 1681 ev_ref (EV_A); /* child watcher */
1655 ev_signal_stop (EV_A_ &childev); 1682 ev_signal_stop (EV_A_ &childev);
1656#endif 1683#endif
1657 1684
… …
1663{ 1690{
1664#if EV_MULTIPLICITY 1691#if EV_MULTIPLICITY
1665 struct ev_loop *loop = ev_default_loop_ptr; 1692 struct ev_loop *loop = ev_default_loop_ptr;
1666#endif 1693#endif
1667 1694
1668 if (backend)
1669 postfork = 1; /* must be in line with ev_loop_fork */ 1695 postfork = 1; /* must be in line with ev_loop_fork */
1670} 1696}
1671 1697
1672/*****************************************************************************/ 1698/*****************************************************************************/
1673 1699
1674void 1700void
… …
1687 { 1713 {
1688 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1714 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1689 1715
1690 if (expect_true (p->w)) 1716 if (expect_true (p->w))
1691 { 1717 {
1692 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1718 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1693 1719
1694 p->w->pending = 0; 1720 p->w->pending = 0;
1695 EV_CB_INVOKE (p->w, p->events); 1721 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK; 1722 EV_FREQUENT_CHECK;
1697 } 1723 }
… …
1728 1754
1729 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1755 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1730 { 1756 {
1731 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1757 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1732 1758
1733 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1759 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1734 1760
1735 /* first reschedule or stop timer */ 1761 /* first reschedule or stop timer */
1736 if (w->repeat) 1762 if (w->repeat)
1737 { 1763 {
1738 ev_at (w) += w->repeat; 1764 ev_at (w) += w->repeat;
1739 if (ev_at (w) < mn_now) 1765 if (ev_at (w) < mn_now)
1740 ev_at (w) = mn_now; 1766 ev_at (w) = mn_now;
1741 1767
1742 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.));
1743 1769
1744 ANHE_at_cache (timers [HEAP0]); 1770 ANHE_at_cache (timers [HEAP0]);
1745 downheap (timers, timercnt, HEAP0); 1771 downheap (timers, timercnt, HEAP0);
1746 } 1772 }
1747 else 1773 else
… …
1760 1786
1761 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1787 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1762 { 1788 {
1763 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1789 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1764 1790
1765 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1791 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1766 1792
1767 /* first reschedule or stop timer */ 1793 /* first reschedule or stop timer */
1768 if (w->reschedule_cb) 1794 if (w->reschedule_cb)
1769 { 1795 {
1770 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1796 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1771 1797
1772 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));
1773 1799
1774 ANHE_at_cache (periodics [HEAP0]); 1800 ANHE_at_cache (periodics [HEAP0]);
1775 downheap (periodics, periodiccnt, HEAP0); 1801 downheap (periodics, periodiccnt, HEAP0);
1776 } 1802 }
1777 else if (w->interval) 1803 else if (w->interval)
… …
1905ev_unref (EV_P) 1931ev_unref (EV_P)
1906{ 1932{
1907 --activecnt; 1933 --activecnt;
1908} 1934}
1909 1935
1936void
1937ev_now_update (EV_P)
1938{
1939 time_update (EV_A_ 1e100);
1940}
1941
1910static int loop_done; 1942static int loop_done;
1911 1943
1912void 1944void
1913ev_loop (EV_P_ int flags) 1945ev_loop (EV_P_ int flags)
1914{ 1946{
… …
2122 int fd = w->fd; 2154 int fd = w->fd;
2123 2155
2124 if (expect_false (ev_is_active (w))) 2156 if (expect_false (ev_is_active (w)))
2125 return; 2157 return;
2126 2158
2127 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))));
2128 2161
2129 EV_FREQUENT_CHECK; 2162 EV_FREQUENT_CHECK;
2130 2163
2131 ev_start (EV_A_ (W)w, 1); 2164 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2165 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2166 wlist_add (&anfds[fd].head, (WL)w);
2134 2167
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2168 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2136 w->events &= ~EV_IOFDSET; 2169 w->events &= ~EV_IOFDSET;
2137 2170
… …
2143{ 2176{
2144 clear_pending (EV_A_ (W)w); 2177 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2178 if (expect_false (!ev_is_active (w)))
2146 return; 2179 return;
2147 2180
2148 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));
2149 2182
2150 EV_FREQUENT_CHECK; 2183 EV_FREQUENT_CHECK;
2151 2184
2152 wlist_del (&anfds[w->fd].head, (WL)w); 2185 wlist_del (&anfds[w->fd].head, (WL)w);
2153 ev_stop (EV_A_ (W)w); 2186 ev_stop (EV_A_ (W)w);
… …
2163 if (expect_false (ev_is_active (w))) 2196 if (expect_false (ev_is_active (w)))
2164 return; 2197 return;
2165 2198
2166 ev_at (w) += mn_now; 2199 ev_at (w) += mn_now;
2167 2200
2168 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.));
2169 2202
2170 EV_FREQUENT_CHECK; 2203 EV_FREQUENT_CHECK;
2171 2204
2172 ++timercnt; 2205 ++timercnt;
2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2206 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2176 ANHE_at_cache (timers [ev_active (w)]); 2209 ANHE_at_cache (timers [ev_active (w)]);
2177 upheap (timers, ev_active (w)); 2210 upheap (timers, ev_active (w));
2178 2211
2179 EV_FREQUENT_CHECK; 2212 EV_FREQUENT_CHECK;
2180 2213
2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2214 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2182} 2215}
2183 2216
2184void noinline 2217void noinline
2185ev_timer_stop (EV_P_ ev_timer *w) 2218ev_timer_stop (EV_P_ ev_timer *w)
2186{ 2219{
… …
2191 EV_FREQUENT_CHECK; 2224 EV_FREQUENT_CHECK;
2192 2225
2193 { 2226 {
2194 int active = ev_active (w); 2227 int active = ev_active (w);
2195 2228
2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2229 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2197 2230
2198 --timercnt; 2231 --timercnt;
2199 2232
2200 if (expect_true (active < timercnt + HEAP0)) 2233 if (expect_true (active < timercnt + HEAP0))
2201 { 2234 {
… …
2245 2278
2246 if (w->reschedule_cb) 2279 if (w->reschedule_cb)
2247 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2280 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2248 else if (w->interval) 2281 else if (w->interval)
2249 { 2282 {
2250 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.));
2251 /* 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 */
2252 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;
2253 } 2286 }
2254 else 2287 else
2255 ev_at (w) = w->offset; 2288 ev_at (w) = w->offset;
… …
2263 ANHE_at_cache (periodics [ev_active (w)]); 2296 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w)); 2297 upheap (periodics, ev_active (w));
2265 2298
2266 EV_FREQUENT_CHECK; 2299 EV_FREQUENT_CHECK;
2267 2300
2268 /*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));*/
2269} 2302}
2270 2303
2271void noinline 2304void noinline
2272ev_periodic_stop (EV_P_ ev_periodic *w) 2305ev_periodic_stop (EV_P_ ev_periodic *w)
2273{ 2306{
… …
2278 EV_FREQUENT_CHECK; 2311 EV_FREQUENT_CHECK;
2279 2312
2280 { 2313 {
2281 int active = ev_active (w); 2314 int active = ev_active (w);
2282 2315
2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2316 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2284 2317
2285 --periodiccnt; 2318 --periodiccnt;
2286 2319
2287 if (expect_true (active < periodiccnt + HEAP0)) 2320 if (expect_true (active < periodiccnt + HEAP0))
2288 { 2321 {
… …
2311 2344
2312void noinline 2345void noinline
2313ev_signal_start (EV_P_ ev_signal *w) 2346ev_signal_start (EV_P_ ev_signal *w)
2314{ 2347{
2315#if EV_MULTIPLICITY 2348#if EV_MULTIPLICITY
2316 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));
2317#endif 2350#endif
2318 if (expect_false (ev_is_active (w))) 2351 if (expect_false (ev_is_active (w)))
2319 return; 2352 return;
2320 2353
2321 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));
2322 2355
2323 evpipe_init (EV_A); 2356 evpipe_init (EV_A);
2324 2357
2325 EV_FREQUENT_CHECK; 2358 EV_FREQUENT_CHECK;
2326 2359
… …
2329 sigset_t full, prev; 2362 sigset_t full, prev;
2330 sigfillset (&full); 2363 sigfillset (&full);
2331 sigprocmask (SIG_SETMASK, &full, &prev); 2364 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif 2365#endif
2333 2366
2334 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2367 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335 2368
2336#ifndef _WIN32 2369#ifndef _WIN32
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2370 sigprocmask (SIG_SETMASK, &prev, 0);
2338#endif 2371#endif
2339 } 2372 }
… …
2377 2410
2378void 2411void
2379ev_child_start (EV_P_ ev_child *w) 2412ev_child_start (EV_P_ ev_child *w)
2380{ 2413{
2381#if EV_MULTIPLICITY 2414#if EV_MULTIPLICITY
2382 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));
2383#endif 2416#endif
2384 if (expect_false (ev_is_active (w))) 2417 if (expect_false (ev_is_active (w)))
2385 return; 2418 return;
2386 2419
2387 EV_FREQUENT_CHECK; 2420 EV_FREQUENT_CHECK;
… …
2412# ifdef _WIN32 2445# ifdef _WIN32
2413# undef lstat 2446# undef lstat
2414# define lstat(a,b) _stati64 (a,b) 2447# define lstat(a,b) _stati64 (a,b)
2415# endif 2448# endif
2416 2449
2417#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 */
2418#define MIN_STAT_INTERVAL 0.1074891 2452#define MIN_STAT_INTERVAL 0.1074891
2419 2453
2420static 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);
2421 2455
2422#if EV_USE_INOTIFY 2456#if EV_USE_INOTIFY
2423# define EV_INOTIFY_BUFSIZE 8192 2457# define EV_INOTIFY_BUFSIZE 8192
… …
2427{ 2461{
2428 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);
2429 2463
2430 if (w->wd < 0) 2464 if (w->wd < 0)
2431 { 2465 {
2466 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2432 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 */
2433 2468
2434 /* monitor some parent directory for speedup hints */ 2469 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2470 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2471 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2472 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2473 {
2439 char path [4096]; 2474 char path [4096];
2440 strcpy (path, w->path); 2475 strcpy (path, w->path);
… …
2444 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2479 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2445 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2480 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2446 2481
2447 char *pend = strrchr (path, '/'); 2482 char *pend = strrchr (path, '/');
2448 2483
2449 if (!pend) 2484 if (!pend || pend == path)
2450 break; /* whoops, no '/', complain to your admin */ 2485 break;
2451 2486
2452 *pend = 0; 2487 *pend = 0;
2453 w->wd = inotify_add_watch (fs_fd, path, mask); 2488 w->wd = inotify_add_watch (fs_fd, path, mask);
2454 } 2489 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2490 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2491 }
2457 } 2492 }
2458 else
2459 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2460 2493
2461 if (w->wd >= 0) 2494 if (w->wd >= 0)
2495 {
2462 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 }
2463} 2515}
2464 2516
2465static void noinline 2517static void noinline
2466infy_del (EV_P_ ev_stat *w) 2518infy_del (EV_P_ ev_stat *w)
2467{ 2519{
… …
2481 2533
2482static void noinline 2534static void noinline
2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2535infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484{ 2536{
2485 if (slot < 0) 2537 if (slot < 0)
2486 /* overflow, need to check for all hahs slots */ 2538 /* overflow, need to check for all hash slots */
2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2539 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488 infy_wd (EV_A_ slot, wd, ev); 2540 infy_wd (EV_A_ slot, wd, ev);
2489 else 2541 else
2490 { 2542 {
2491 WL w_; 2543 WL w_;
… …
2497 2549
2498 if (w->wd == wd || wd == -1) 2550 if (w->wd == wd || wd == -1)
2499 { 2551 {
2500 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2552 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2501 { 2553 {
2554 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2502 w->wd = -1; 2555 w->wd = -1;
2503 infy_add (EV_A_ w); /* re-add, no matter what */ 2556 infy_add (EV_A_ w); /* re-add, no matter what */
2504 } 2557 }
2505 2558
2506 stat_timer_cb (EV_A_ &w->timer, 0); 2559 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2520 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)
2521 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2574 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522} 2575}
2523 2576
2524void 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
2525infy_init (EV_P) 2601infy_init (EV_P)
2526{ 2602{
2527 if (fs_fd != -2) 2603 if (fs_fd != -2)
2528 return; 2604 return;
2605
2606 fs_fd = -1;
2607
2608 check_2625 (EV_A);
2529 2609
2530 fs_fd = inotify_init (); 2610 fs_fd = inotify_init ();
2531 2611
2532 if (fs_fd >= 0) 2612 if (fs_fd >= 0)
2533 { 2613 {
… …
2561 w->wd = -1; 2641 w->wd = -1;
2562 2642
2563 if (fs_fd >= 0) 2643 if (fs_fd >= 0)
2564 infy_add (EV_A_ w); /* re-add, no matter what */ 2644 infy_add (EV_A_ w); /* re-add, no matter what */
2565 else 2645 else
2566 ev_timer_start (EV_A_ &w->timer); 2646 ev_timer_again (EV_A_ &w->timer);
2567 } 2647 }
2568
2569 } 2648 }
2570} 2649}
2571 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)
2572#endif 2657#endif
2573 2658
2574void 2659void
2575ev_stat_stat (EV_P_ ev_stat *w) 2660ev_stat_stat (EV_P_ ev_stat *w)
2576{ 2661{
… …
2603 || w->prev.st_atime != w->attr.st_atime 2688 || w->prev.st_atime != w->attr.st_atime
2604 || w->prev.st_mtime != w->attr.st_mtime 2689 || w->prev.st_mtime != w->attr.st_mtime
2605 || w->prev.st_ctime != w->attr.st_ctime 2690 || w->prev.st_ctime != w->attr.st_ctime
2606 ) { 2691 ) {
2607 #if EV_USE_INOTIFY 2692 #if EV_USE_INOTIFY
2693 if (fs_fd >= 0)
2694 {
2608 infy_del (EV_A_ w); 2695 infy_del (EV_A_ w);
2609 infy_add (EV_A_ w); 2696 infy_add (EV_A_ w);
2610 ev_stat_stat (EV_A_ w); /* avoid race... */ 2697 ev_stat_stat (EV_A_ w); /* avoid race... */
2698 }
2611 #endif 2699 #endif
2612 2700
2613 ev_feed_event (EV_A_ w, EV_STAT); 2701 ev_feed_event (EV_A_ w, EV_STAT);
2614 } 2702 }
2615} 2703}
… …
2618ev_stat_start (EV_P_ ev_stat *w) 2706ev_stat_start (EV_P_ ev_stat *w)
2619{ 2707{
2620 if (expect_false (ev_is_active (w))) 2708 if (expect_false (ev_is_active (w)))
2621 return; 2709 return;
2622 2710
2623 /* since we use memcmp, we need to clear any padding data etc. */
2624 memset (&w->prev, 0, sizeof (ev_statdata));
2625 memset (&w->attr, 0, sizeof (ev_statdata));
2626
2627 ev_stat_stat (EV_A_ w); 2711 ev_stat_stat (EV_A_ w);
2628 2712
2713 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2629 if (w->interval < MIN_STAT_INTERVAL) 2714 w->interval = MIN_STAT_INTERVAL;
2630 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2631 2715
2632 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);
2633 ev_set_priority (&w->timer, ev_priority (w)); 2717 ev_set_priority (&w->timer, ev_priority (w));
2634 2718
2635#if EV_USE_INOTIFY 2719#if EV_USE_INOTIFY
2636 infy_init (EV_A); 2720 infy_init (EV_A);
2637 2721
2638 if (fs_fd >= 0) 2722 if (fs_fd >= 0)
2639 infy_add (EV_A_ w); 2723 infy_add (EV_A_ w);
2640 else 2724 else
2641#endif 2725#endif
2642 ev_timer_start (EV_A_ &w->timer); 2726 ev_timer_again (EV_A_ &w->timer);
2643 2727
2644 ev_start (EV_A_ (W)w, 1); 2728 ev_start (EV_A_ (W)w, 1);
2645 2729
2646 EV_FREQUENT_CHECK; 2730 EV_FREQUENT_CHECK;
2647} 2731}
… …
2817 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2901 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2818 } 2902 }
2819 } 2903 }
2820} 2904}
2821 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
2822#if 0 2923#if 0
2823static void 2924static void
2824embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2925embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2825{ 2926{
2826 ev_idle_stop (EV_A_ idle); 2927 ev_idle_stop (EV_A_ idle);
… …
2833 if (expect_false (ev_is_active (w))) 2934 if (expect_false (ev_is_active (w)))
2834 return; 2935 return;
2835 2936
2836 { 2937 {
2837 struct ev_loop *loop = w->other; 2938 struct ev_loop *loop = w->other;
2838 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 ()));
2839 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);
2840 } 2941 }
2841 2942
2842 EV_FREQUENT_CHECK; 2943 EV_FREQUENT_CHECK;
2843 2944
… …
2846 2947
2847 ev_prepare_init (&w->prepare, embed_prepare_cb); 2948 ev_prepare_init (&w->prepare, embed_prepare_cb);
2848 ev_set_priority (&w->prepare, EV_MINPRI); 2949 ev_set_priority (&w->prepare, EV_MINPRI);
2849 ev_prepare_start (EV_A_ &w->prepare); 2950 ev_prepare_start (EV_A_ &w->prepare);
2850 2951
2952 ev_fork_init (&w->fork, embed_fork_cb);
2953 ev_fork_start (EV_A_ &w->fork);
2954
2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2955 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2852 2956
2853 ev_start (EV_A_ (W)w, 1); 2957 ev_start (EV_A_ (W)w, 1);
2854 2958
2855 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
… …
2862 if (expect_false (!ev_is_active (w))) 2966 if (expect_false (!ev_is_active (w)))
2863 return; 2967 return;
2864 2968
2865 EV_FREQUENT_CHECK; 2969 EV_FREQUENT_CHECK;
2866 2970
2867 ev_io_stop (EV_A_ &w->io); 2971 ev_io_stop (EV_A_ &w->io);
2868 ev_prepare_stop (EV_A_ &w->prepare); 2972 ev_prepare_stop (EV_A_ &w->prepare);
2869 2973 ev_fork_stop (EV_A_ &w->fork);
2870 ev_stop (EV_A_ (W)w);
2871 2974
2872 EV_FREQUENT_CHECK; 2975 EV_FREQUENT_CHECK;
2873} 2976}
2874#endif 2977#endif
2875 2978
… …
2972once_cb (EV_P_ struct ev_once *once, int revents) 3075once_cb (EV_P_ struct ev_once *once, int revents)
2973{ 3076{
2974 void (*cb)(int revents, void *arg) = once->cb; 3077 void (*cb)(int revents, void *arg) = once->cb;
2975 void *arg = once->arg; 3078 void *arg = once->arg;
2976 3079
2977 ev_io_stop (EV_A_ &once->io); 3080 ev_io_stop (EV_A_ &once->io);
2978 ev_timer_stop (EV_A_ &once->to); 3081 ev_timer_stop (EV_A_ &once->to);
2979 ev_free (once); 3082 ev_free (once);
2980 3083
2981 cb (revents, arg); 3084 cb (revents, arg);
2982} 3085}
2983 3086
2984static void 3087static void
2985once_cb_io (EV_P_ ev_io *w, int revents) 3088once_cb_io (EV_P_ ev_io *w, int revents)
2986{ 3089{
2987 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));
2988} 3093}
2989 3094
2990static void 3095static void
2991once_cb_to (EV_P_ ev_timer *w, int revents) 3096once_cb_to (EV_P_ ev_timer *w, int revents)
2992{ 3097{
2993 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));
2994} 3101}
2995 3102
2996void 3103void
2997ev_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)
2998{ 3105{

Diff Legend

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