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

Comparing libev/ev.c (file contents):
Revision 1.258 by root, Sun Sep 7 18:15:12 2008 UTC vs.
Revision 1.279 by root, Fri Feb 6 20:17:43 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
57# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
58# endif 70# endif
59# else 71# else
60# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
62# endif 74# endif
164# endif 176# endif
165#endif 177#endif
166 178
167/* 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 */
168 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
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
174# endif 194# endif
175#endif 195#endif
176 196
177#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 199#endif
180 200
181#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
286# include <sys/select.h> 306# include <sys/select.h>
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
291# 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
292#endif 319#endif
293 320
294#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
295# 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
296#endif 332#endif
297 333
298#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
299/* 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 */
300# include <stdint.h> 336# include <stdint.h>
361typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
362 398
363#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
364#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
365 401
366#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
367/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
368/* giving it a reasonably high chance of working on typical architetcures */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
369static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
370#endif 410#endif
371 411
372#ifdef _WIN32 412#ifdef _WIN32
373# include "ev_win32.c" 413# include "ev_win32.c"
382{ 422{
383 syserr_cb = cb; 423 syserr_cb = cb;
384} 424}
385 425
386static void noinline 426static void noinline
387syserr (const char *msg) 427ev_syserr (const char *msg)
388{ 428{
389 if (!msg) 429 if (!msg)
390 msg = "(libev) system error"; 430 msg = "(libev) system error";
391 431
392 if (syserr_cb) 432 if (syserr_cb)
443typedef struct 483typedef struct
444{ 484{
445 WL head; 485 WL head;
446 unsigned char events; 486 unsigned char events;
447 unsigned char reify; 487 unsigned char reify;
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused;
490#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif
448#if EV_SELECT_IS_WINSOCKET 493#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 494 SOCKET handle;
450#endif 495#endif
451} ANFD; 496} ANFD;
452 497
512 557
513ev_tstamp 558ev_tstamp
514ev_time (void) 559ev_time (void)
515{ 560{
516#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
517 struct timespec ts; 564 struct timespec ts;
518 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
519 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
520#else 567 }
568#endif
569
521 struct timeval tv; 570 struct timeval tv;
522 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
523 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
524#endif
525} 573}
526 574
527ev_tstamp inline_size 575ev_tstamp inline_size
528get_clock (void) 576get_clock (void)
529{ 577{
604array_realloc (int elem, void *base, int *cur, int cnt) 652array_realloc (int elem, void *base, int *cur, int cnt)
605{ 653{
606 *cur = array_nextsize (elem, *cur, cnt); 654 *cur = array_nextsize (elem, *cur, cnt);
607 return ev_realloc (base, elem * *cur); 655 return ev_realloc (base, elem * *cur);
608} 656}
657
658#define array_init_zero(base,count) \
659 memset ((void *)(base), 0, sizeof (*(base)) * (count))
609 660
610#define array_needsize(type,base,cur,cnt,init) \ 661#define array_needsize(type,base,cur,cnt,init) \
611 if (expect_false ((cnt) > (cur))) \ 662 if (expect_false ((cnt) > (cur))) \
612 { \ 663 { \
613 int ocur_ = (cur); \ 664 int ocur_ = (cur); \
656 for (i = 0; i < eventcnt; ++i) 707 for (i = 0; i < eventcnt; ++i)
657 ev_feed_event (EV_A_ events [i], type); 708 ev_feed_event (EV_A_ events [i], type);
658} 709}
659 710
660/*****************************************************************************/ 711/*****************************************************************************/
661
662void inline_size
663anfds_init (ANFD *base, int count)
664{
665 while (count--)
666 {
667 base->head = 0;
668 base->events = EV_NONE;
669 base->reify = 0;
670
671 ++base;
672 }
673}
674 712
675void inline_speed 713void inline_speed
676fd_event (EV_P_ int fd, int revents) 714fd_event (EV_P_ int fd, int revents)
677{ 715{
678 ANFD *anfd = anfds + fd; 716 ANFD *anfd = anfds + fd;
717 #ifdef EV_FD_TO_WIN32_HANDLE 755 #ifdef EV_FD_TO_WIN32_HANDLE
718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
719 #else 757 #else
720 anfd->handle = _get_osfhandle (fd); 758 anfd->handle = _get_osfhandle (fd);
721 #endif 759 #endif
722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 760 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
723 } 761 }
724#endif 762#endif
725 763
726 { 764 {
727 unsigned char o_events = anfd->events; 765 unsigned char o_events = anfd->events;
808 846
809 for (fd = 0; fd < anfdmax; ++fd) 847 for (fd = 0; fd < anfdmax; ++fd)
810 if (anfds [fd].events) 848 if (anfds [fd].events)
811 { 849 {
812 anfds [fd].events = 0; 850 anfds [fd].events = 0;
851 anfds [fd].emask = 0;
813 fd_change (EV_A_ fd, EV_IOFDSET | 1); 852 fd_change (EV_A_ fd, EV_IOFDSET | 1);
814 } 853 }
815} 854}
816 855
817/*****************************************************************************/ 856/*****************************************************************************/
969static ANSIG *signals; 1008static ANSIG *signals;
970static int signalmax; 1009static int signalmax;
971 1010
972static EV_ATOMIC_T gotsig; 1011static EV_ATOMIC_T gotsig;
973 1012
974void inline_size
975signals_init (ANSIG *base, int count)
976{
977 while (count--)
978 {
979 base->head = 0;
980 base->gotsig = 0;
981
982 ++base;
983 }
984}
985
986/*****************************************************************************/ 1013/*****************************************************************************/
987 1014
988void inline_speed 1015void inline_speed
989fd_intern (int fd) 1016fd_intern (int fd)
990{ 1017{
1011 } 1038 }
1012 else 1039 else
1013#endif 1040#endif
1014 { 1041 {
1015 while (pipe (evpipe)) 1042 while (pipe (evpipe))
1016 syserr ("(libev) error creating signal/async pipe"); 1043 ev_syserr ("(libev) error creating signal/async pipe");
1017 1044
1018 fd_intern (evpipe [0]); 1045 fd_intern (evpipe [0]);
1019 fd_intern (evpipe [1]); 1046 fd_intern (evpipe [1]);
1020 ev_io_set (&pipeev, evpipe [0], EV_READ); 1047 ev_io_set (&pipeev, evpipe [0], EV_READ);
1021 } 1048 }
1111ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1112{ 1139{
1113 WL w; 1140 WL w;
1114 1141
1115#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1116 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1117#endif 1144#endif
1118 1145
1119 --signum; 1146 --signum;
1120 1147
1121 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
1250 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1251 /* it usually doesn't work correctly on anything but sockets and pipes */ 1278 /* it usually doesn't work correctly on anything but sockets and pipes */
1252 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1253#endif 1280#endif
1254#ifdef __APPLE__ 1281#ifdef __APPLE__
1255 // flags &= ~EVBACKEND_KQUEUE; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1256 flags &= ~EVBACKEND_POLL; 1283 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1284 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1257#endif 1285#endif
1258 1286
1259 return flags; 1287 return flags;
1260} 1288}
1261 1289
1298static void noinline 1326static void noinline
1299loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1300{ 1328{
1301 if (!backend) 1329 if (!backend)
1302 { 1330 {
1331#if EV_USE_REALTIME
1332 if (!have_realtime)
1333 {
1334 struct timespec ts;
1335
1336 if (!clock_gettime (CLOCK_REALTIME, &ts))
1337 have_realtime = 1;
1338 }
1339#endif
1340
1303#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1304 { 1343 {
1305 struct timespec ts; 1344 struct timespec ts;
1345
1306 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1307 have_monotonic = 1; 1347 have_monotonic = 1;
1308 } 1348 }
1309#endif 1349#endif
1310 1350
1311 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1312 mn_now = get_clock (); 1352 mn_now = get_clock ();
1313 now_floor = mn_now; 1353 now_floor = mn_now;
1514 1554
1515#if EV_VERIFY 1555#if EV_VERIFY
1516static void noinline 1556static void noinline
1517verify_watcher (EV_P_ W w) 1557verify_watcher (EV_P_ W w)
1518{ 1558{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520 1560
1521 if (w->pending) 1561 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1562 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523} 1563}
1524 1564
1525static void noinline 1565static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N) 1566verify_heap (EV_P_ ANHE *heap, int N)
1527{ 1567{
1528 int i; 1568 int i;
1529 1569
1530 for (i = HEAP0; i < N + HEAP0; ++i) 1570 for (i = HEAP0; i < N + HEAP0; ++i)
1531 { 1571 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1572 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1573 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1574 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535 1575
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 } 1577 }
1538} 1578}
1539 1579
1540static void noinline 1580static void noinline
1541array_verify (EV_P_ W *ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1542{ 1582{
1543 while (cnt--) 1583 while (cnt--)
1544 { 1584 {
1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]); 1586 verify_watcher (EV_A_ ws [cnt]);
1547 } 1587 }
1548} 1588}
1549#endif 1589#endif
1550 1590
1557 1597
1558 assert (activecnt >= -1); 1598 assert (activecnt >= -1);
1559 1599
1560 assert (fdchangemax >= fdchangecnt); 1600 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i) 1601 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1563 1603
1564 assert (anfdmax >= 0); 1604 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i) 1605 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next) 1606 for (w = anfds [i].head; w; w = w->next)
1567 { 1607 {
1568 verify_watcher (EV_A_ (W)w); 1608 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1609 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1610 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 } 1611 }
1572 1612
1573 assert (timermax >= timercnt); 1613 assert (timermax >= timercnt);
1574 verify_heap (EV_A_ timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1575 1615
1652{ 1692{
1653#if EV_MULTIPLICITY 1693#if EV_MULTIPLICITY
1654 struct ev_loop *loop = ev_default_loop_ptr; 1694 struct ev_loop *loop = ev_default_loop_ptr;
1655#endif 1695#endif
1656 1696
1697 ev_default_loop_ptr = 0;
1698
1657#ifndef _WIN32 1699#ifndef _WIN32
1658 ev_ref (EV_A); /* child watcher */ 1700 ev_ref (EV_A); /* child watcher */
1659 ev_signal_stop (EV_A_ &childev); 1701 ev_signal_stop (EV_A_ &childev);
1660#endif 1702#endif
1661 1703
1667{ 1709{
1668#if EV_MULTIPLICITY 1710#if EV_MULTIPLICITY
1669 struct ev_loop *loop = ev_default_loop_ptr; 1711 struct ev_loop *loop = ev_default_loop_ptr;
1670#endif 1712#endif
1671 1713
1672 if (backend)
1673 postfork = 1; /* must be in line with ev_loop_fork */ 1714 postfork = 1; /* must be in line with ev_loop_fork */
1674} 1715}
1675 1716
1676/*****************************************************************************/ 1717/*****************************************************************************/
1677 1718
1678void 1719void
1691 { 1732 {
1692 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1693 1734
1694 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1695 { 1736 {
1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1697 1738
1698 p->w->pending = 0; 1739 p->w->pending = 0;
1699 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1701 } 1742 }
1732 1773
1733 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1734 { 1775 {
1735 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1736 1777
1737 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1738 1779
1739 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1740 if (w->repeat) 1781 if (w->repeat)
1741 { 1782 {
1742 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1743 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1744 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1745 1786
1746 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1747 1788
1748 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1749 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1750 } 1791 }
1751 else 1792 else
1764 1805
1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1766 { 1807 {
1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1768 1809
1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1770 1811
1771 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1772 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1773 { 1814 {
1774 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1775 1816
1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1777 1818
1778 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1779 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1780 } 1821 }
1781 else if (w->interval) 1822 else if (w->interval)
1909ev_unref (EV_P) 1950ev_unref (EV_P)
1910{ 1951{
1911 --activecnt; 1952 --activecnt;
1912} 1953}
1913 1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1914static int loop_done; 1961static int loop_done;
1915 1962
1916void 1963void
1917ev_loop (EV_P_ int flags) 1964ev_loop (EV_P_ int flags)
1918{ 1965{
2126 int fd = w->fd; 2173 int fd = w->fd;
2127 2174
2128 if (expect_false (ev_is_active (w))) 2175 if (expect_false (ev_is_active (w)))
2129 return; 2176 return;
2130 2177
2131 assert (("ev_io_start called with negative fd", fd >= 0)); 2178 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2132 2180
2133 EV_FREQUENT_CHECK; 2181 EV_FREQUENT_CHECK;
2134 2182
2135 ev_start (EV_A_ (W)w, 1); 2183 ev_start (EV_A_ (W)w, 1);
2136 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2137 wlist_add (&anfds[fd].head, (WL)w); 2185 wlist_add (&anfds[fd].head, (WL)w);
2138 2186
2139 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2187 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2140 w->events &= ~EV_IOFDSET; 2188 w->events &= ~EV_IOFDSET;
2141 2189
2147{ 2195{
2148 clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2149 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2150 return; 2198 return;
2151 2199
2152 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2200 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2153 2201
2154 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2155 2203
2156 wlist_del (&anfds[w->fd].head, (WL)w); 2204 wlist_del (&anfds[w->fd].head, (WL)w);
2157 ev_stop (EV_A_ (W)w); 2205 ev_stop (EV_A_ (W)w);
2167 if (expect_false (ev_is_active (w))) 2215 if (expect_false (ev_is_active (w)))
2168 return; 2216 return;
2169 2217
2170 ev_at (w) += mn_now; 2218 ev_at (w) += mn_now;
2171 2219
2172 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2220 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2173 2221
2174 EV_FREQUENT_CHECK; 2222 EV_FREQUENT_CHECK;
2175 2223
2176 ++timercnt; 2224 ++timercnt;
2177 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2225 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2180 ANHE_at_cache (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2181 upheap (timers, ev_active (w)); 2229 upheap (timers, ev_active (w));
2182 2230
2183 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2184 2232
2185 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2233 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2186} 2234}
2187 2235
2188void noinline 2236void noinline
2189ev_timer_stop (EV_P_ ev_timer *w) 2237ev_timer_stop (EV_P_ ev_timer *w)
2190{ 2238{
2195 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2196 2244
2197 { 2245 {
2198 int active = ev_active (w); 2246 int active = ev_active (w);
2199 2247
2200 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2248 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2201 2249
2202 --timercnt; 2250 --timercnt;
2203 2251
2204 if (expect_true (active < timercnt + HEAP0)) 2252 if (expect_true (active < timercnt + HEAP0))
2205 { 2253 {
2249 2297
2250 if (w->reschedule_cb) 2298 if (w->reschedule_cb)
2251 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2252 else if (w->interval) 2300 else if (w->interval)
2253 { 2301 {
2254 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2302 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2255 /* this formula differs from the one in periodic_reify because we do not always round up */ 2303 /* this formula differs from the one in periodic_reify because we do not always round up */
2256 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2304 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2257 } 2305 }
2258 else 2306 else
2259 ev_at (w) = w->offset; 2307 ev_at (w) = w->offset;
2267 ANHE_at_cache (periodics [ev_active (w)]); 2315 ANHE_at_cache (periodics [ev_active (w)]);
2268 upheap (periodics, ev_active (w)); 2316 upheap (periodics, ev_active (w));
2269 2317
2270 EV_FREQUENT_CHECK; 2318 EV_FREQUENT_CHECK;
2271 2319
2272 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2320 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2273} 2321}
2274 2322
2275void noinline 2323void noinline
2276ev_periodic_stop (EV_P_ ev_periodic *w) 2324ev_periodic_stop (EV_P_ ev_periodic *w)
2277{ 2325{
2282 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2283 2331
2284 { 2332 {
2285 int active = ev_active (w); 2333 int active = ev_active (w);
2286 2334
2287 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2335 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2288 2336
2289 --periodiccnt; 2337 --periodiccnt;
2290 2338
2291 if (expect_true (active < periodiccnt + HEAP0)) 2339 if (expect_true (active < periodiccnt + HEAP0))
2292 { 2340 {
2315 2363
2316void noinline 2364void noinline
2317ev_signal_start (EV_P_ ev_signal *w) 2365ev_signal_start (EV_P_ ev_signal *w)
2318{ 2366{
2319#if EV_MULTIPLICITY 2367#if EV_MULTIPLICITY
2320 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2368 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2321#endif 2369#endif
2322 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2323 return; 2371 return;
2324 2372
2325 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2373 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2326 2374
2327 evpipe_init (EV_A); 2375 evpipe_init (EV_A);
2328 2376
2329 EV_FREQUENT_CHECK; 2377 EV_FREQUENT_CHECK;
2330 2378
2333 sigset_t full, prev; 2381 sigset_t full, prev;
2334 sigfillset (&full); 2382 sigfillset (&full);
2335 sigprocmask (SIG_SETMASK, &full, &prev); 2383 sigprocmask (SIG_SETMASK, &full, &prev);
2336#endif 2384#endif
2337 2385
2338 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2386 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2339 2387
2340#ifndef _WIN32 2388#ifndef _WIN32
2341 sigprocmask (SIG_SETMASK, &prev, 0); 2389 sigprocmask (SIG_SETMASK, &prev, 0);
2342#endif 2390#endif
2343 } 2391 }
2381 2429
2382void 2430void
2383ev_child_start (EV_P_ ev_child *w) 2431ev_child_start (EV_P_ ev_child *w)
2384{ 2432{
2385#if EV_MULTIPLICITY 2433#if EV_MULTIPLICITY
2386 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2434 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2387#endif 2435#endif
2388 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
2389 return; 2437 return;
2390 2438
2391 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
2416# ifdef _WIN32 2464# ifdef _WIN32
2417# undef lstat 2465# undef lstat
2418# define lstat(a,b) _stati64 (a,b) 2466# define lstat(a,b) _stati64 (a,b)
2419# endif 2467# endif
2420 2468
2421#define DEF_STAT_INTERVAL 5.0074891 2469#define DEF_STAT_INTERVAL 5.0074891
2470#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2422#define MIN_STAT_INTERVAL 0.1074891 2471#define MIN_STAT_INTERVAL 0.1074891
2423 2472
2424static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2473static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2425 2474
2426#if EV_USE_INOTIFY 2475#if EV_USE_INOTIFY
2427# define EV_INOTIFY_BUFSIZE 8192 2476# define EV_INOTIFY_BUFSIZE 8192
2431{ 2480{
2432 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2481 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);
2433 2482
2434 if (w->wd < 0) 2483 if (w->wd < 0)
2435 { 2484 {
2485 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2436 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2486 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2437 2487
2438 /* monitor some parent directory for speedup hints */ 2488 /* monitor some parent directory for speedup hints */
2439 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2440 /* but an efficiency issue only */ 2490 /* but an efficiency issue only */
2441 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2442 { 2492 {
2443 char path [4096]; 2493 char path [4096];
2444 strcpy (path, w->path); 2494 strcpy (path, w->path);
2448 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2498 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2449 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2499 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2450 2500
2451 char *pend = strrchr (path, '/'); 2501 char *pend = strrchr (path, '/');
2452 2502
2453 if (!pend) 2503 if (!pend || pend == path)
2454 break; /* whoops, no '/', complain to your admin */ 2504 break;
2455 2505
2456 *pend = 0; 2506 *pend = 0;
2457 w->wd = inotify_add_watch (fs_fd, path, mask); 2507 w->wd = inotify_add_watch (fs_fd, path, mask);
2458 } 2508 }
2459 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2460 } 2510 }
2461 } 2511 }
2462 else
2463 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2464 2512
2465 if (w->wd >= 0) 2513 if (w->wd >= 0)
2514 {
2466 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2515 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2516
2517 /* now local changes will be tracked by inotify, but remote changes won't */
2518 /* unless the filesystem it known to be local, we therefore still poll */
2519 /* also do poll on <2.6.25, but with normal frequency */
2520 struct statfs sfs;
2521
2522 if (fs_2625 && !statfs (w->path, &sfs))
2523 if (sfs.f_type == 0x1373 /* devfs */
2524 || sfs.f_type == 0xEF53 /* ext2/3 */
2525 || sfs.f_type == 0x3153464a /* jfs */
2526 || sfs.f_type == 0x52654973 /* reiser3 */
2527 || sfs.f_type == 0x01021994 /* tempfs */
2528 || sfs.f_type == 0x58465342 /* xfs */)
2529 return;
2530
2531 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2532 ev_timer_again (EV_A_ &w->timer);
2533 }
2467} 2534}
2468 2535
2469static void noinline 2536static void noinline
2470infy_del (EV_P_ ev_stat *w) 2537infy_del (EV_P_ ev_stat *w)
2471{ 2538{
2485 2552
2486static void noinline 2553static void noinline
2487infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2554infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2488{ 2555{
2489 if (slot < 0) 2556 if (slot < 0)
2490 /* overflow, need to check for all hahs slots */ 2557 /* overflow, need to check for all hash slots */
2491 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2558 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2492 infy_wd (EV_A_ slot, wd, ev); 2559 infy_wd (EV_A_ slot, wd, ev);
2493 else 2560 else
2494 { 2561 {
2495 WL w_; 2562 WL w_;
2501 2568
2502 if (w->wd == wd || wd == -1) 2569 if (w->wd == wd || wd == -1)
2503 { 2570 {
2504 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2571 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2505 { 2572 {
2573 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506 w->wd = -1; 2574 w->wd = -1;
2507 infy_add (EV_A_ w); /* re-add, no matter what */ 2575 infy_add (EV_A_ w); /* re-add, no matter what */
2508 } 2576 }
2509 2577
2510 stat_timer_cb (EV_A_ &w->timer, 0); 2578 stat_timer_cb (EV_A_ &w->timer, 0);
2524 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2592 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2525 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2593 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526} 2594}
2527 2595
2528void inline_size 2596void inline_size
2597check_2625 (EV_P)
2598{
2599 /* kernels < 2.6.25 are borked
2600 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2601 */
2602 struct utsname buf;
2603 int major, minor, micro;
2604
2605 if (uname (&buf))
2606 return;
2607
2608 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2609 return;
2610
2611 if (major < 2
2612 || (major == 2 && minor < 6)
2613 || (major == 2 && minor == 6 && micro < 25))
2614 return;
2615
2616 fs_2625 = 1;
2617}
2618
2619void inline_size
2529infy_init (EV_P) 2620infy_init (EV_P)
2530{ 2621{
2531 if (fs_fd != -2) 2622 if (fs_fd != -2)
2532 return; 2623 return;
2624
2625 fs_fd = -1;
2626
2627 check_2625 (EV_A);
2533 2628
2534 fs_fd = inotify_init (); 2629 fs_fd = inotify_init ();
2535 2630
2536 if (fs_fd >= 0) 2631 if (fs_fd >= 0)
2537 { 2632 {
2565 w->wd = -1; 2660 w->wd = -1;
2566 2661
2567 if (fs_fd >= 0) 2662 if (fs_fd >= 0)
2568 infy_add (EV_A_ w); /* re-add, no matter what */ 2663 infy_add (EV_A_ w); /* re-add, no matter what */
2569 else 2664 else
2570 ev_timer_start (EV_A_ &w->timer); 2665 ev_timer_again (EV_A_ &w->timer);
2571 } 2666 }
2572
2573 } 2667 }
2574} 2668}
2575 2669
2576#endif 2670#endif
2577 2671
2613 || w->prev.st_atime != w->attr.st_atime 2707 || w->prev.st_atime != w->attr.st_atime
2614 || w->prev.st_mtime != w->attr.st_mtime 2708 || w->prev.st_mtime != w->attr.st_mtime
2615 || w->prev.st_ctime != w->attr.st_ctime 2709 || w->prev.st_ctime != w->attr.st_ctime
2616 ) { 2710 ) {
2617 #if EV_USE_INOTIFY 2711 #if EV_USE_INOTIFY
2712 if (fs_fd >= 0)
2713 {
2618 infy_del (EV_A_ w); 2714 infy_del (EV_A_ w);
2619 infy_add (EV_A_ w); 2715 infy_add (EV_A_ w);
2620 ev_stat_stat (EV_A_ w); /* avoid race... */ 2716 ev_stat_stat (EV_A_ w); /* avoid race... */
2717 }
2621 #endif 2718 #endif
2622 2719
2623 ev_feed_event (EV_A_ w, EV_STAT); 2720 ev_feed_event (EV_A_ w, EV_STAT);
2624 } 2721 }
2625} 2722}
2628ev_stat_start (EV_P_ ev_stat *w) 2725ev_stat_start (EV_P_ ev_stat *w)
2629{ 2726{
2630 if (expect_false (ev_is_active (w))) 2727 if (expect_false (ev_is_active (w)))
2631 return; 2728 return;
2632 2729
2633 /* since we use memcmp, we need to clear any padding data etc. */
2634 memset (&w->prev, 0, sizeof (ev_statdata));
2635 memset (&w->attr, 0, sizeof (ev_statdata));
2636
2637 ev_stat_stat (EV_A_ w); 2730 ev_stat_stat (EV_A_ w);
2638 2731
2732 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2639 if (w->interval < MIN_STAT_INTERVAL) 2733 w->interval = MIN_STAT_INTERVAL;
2640 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2641 2734
2642 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2735 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2643 ev_set_priority (&w->timer, ev_priority (w)); 2736 ev_set_priority (&w->timer, ev_priority (w));
2644 2737
2645#if EV_USE_INOTIFY 2738#if EV_USE_INOTIFY
2646 infy_init (EV_A); 2739 infy_init (EV_A);
2647 2740
2648 if (fs_fd >= 0) 2741 if (fs_fd >= 0)
2649 infy_add (EV_A_ w); 2742 infy_add (EV_A_ w);
2650 else 2743 else
2651#endif 2744#endif
2652 ev_timer_start (EV_A_ &w->timer); 2745 ev_timer_again (EV_A_ &w->timer);
2653 2746
2654 ev_start (EV_A_ (W)w, 1); 2747 ev_start (EV_A_ (W)w, 1);
2655 2748
2656 EV_FREQUENT_CHECK; 2749 EV_FREQUENT_CHECK;
2657} 2750}
2827 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2920 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2828 } 2921 }
2829 } 2922 }
2830} 2923}
2831 2924
2925static void
2926embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2927{
2928 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2929
2930 ev_embed_stop (EV_A_ w);
2931
2932 {
2933 struct ev_loop *loop = w->other;
2934
2935 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2937 }
2938
2939 ev_embed_start (EV_A_ w);
2940}
2941
2832#if 0 2942#if 0
2833static void 2943static void
2834embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2944embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2835{ 2945{
2836 ev_idle_stop (EV_A_ idle); 2946 ev_idle_stop (EV_A_ idle);
2843 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2844 return; 2954 return;
2845 2955
2846 { 2956 {
2847 struct ev_loop *loop = w->other; 2957 struct ev_loop *loop = w->other;
2848 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2958 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2849 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2959 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2850 } 2960 }
2851 2961
2852 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2853 2963
2856 2966
2857 ev_prepare_init (&w->prepare, embed_prepare_cb); 2967 ev_prepare_init (&w->prepare, embed_prepare_cb);
2858 ev_set_priority (&w->prepare, EV_MINPRI); 2968 ev_set_priority (&w->prepare, EV_MINPRI);
2859 ev_prepare_start (EV_A_ &w->prepare); 2969 ev_prepare_start (EV_A_ &w->prepare);
2860 2970
2971 ev_fork_init (&w->fork, embed_fork_cb);
2972 ev_fork_start (EV_A_ &w->fork);
2973
2861 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2974 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2862 2975
2863 ev_start (EV_A_ (W)w, 1); 2976 ev_start (EV_A_ (W)w, 1);
2864 2977
2865 EV_FREQUENT_CHECK; 2978 EV_FREQUENT_CHECK;
2872 if (expect_false (!ev_is_active (w))) 2985 if (expect_false (!ev_is_active (w)))
2873 return; 2986 return;
2874 2987
2875 EV_FREQUENT_CHECK; 2988 EV_FREQUENT_CHECK;
2876 2989
2877 ev_io_stop (EV_A_ &w->io); 2990 ev_io_stop (EV_A_ &w->io);
2878 ev_prepare_stop (EV_A_ &w->prepare); 2991 ev_prepare_stop (EV_A_ &w->prepare);
2879 2992 ev_fork_stop (EV_A_ &w->fork);
2880 ev_stop (EV_A_ (W)w);
2881 2993
2882 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2883} 2995}
2884#endif 2996#endif
2885 2997
2982once_cb (EV_P_ struct ev_once *once, int revents) 3094once_cb (EV_P_ struct ev_once *once, int revents)
2983{ 3095{
2984 void (*cb)(int revents, void *arg) = once->cb; 3096 void (*cb)(int revents, void *arg) = once->cb;
2985 void *arg = once->arg; 3097 void *arg = once->arg;
2986 3098
2987 ev_io_stop (EV_A_ &once->io); 3099 ev_io_stop (EV_A_ &once->io);
2988 ev_timer_stop (EV_A_ &once->to); 3100 ev_timer_stop (EV_A_ &once->to);
2989 ev_free (once); 3101 ev_free (once);
2990 3102
2991 cb (revents, arg); 3103 cb (revents, arg);
2992} 3104}
2993 3105
2994static void 3106static void
2995once_cb_io (EV_P_ ev_io *w, int revents) 3107once_cb_io (EV_P_ ev_io *w, int revents)
2996{ 3108{
2997 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3109 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3110
3111 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2998} 3112}
2999 3113
3000static void 3114static void
3001once_cb_to (EV_P_ ev_timer *w, int revents) 3115once_cb_to (EV_P_ ev_timer *w, int revents)
3002{ 3116{
3003 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3117 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3118
3119 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3004} 3120}
3005 3121
3006void 3122void
3007ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3123ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3008{ 3124{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines