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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.283 by root, Wed Apr 15 09:51:19 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>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW 315# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 316# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 317# define EV_USE_INOTIFY 0
296# endif 318# endif
297#endif 319#endif
298 320
299#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
300# 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
301#endif 332#endif
302 333
303#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
304/* 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 */
305# include <stdint.h> 336# include <stdint.h>
… …
366typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
367 398
368#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
369#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
370 401
371#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
372/* 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 */
373/* 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
374static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
375#endif 410#endif
376 411
377#ifdef _WIN32 412#ifdef _WIN32
378# include "ev_win32.c" 413# include "ev_win32.c"
… …
387{ 422{
388 syserr_cb = cb; 423 syserr_cb = cb;
389} 424}
390 425
391static void noinline 426static void noinline
392syserr (const char *msg) 427ev_syserr (const char *msg)
393{ 428{
394 if (!msg) 429 if (!msg)
395 msg = "(libev) system error"; 430 msg = "(libev) system error";
396 431
397 if (syserr_cb) 432 if (syserr_cb)
… …
448typedef struct 483typedef struct
449{ 484{
450 WL head; 485 WL head;
451 unsigned char events; 486 unsigned char events;
452 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
453#if EV_SELECT_IS_WINSOCKET 493#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 494 SOCKET handle;
455#endif 495#endif
456} ANFD; 496} ANFD;
457 497
… …
517 557
518ev_tstamp 558ev_tstamp
519ev_time (void) 559ev_time (void)
520{ 560{
521#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
522 struct timespec ts; 564 struct timespec ts;
523 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
524 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
525#else 567 }
568#endif
569
526 struct timeval tv; 570 struct timeval tv;
527 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
528 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
529#endif
530} 573}
531 574
532ev_tstamp inline_size 575ev_tstamp inline_size
533get_clock (void) 576get_clock (void)
534{ 577{
… …
609array_realloc (int elem, void *base, int *cur, int cnt) 652array_realloc (int elem, void *base, int *cur, int cnt)
610{ 653{
611 *cur = array_nextsize (elem, *cur, cnt); 654 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 655 return ev_realloc (base, elem * *cur);
613} 656}
657
658#define array_init_zero(base,count) \
659 memset ((void *)(base), 0, sizeof (*(base)) * (count))
614 660
615#define array_needsize(type,base,cur,cnt,init) \ 661#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 662 if (expect_false ((cnt) > (cur))) \
617 { \ 663 { \
618 int ocur_ = (cur); \ 664 int ocur_ = (cur); \
… …
630 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 676 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
631 } 677 }
632#endif 678#endif
633 679
634#define array_free(stem, idx) \ 680#define array_free(stem, idx) \
635 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
636 682
637/*****************************************************************************/ 683/*****************************************************************************/
638 684
639void noinline 685void noinline
640ev_feed_event (EV_P_ void *w, int revents) 686ev_feed_event (EV_P_ void *w, int revents)
… …
661 for (i = 0; i < eventcnt; ++i) 707 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 708 ev_feed_event (EV_A_ events [i], type);
663} 709}
664 710
665/*****************************************************************************/ 711/*****************************************************************************/
666
667void inline_size
668anfds_init (ANFD *base, int count)
669{
670 while (count--)
671 {
672 base->head = 0;
673 base->events = EV_NONE;
674 base->reify = 0;
675
676 ++base;
677 }
678}
679 712
680void inline_speed 713void inline_speed
681fd_event (EV_P_ int fd, int revents) 714fd_event (EV_P_ int fd, int revents)
682{ 715{
683 ANFD *anfd = anfds + fd; 716 ANFD *anfd = anfds + fd;
… …
722 #ifdef EV_FD_TO_WIN32_HANDLE 755 #ifdef EV_FD_TO_WIN32_HANDLE
723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
724 #else 757 #else
725 anfd->handle = _get_osfhandle (fd); 758 anfd->handle = _get_osfhandle (fd);
726 #endif 759 #endif
727 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));
728 } 761 }
729#endif 762#endif
730 763
731 { 764 {
732 unsigned char o_events = anfd->events; 765 unsigned char o_events = anfd->events;
733 unsigned char o_reify = anfd->reify; 766 unsigned char o_reify = anfd->reify;
734 767
735 anfd->reify = 0; 768 anfd->reify = 0;
736 anfd->events = events; 769 anfd->events = events;
737 770
738 if (o_events != events || o_reify & EV_IOFDSET) 771 if (o_events != events || o_reify & EV__IOFDSET)
739 backend_modify (EV_A_ fd, o_events, events); 772 backend_modify (EV_A_ fd, o_events, events);
740 } 773 }
741 } 774 }
742 775
743 fdchangecnt = 0; 776 fdchangecnt = 0;
… …
813 846
814 for (fd = 0; fd < anfdmax; ++fd) 847 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 848 if (anfds [fd].events)
816 { 849 {
817 anfds [fd].events = 0; 850 anfds [fd].events = 0;
851 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 852 fd_change (EV_A_ fd, EV__IOFDSET | 1);
819 } 853 }
820} 854}
821 855
822/*****************************************************************************/ 856/*****************************************************************************/
823 857
… …
974static ANSIG *signals; 1008static ANSIG *signals;
975static int signalmax; 1009static int signalmax;
976 1010
977static EV_ATOMIC_T gotsig; 1011static EV_ATOMIC_T gotsig;
978 1012
979void inline_size
980signals_init (ANSIG *base, int count)
981{
982 while (count--)
983 {
984 base->head = 0;
985 base->gotsig = 0;
986
987 ++base;
988 }
989}
990
991/*****************************************************************************/ 1013/*****************************************************************************/
992 1014
993void inline_speed 1015void inline_speed
994fd_intern (int fd) 1016fd_intern (int fd)
995{ 1017{
… …
1016 } 1038 }
1017 else 1039 else
1018#endif 1040#endif
1019 { 1041 {
1020 while (pipe (evpipe)) 1042 while (pipe (evpipe))
1021 syserr ("(libev) error creating signal/async pipe"); 1043 ev_syserr ("(libev) error creating signal/async pipe");
1022 1044
1023 fd_intern (evpipe [0]); 1045 fd_intern (evpipe [0]);
1024 fd_intern (evpipe [1]); 1046 fd_intern (evpipe [1]);
1025 ev_io_set (&pipeev, evpipe [0], EV_READ); 1047 ev_io_set (&pipeev, evpipe [0], EV_READ);
1026 } 1048 }
… …
1116ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1117{ 1139{
1118 WL w; 1140 WL w;
1119 1141
1120#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1121 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));
1122#endif 1144#endif
1123 1145
1124 --signum; 1146 --signum;
1125 1147
1126 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
… …
1255 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1256 /* 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 */
1257 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1258#endif 1280#endif
1259#ifdef __APPLE__ 1281#ifdef __APPLE__
1260 // flags &= ~EVBACKEND_KQUEUE; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1261 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 */
1262#endif 1285#endif
1263 1286
1264 return flags; 1287 return flags;
1265} 1288}
1266 1289
… …
1303static void noinline 1326static void noinline
1304loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1305{ 1328{
1306 if (!backend) 1329 if (!backend)
1307 { 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
1308#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1309 { 1343 {
1310 struct timespec ts; 1344 struct timespec ts;
1345
1311 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1312 have_monotonic = 1; 1347 have_monotonic = 1;
1313 } 1348 }
1314#endif 1349#endif
1315 1350
1316 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1317 mn_now = get_clock (); 1352 mn_now = get_clock ();
1318 now_floor = mn_now; 1353 now_floor = mn_now;
… …
1519 1554
1520#if EV_VERIFY 1555#if EV_VERIFY
1521static void noinline 1556static void noinline
1522verify_watcher (EV_P_ W w) 1557verify_watcher (EV_P_ W w)
1523{ 1558{
1524 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1525 1560
1526 if (w->pending) 1561 if (w->pending)
1527 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));
1528} 1563}
1529 1564
1530static void noinline 1565static void noinline
1531verify_heap (EV_P_ ANHE *heap, int N) 1566verify_heap (EV_P_ ANHE *heap, int N)
1532{ 1567{
1533 int i; 1568 int i;
1534 1569
1535 for (i = HEAP0; i < N + HEAP0; ++i) 1570 for (i = HEAP0; i < N + HEAP0; ++i)
1536 { 1571 {
1537 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));
1538 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])));
1539 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]))));
1540 1575
1541 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1542 } 1577 }
1543} 1578}
1544 1579
1545static void noinline 1580static void noinline
1546array_verify (EV_P_ W *ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1547{ 1582{
1548 while (cnt--) 1583 while (cnt--)
1549 { 1584 {
1550 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1551 verify_watcher (EV_A_ ws [cnt]); 1586 verify_watcher (EV_A_ ws [cnt]);
1552 } 1587 }
1553} 1588}
1554#endif 1589#endif
1555 1590
… …
1562 1597
1563 assert (activecnt >= -1); 1598 assert (activecnt >= -1);
1564 1599
1565 assert (fdchangemax >= fdchangecnt); 1600 assert (fdchangemax >= fdchangecnt);
1566 for (i = 0; i < fdchangecnt; ++i) 1601 for (i = 0; i < fdchangecnt; ++i)
1567 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1568 1603
1569 assert (anfdmax >= 0); 1604 assert (anfdmax >= 0);
1570 for (i = 0; i < anfdmax; ++i) 1605 for (i = 0; i < anfdmax; ++i)
1571 for (w = anfds [i].head; w; w = w->next) 1606 for (w = anfds [i].head; w; w = w->next)
1572 { 1607 {
1573 verify_watcher (EV_A_ (W)w); 1608 verify_watcher (EV_A_ (W)w);
1574 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1609 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1575 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));
1576 } 1611 }
1577 1612
1578 assert (timermax >= timercnt); 1613 assert (timermax >= timercnt);
1579 verify_heap (EV_A_ timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1580 1615
… …
1657{ 1692{
1658#if EV_MULTIPLICITY 1693#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1694 struct ev_loop *loop = ev_default_loop_ptr;
1660#endif 1695#endif
1661 1696
1697 ev_default_loop_ptr = 0;
1698
1662#ifndef _WIN32 1699#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1700 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1701 ev_signal_stop (EV_A_ &childev);
1665#endif 1702#endif
1666 1703
… …
1672{ 1709{
1673#if EV_MULTIPLICITY 1710#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1711 struct ev_loop *loop = ev_default_loop_ptr;
1675#endif 1712#endif
1676 1713
1677 if (backend)
1678 postfork = 1; /* must be in line with ev_loop_fork */ 1714 postfork = 1; /* must be in line with ev_loop_fork */
1679} 1715}
1680 1716
1681/*****************************************************************************/ 1717/*****************************************************************************/
1682 1718
1683void 1719void
… …
1696 { 1732 {
1697 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1698 1734
1699 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1700 { 1736 {
1701 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1702 1738
1703 p->w->pending = 0; 1739 p->w->pending = 0;
1704 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1706 } 1742 }
… …
1737 1773
1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1739 { 1775 {
1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1741 1777
1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1743 1779
1744 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1745 if (w->repeat) 1781 if (w->repeat)
1746 { 1782 {
1747 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1748 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1749 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1750 1786
1751 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.));
1752 1788
1753 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1754 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1755 } 1791 }
1756 else 1792 else
… …
1769 1805
1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1771 { 1807 {
1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1773 1809
1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1775 1811
1776 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1777 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1778 { 1814 {
1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1780 1816
1781 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));
1782 1818
1783 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1784 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1785 } 1821 }
1786 else if (w->interval) 1822 else if (w->interval)
… …
1961 { 1997 {
1962 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1963 call_pending (EV_A); 1999 call_pending (EV_A);
1964 } 2000 }
1965 2001
1966 if (expect_false (!activecnt))
1967 break;
1968
1969 /* we might have forked, so reify kernel state if necessary */ 2002 /* we might have forked, so reify kernel state if necessary */
1970 if (expect_false (postfork)) 2003 if (expect_false (postfork))
1971 loop_fork (EV_A); 2004 loop_fork (EV_A);
1972 2005
1973 /* update fd-related kernel structures */ 2006 /* update fd-related kernel structures */
… …
2137 int fd = w->fd; 2170 int fd = w->fd;
2138 2171
2139 if (expect_false (ev_is_active (w))) 2172 if (expect_false (ev_is_active (w)))
2140 return; 2173 return;
2141 2174
2142 assert (("ev_io_start called with negative fd", fd >= 0)); 2175 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2176 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2143 2177
2144 EV_FREQUENT_CHECK; 2178 EV_FREQUENT_CHECK;
2145 2179
2146 ev_start (EV_A_ (W)w, 1); 2180 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2181 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2182 wlist_add (&anfds[fd].head, (WL)w);
2149 2183
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2184 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2151 w->events &= ~EV_IOFDSET; 2185 w->events &= ~EV__IOFDSET;
2152 2186
2153 EV_FREQUENT_CHECK; 2187 EV_FREQUENT_CHECK;
2154} 2188}
2155 2189
2156void noinline 2190void noinline
… …
2158{ 2192{
2159 clear_pending (EV_A_ (W)w); 2193 clear_pending (EV_A_ (W)w);
2160 if (expect_false (!ev_is_active (w))) 2194 if (expect_false (!ev_is_active (w)))
2161 return; 2195 return;
2162 2196
2163 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2197 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2164 2198
2165 EV_FREQUENT_CHECK; 2199 EV_FREQUENT_CHECK;
2166 2200
2167 wlist_del (&anfds[w->fd].head, (WL)w); 2201 wlist_del (&anfds[w->fd].head, (WL)w);
2168 ev_stop (EV_A_ (W)w); 2202 ev_stop (EV_A_ (W)w);
… …
2178 if (expect_false (ev_is_active (w))) 2212 if (expect_false (ev_is_active (w)))
2179 return; 2213 return;
2180 2214
2181 ev_at (w) += mn_now; 2215 ev_at (w) += mn_now;
2182 2216
2183 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2217 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2184 2218
2185 EV_FREQUENT_CHECK; 2219 EV_FREQUENT_CHECK;
2186 2220
2187 ++timercnt; 2221 ++timercnt;
2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2222 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2191 ANHE_at_cache (timers [ev_active (w)]); 2225 ANHE_at_cache (timers [ev_active (w)]);
2192 upheap (timers, ev_active (w)); 2226 upheap (timers, ev_active (w));
2193 2227
2194 EV_FREQUENT_CHECK; 2228 EV_FREQUENT_CHECK;
2195 2229
2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2230 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2197} 2231}
2198 2232
2199void noinline 2233void noinline
2200ev_timer_stop (EV_P_ ev_timer *w) 2234ev_timer_stop (EV_P_ ev_timer *w)
2201{ 2235{
… …
2206 EV_FREQUENT_CHECK; 2240 EV_FREQUENT_CHECK;
2207 2241
2208 { 2242 {
2209 int active = ev_active (w); 2243 int active = ev_active (w);
2210 2244
2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2245 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2212 2246
2213 --timercnt; 2247 --timercnt;
2214 2248
2215 if (expect_true (active < timercnt + HEAP0)) 2249 if (expect_true (active < timercnt + HEAP0))
2216 { 2250 {
… …
2260 2294
2261 if (w->reschedule_cb) 2295 if (w->reschedule_cb)
2262 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2296 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2263 else if (w->interval) 2297 else if (w->interval)
2264 { 2298 {
2265 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2299 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2266 /* this formula differs from the one in periodic_reify because we do not always round up */ 2300 /* this formula differs from the one in periodic_reify because we do not always round up */
2267 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2301 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2268 } 2302 }
2269 else 2303 else
2270 ev_at (w) = w->offset; 2304 ev_at (w) = w->offset;
… …
2278 ANHE_at_cache (periodics [ev_active (w)]); 2312 ANHE_at_cache (periodics [ev_active (w)]);
2279 upheap (periodics, ev_active (w)); 2313 upheap (periodics, ev_active (w));
2280 2314
2281 EV_FREQUENT_CHECK; 2315 EV_FREQUENT_CHECK;
2282 2316
2283 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2317 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2284} 2318}
2285 2319
2286void noinline 2320void noinline
2287ev_periodic_stop (EV_P_ ev_periodic *w) 2321ev_periodic_stop (EV_P_ ev_periodic *w)
2288{ 2322{
… …
2293 EV_FREQUENT_CHECK; 2327 EV_FREQUENT_CHECK;
2294 2328
2295 { 2329 {
2296 int active = ev_active (w); 2330 int active = ev_active (w);
2297 2331
2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2332 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2299 2333
2300 --periodiccnt; 2334 --periodiccnt;
2301 2335
2302 if (expect_true (active < periodiccnt + HEAP0)) 2336 if (expect_true (active < periodiccnt + HEAP0))
2303 { 2337 {
… …
2326 2360
2327void noinline 2361void noinline
2328ev_signal_start (EV_P_ ev_signal *w) 2362ev_signal_start (EV_P_ ev_signal *w)
2329{ 2363{
2330#if EV_MULTIPLICITY 2364#if EV_MULTIPLICITY
2331 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2365 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2332#endif 2366#endif
2333 if (expect_false (ev_is_active (w))) 2367 if (expect_false (ev_is_active (w)))
2334 return; 2368 return;
2335 2369
2336 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2370 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2337 2371
2338 evpipe_init (EV_A); 2372 evpipe_init (EV_A);
2339 2373
2340 EV_FREQUENT_CHECK; 2374 EV_FREQUENT_CHECK;
2341 2375
… …
2344 sigset_t full, prev; 2378 sigset_t full, prev;
2345 sigfillset (&full); 2379 sigfillset (&full);
2346 sigprocmask (SIG_SETMASK, &full, &prev); 2380 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif 2381#endif
2348 2382
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2383 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2350 2384
2351#ifndef _WIN32 2385#ifndef _WIN32
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2386 sigprocmask (SIG_SETMASK, &prev, 0);
2353#endif 2387#endif
2354 } 2388 }
… …
2392 2426
2393void 2427void
2394ev_child_start (EV_P_ ev_child *w) 2428ev_child_start (EV_P_ ev_child *w)
2395{ 2429{
2396#if EV_MULTIPLICITY 2430#if EV_MULTIPLICITY
2397 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2431 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2398#endif 2432#endif
2399 if (expect_false (ev_is_active (w))) 2433 if (expect_false (ev_is_active (w)))
2400 return; 2434 return;
2401 2435
2402 EV_FREQUENT_CHECK; 2436 EV_FREQUENT_CHECK;
… …
2427# ifdef _WIN32 2461# ifdef _WIN32
2428# undef lstat 2462# undef lstat
2429# define lstat(a,b) _stati64 (a,b) 2463# define lstat(a,b) _stati64 (a,b)
2430# endif 2464# endif
2431 2465
2432#define DEF_STAT_INTERVAL 5.0074891 2466#define DEF_STAT_INTERVAL 5.0074891
2467#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2433#define MIN_STAT_INTERVAL 0.1074891 2468#define MIN_STAT_INTERVAL 0.1074891
2434 2469
2435static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2470static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2436 2471
2437#if EV_USE_INOTIFY 2472#if EV_USE_INOTIFY
2438# define EV_INOTIFY_BUFSIZE 8192 2473# define EV_INOTIFY_BUFSIZE 8192
… …
2442{ 2477{
2443 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); 2478 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);
2444 2479
2445 if (w->wd < 0) 2480 if (w->wd < 0)
2446 { 2481 {
2482 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2447 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2483 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2448 2484
2449 /* monitor some parent directory for speedup hints */ 2485 /* monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2486 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2487 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2488 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2489 {
2454 char path [4096]; 2490 char path [4096];
2455 strcpy (path, w->path); 2491 strcpy (path, w->path);
… …
2459 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2495 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2460 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2496 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2461 2497
2462 char *pend = strrchr (path, '/'); 2498 char *pend = strrchr (path, '/');
2463 2499
2464 if (!pend) 2500 if (!pend || pend == path)
2465 break; /* whoops, no '/', complain to your admin */ 2501 break;
2466 2502
2467 *pend = 0; 2503 *pend = 0;
2468 w->wd = inotify_add_watch (fs_fd, path, mask); 2504 w->wd = inotify_add_watch (fs_fd, path, mask);
2469 } 2505 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2506 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2507 }
2472 } 2508 }
2473 else
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2509
2476 if (w->wd >= 0) 2510 if (w->wd >= 0)
2511 {
2477 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2512 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2513
2514 /* now local changes will be tracked by inotify, but remote changes won't */
2515 /* unless the filesystem it known to be local, we therefore still poll */
2516 /* also do poll on <2.6.25, but with normal frequency */
2517 struct statfs sfs;
2518
2519 if (fs_2625 && !statfs (w->path, &sfs))
2520 if (sfs.f_type == 0x1373 /* devfs */
2521 || sfs.f_type == 0xEF53 /* ext2/3 */
2522 || sfs.f_type == 0x3153464a /* jfs */
2523 || sfs.f_type == 0x52654973 /* reiser3 */
2524 || sfs.f_type == 0x01021994 /* tempfs */
2525 || sfs.f_type == 0x58465342 /* xfs */)
2526 return;
2527
2528 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2529 ev_timer_again (EV_A_ &w->timer);
2530 }
2478} 2531}
2479 2532
2480static void noinline 2533static void noinline
2481infy_del (EV_P_ ev_stat *w) 2534infy_del (EV_P_ ev_stat *w)
2482{ 2535{
… …
2496 2549
2497static void noinline 2550static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2551infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2552{
2500 if (slot < 0) 2553 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2554 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2555 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2556 infy_wd (EV_A_ slot, wd, ev);
2504 else 2557 else
2505 { 2558 {
2506 WL w_; 2559 WL w_;
… …
2512 2565
2513 if (w->wd == wd || wd == -1) 2566 if (w->wd == wd || wd == -1)
2514 { 2567 {
2515 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2568 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2516 { 2569 {
2570 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2517 w->wd = -1; 2571 w->wd = -1;
2518 infy_add (EV_A_ w); /* re-add, no matter what */ 2572 infy_add (EV_A_ w); /* re-add, no matter what */
2519 } 2573 }
2520 2574
2521 stat_timer_cb (EV_A_ &w->timer, 0); 2575 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2535 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2589 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2536 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2590 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2537} 2591}
2538 2592
2539void inline_size 2593void inline_size
2594check_2625 (EV_P)
2595{
2596 /* kernels < 2.6.25 are borked
2597 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2598 */
2599 struct utsname buf;
2600 int major, minor, micro;
2601
2602 if (uname (&buf))
2603 return;
2604
2605 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2606 return;
2607
2608 if (major < 2
2609 || (major == 2 && minor < 6)
2610 || (major == 2 && minor == 6 && micro < 25))
2611 return;
2612
2613 fs_2625 = 1;
2614}
2615
2616void inline_size
2540infy_init (EV_P) 2617infy_init (EV_P)
2541{ 2618{
2542 if (fs_fd != -2) 2619 if (fs_fd != -2)
2543 return; 2620 return;
2621
2622 fs_fd = -1;
2623
2624 check_2625 (EV_A);
2544 2625
2545 fs_fd = inotify_init (); 2626 fs_fd = inotify_init ();
2546 2627
2547 if (fs_fd >= 0) 2628 if (fs_fd >= 0)
2548 { 2629 {
… …
2576 w->wd = -1; 2657 w->wd = -1;
2577 2658
2578 if (fs_fd >= 0) 2659 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 2660 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 2661 else
2581 ev_timer_start (EV_A_ &w->timer); 2662 ev_timer_again (EV_A_ &w->timer);
2582 } 2663 }
2583
2584 } 2664 }
2585} 2665}
2586 2666
2587#endif 2667#endif
2588 2668
… …
2624 || w->prev.st_atime != w->attr.st_atime 2704 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 2705 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 2706 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 2707 ) {
2628 #if EV_USE_INOTIFY 2708 #if EV_USE_INOTIFY
2709 if (fs_fd >= 0)
2710 {
2629 infy_del (EV_A_ w); 2711 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 2712 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 2713 ev_stat_stat (EV_A_ w); /* avoid race... */
2714 }
2632 #endif 2715 #endif
2633 2716
2634 ev_feed_event (EV_A_ w, EV_STAT); 2717 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 2718 }
2636} 2719}
… …
2639ev_stat_start (EV_P_ ev_stat *w) 2722ev_stat_start (EV_P_ ev_stat *w)
2640{ 2723{
2641 if (expect_false (ev_is_active (w))) 2724 if (expect_false (ev_is_active (w)))
2642 return; 2725 return;
2643 2726
2644 /* since we use memcmp, we need to clear any padding data etc. */
2645 memset (&w->prev, 0, sizeof (ev_statdata));
2646 memset (&w->attr, 0, sizeof (ev_statdata));
2647
2648 ev_stat_stat (EV_A_ w); 2727 ev_stat_stat (EV_A_ w);
2649 2728
2729 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2650 if (w->interval < MIN_STAT_INTERVAL) 2730 w->interval = MIN_STAT_INTERVAL;
2651 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2652 2731
2653 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2732 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2654 ev_set_priority (&w->timer, ev_priority (w)); 2733 ev_set_priority (&w->timer, ev_priority (w));
2655 2734
2656#if EV_USE_INOTIFY 2735#if EV_USE_INOTIFY
2657 infy_init (EV_A); 2736 infy_init (EV_A);
2658 2737
2659 if (fs_fd >= 0) 2738 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); 2739 infy_add (EV_A_ w);
2661 else 2740 else
2662#endif 2741#endif
2663 ev_timer_start (EV_A_ &w->timer); 2742 ev_timer_again (EV_A_ &w->timer);
2664 2743
2665 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2666 2745
2667 EV_FREQUENT_CHECK; 2746 EV_FREQUENT_CHECK;
2668} 2747}
… …
2843static void 2922static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2923embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{ 2924{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2925 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847 2926
2927 ev_embed_stop (EV_A_ w);
2928
2848 { 2929 {
2849 struct ev_loop *loop = w->other; 2930 struct ev_loop *loop = w->other;
2850 2931
2851 ev_loop_fork (EV_A); 2932 ev_loop_fork (EV_A);
2933 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2852 } 2934 }
2935
2936 ev_embed_start (EV_A_ w);
2853} 2937}
2854 2938
2855#if 0 2939#if 0
2856static void 2940static void
2857embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2941embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2866 if (expect_false (ev_is_active (w))) 2950 if (expect_false (ev_is_active (w)))
2867 return; 2951 return;
2868 2952
2869 { 2953 {
2870 struct ev_loop *loop = w->other; 2954 struct ev_loop *loop = w->other;
2871 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2955 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2872 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2956 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2873 } 2957 }
2874 2958
2875 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
2876 2960
… …
3059 ev_timer_set (&once->to, timeout, 0.); 3143 ev_timer_set (&once->to, timeout, 0.);
3060 ev_timer_start (EV_A_ &once->to); 3144 ev_timer_start (EV_A_ &once->to);
3061 } 3145 }
3062} 3146}
3063 3147
3148/*****************************************************************************/
3149
3150#if 0
3151void
3152ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3153{
3154 int i, j;
3155 ev_watcher_list *wl, *wn;
3156
3157 if (types & (EV_IO | EV_EMBED))
3158 for (i = 0; i < anfdmax; ++i)
3159 for (wl = anfds [i].head; wl; )
3160 {
3161 wn = wl->next;
3162
3163#if EV_EMBED_ENABLE
3164 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3165 {
3166 if (types & EV_EMBED)
3167 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3168 }
3169 else
3170#endif
3171#if EV_USE_INOTIFY
3172 if (ev_cb ((ev_io *)wl) == infy_cb)
3173 ;
3174 else
3175#endif
3176 if ((ev_io *)wl != &pipeev)
3177 if (types & EV_IO)
3178 cb (EV_A_ EV_IO, wl);
3179
3180 wl = wn;
3181 }
3182
3183 if (types & (EV_TIMER | EV_STAT))
3184 for (i = timercnt + HEAP0; i-- > HEAP0; )
3185#if EV_STAT_ENABLE
3186 /*TODO: timer is not always active*/
3187 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3188 {
3189 if (types & EV_STAT)
3190 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3191 }
3192 else
3193#endif
3194 if (types & EV_TIMER)
3195 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3196
3197#if EV_PERIODIC_ENABLE
3198 if (types & EV_PERIODIC)
3199 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3200 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3201#endif
3202
3203#if EV_IDLE_ENABLE
3204 if (types & EV_IDLE)
3205 for (j = NUMPRI; i--; )
3206 for (i = idlecnt [j]; i--; )
3207 cb (EV_A_ EV_IDLE, idles [j][i]);
3208#endif
3209
3210#if EV_FORK_ENABLE
3211 if (types & EV_FORK)
3212 for (i = forkcnt; i--; )
3213 if (ev_cb (forks [i]) != embed_fork_cb)
3214 cb (EV_A_ EV_FORK, forks [i]);
3215#endif
3216
3217#if EV_ASYNC_ENABLE
3218 if (types & EV_ASYNC)
3219 for (i = asynccnt; i--; )
3220 cb (EV_A_ EV_ASYNC, asyncs [i]);
3221#endif
3222
3223 if (types & EV_PREPARE)
3224 for (i = preparecnt; i--; )
3225#if EV_EMBED_ENABLE
3226 if (ev_cb (prepares [i]) != embed_prepare_cb)
3227#endif
3228 cb (EV_A_ EV_PREPARE, prepares [i]);
3229
3230 if (types & EV_CHECK)
3231 for (i = checkcnt; i--; )
3232 cb (EV_A_ EV_CHECK, checks [i]);
3233
3234 if (types & EV_SIGNAL)
3235 for (i = 0; i < signalmax; ++i)
3236 for (wl = signals [i].head; wl; )
3237 {
3238 wn = wl->next;
3239 cb (EV_A_ EV_SIGNAL, wl);
3240 wl = wn;
3241 }
3242
3243 if (types & EV_CHILD)
3244 for (i = EV_PID_HASHSIZE; i--; )
3245 for (wl = childs [i]; wl; )
3246 {
3247 wn = wl->next;
3248 cb (EV_A_ EV_CHILD, wl);
3249 wl = wn;
3250 }
3251/* EV_STAT 0x00001000 /* stat data changed */
3252/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3253}
3254#endif
3255
3064#if EV_MULTIPLICITY 3256#if EV_MULTIPLICITY
3065 #include "ev_wrap.h" 3257 #include "ev_wrap.h"
3066#endif 3258#endif
3067 3259
3068#ifdef __cplusplus 3260#ifdef __cplusplus

Diff Legend

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