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.282 by root, Sat Mar 28 22:17:17 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)
… …
2137 int fd = w->fd; 2173 int fd = w->fd;
2138 2174
2139 if (expect_false (ev_is_active (w))) 2175 if (expect_false (ev_is_active (w)))
2140 return; 2176 return;
2141 2177
2142 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))));
2143 2180
2144 EV_FREQUENT_CHECK; 2181 EV_FREQUENT_CHECK;
2145 2182
2146 ev_start (EV_A_ (W)w, 1); 2183 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2185 wlist_add (&anfds[fd].head, (WL)w);
2149 2186
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2187 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2151 w->events &= ~EV_IOFDSET; 2188 w->events &= ~EV__IOFDSET;
2152 2189
2153 EV_FREQUENT_CHECK; 2190 EV_FREQUENT_CHECK;
2154} 2191}
2155 2192
2156void noinline 2193void noinline
… …
2158{ 2195{
2159 clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2160 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2161 return; 2198 return;
2162 2199
2163 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));
2164 2201
2165 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2166 2203
2167 wlist_del (&anfds[w->fd].head, (WL)w); 2204 wlist_del (&anfds[w->fd].head, (WL)w);
2168 ev_stop (EV_A_ (W)w); 2205 ev_stop (EV_A_ (W)w);
… …
2178 if (expect_false (ev_is_active (w))) 2215 if (expect_false (ev_is_active (w)))
2179 return; 2216 return;
2180 2217
2181 ev_at (w) += mn_now; 2218 ev_at (w) += mn_now;
2182 2219
2183 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.));
2184 2221
2185 EV_FREQUENT_CHECK; 2222 EV_FREQUENT_CHECK;
2186 2223
2187 ++timercnt; 2224 ++timercnt;
2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2225 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2191 ANHE_at_cache (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2192 upheap (timers, ev_active (w)); 2229 upheap (timers, ev_active (w));
2193 2230
2194 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2195 2232
2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2233 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2197} 2234}
2198 2235
2199void noinline 2236void noinline
2200ev_timer_stop (EV_P_ ev_timer *w) 2237ev_timer_stop (EV_P_ ev_timer *w)
2201{ 2238{
… …
2206 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2207 2244
2208 { 2245 {
2209 int active = ev_active (w); 2246 int active = ev_active (w);
2210 2247
2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2248 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2212 2249
2213 --timercnt; 2250 --timercnt;
2214 2251
2215 if (expect_true (active < timercnt + HEAP0)) 2252 if (expect_true (active < timercnt + HEAP0))
2216 { 2253 {
… …
2260 2297
2261 if (w->reschedule_cb) 2298 if (w->reschedule_cb)
2262 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2263 else if (w->interval) 2300 else if (w->interval)
2264 { 2301 {
2265 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.));
2266 /* 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 */
2267 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;
2268 } 2305 }
2269 else 2306 else
2270 ev_at (w) = w->offset; 2307 ev_at (w) = w->offset;
… …
2278 ANHE_at_cache (periodics [ev_active (w)]); 2315 ANHE_at_cache (periodics [ev_active (w)]);
2279 upheap (periodics, ev_active (w)); 2316 upheap (periodics, ev_active (w));
2280 2317
2281 EV_FREQUENT_CHECK; 2318 EV_FREQUENT_CHECK;
2282 2319
2283 /*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));*/
2284} 2321}
2285 2322
2286void noinline 2323void noinline
2287ev_periodic_stop (EV_P_ ev_periodic *w) 2324ev_periodic_stop (EV_P_ ev_periodic *w)
2288{ 2325{
… …
2293 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2294 2331
2295 { 2332 {
2296 int active = ev_active (w); 2333 int active = ev_active (w);
2297 2334
2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2335 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2299 2336
2300 --periodiccnt; 2337 --periodiccnt;
2301 2338
2302 if (expect_true (active < periodiccnt + HEAP0)) 2339 if (expect_true (active < periodiccnt + HEAP0))
2303 { 2340 {
… …
2326 2363
2327void noinline 2364void noinline
2328ev_signal_start (EV_P_ ev_signal *w) 2365ev_signal_start (EV_P_ ev_signal *w)
2329{ 2366{
2330#if EV_MULTIPLICITY 2367#if EV_MULTIPLICITY
2331 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));
2332#endif 2369#endif
2333 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2334 return; 2371 return;
2335 2372
2336 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));
2337 2374
2338 evpipe_init (EV_A); 2375 evpipe_init (EV_A);
2339 2376
2340 EV_FREQUENT_CHECK; 2377 EV_FREQUENT_CHECK;
2341 2378
… …
2344 sigset_t full, prev; 2381 sigset_t full, prev;
2345 sigfillset (&full); 2382 sigfillset (&full);
2346 sigprocmask (SIG_SETMASK, &full, &prev); 2383 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif 2384#endif
2348 2385
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2386 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2350 2387
2351#ifndef _WIN32 2388#ifndef _WIN32
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2389 sigprocmask (SIG_SETMASK, &prev, 0);
2353#endif 2390#endif
2354 } 2391 }
… …
2392 2429
2393void 2430void
2394ev_child_start (EV_P_ ev_child *w) 2431ev_child_start (EV_P_ ev_child *w)
2395{ 2432{
2396#if EV_MULTIPLICITY 2433#if EV_MULTIPLICITY
2397 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));
2398#endif 2435#endif
2399 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
2400 return; 2437 return;
2401 2438
2402 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
… …
2427# ifdef _WIN32 2464# ifdef _WIN32
2428# undef lstat 2465# undef lstat
2429# define lstat(a,b) _stati64 (a,b) 2466# define lstat(a,b) _stati64 (a,b)
2430# endif 2467# endif
2431 2468
2432#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 */
2433#define MIN_STAT_INTERVAL 0.1074891 2471#define MIN_STAT_INTERVAL 0.1074891
2434 2472
2435static 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);
2436 2474
2437#if EV_USE_INOTIFY 2475#if EV_USE_INOTIFY
2438# define EV_INOTIFY_BUFSIZE 8192 2476# define EV_INOTIFY_BUFSIZE 8192
… …
2442{ 2480{
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); 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);
2444 2482
2445 if (w->wd < 0) 2483 if (w->wd < 0)
2446 { 2484 {
2485 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 */ 2486 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2448 2487
2449 /* monitor some parent directory for speedup hints */ 2488 /* monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2490 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2492 {
2454 char path [4096]; 2493 char path [4096];
2455 strcpy (path, w->path); 2494 strcpy (path, w->path);
… …
2459 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2498 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2460 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2499 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2461 2500
2462 char *pend = strrchr (path, '/'); 2501 char *pend = strrchr (path, '/');
2463 2502
2464 if (!pend) 2503 if (!pend || pend == path)
2465 break; /* whoops, no '/', complain to your admin */ 2504 break;
2466 2505
2467 *pend = 0; 2506 *pend = 0;
2468 w->wd = inotify_add_watch (fs_fd, path, mask); 2507 w->wd = inotify_add_watch (fs_fd, path, mask);
2469 } 2508 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2510 }
2472 } 2511 }
2473 else
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2512
2476 if (w->wd >= 0) 2513 if (w->wd >= 0)
2514 {
2477 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 }
2478} 2534}
2479 2535
2480static void noinline 2536static void noinline
2481infy_del (EV_P_ ev_stat *w) 2537infy_del (EV_P_ ev_stat *w)
2482{ 2538{
… …
2496 2552
2497static void noinline 2553static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2554infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2555{
2500 if (slot < 0) 2556 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2557 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2558 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2559 infy_wd (EV_A_ slot, wd, ev);
2504 else 2560 else
2505 { 2561 {
2506 WL w_; 2562 WL w_;
… …
2512 2568
2513 if (w->wd == wd || wd == -1) 2569 if (w->wd == wd || wd == -1)
2514 { 2570 {
2515 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2571 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2516 { 2572 {
2573 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2517 w->wd = -1; 2574 w->wd = -1;
2518 infy_add (EV_A_ w); /* re-add, no matter what */ 2575 infy_add (EV_A_ w); /* re-add, no matter what */
2519 } 2576 }
2520 2577
2521 stat_timer_cb (EV_A_ &w->timer, 0); 2578 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2535 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)
2536 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2593 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2537} 2594}
2538 2595
2539void 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
2540infy_init (EV_P) 2620infy_init (EV_P)
2541{ 2621{
2542 if (fs_fd != -2) 2622 if (fs_fd != -2)
2543 return; 2623 return;
2624
2625 fs_fd = -1;
2626
2627 check_2625 (EV_A);
2544 2628
2545 fs_fd = inotify_init (); 2629 fs_fd = inotify_init ();
2546 2630
2547 if (fs_fd >= 0) 2631 if (fs_fd >= 0)
2548 { 2632 {
… …
2576 w->wd = -1; 2660 w->wd = -1;
2577 2661
2578 if (fs_fd >= 0) 2662 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 2663 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 2664 else
2581 ev_timer_start (EV_A_ &w->timer); 2665 ev_timer_again (EV_A_ &w->timer);
2582 } 2666 }
2583
2584 } 2667 }
2585} 2668}
2586 2669
2587#endif 2670#endif
2588 2671
… …
2624 || w->prev.st_atime != w->attr.st_atime 2707 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 2708 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 2709 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 2710 ) {
2628 #if EV_USE_INOTIFY 2711 #if EV_USE_INOTIFY
2712 if (fs_fd >= 0)
2713 {
2629 infy_del (EV_A_ w); 2714 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 2715 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 2716 ev_stat_stat (EV_A_ w); /* avoid race... */
2717 }
2632 #endif 2718 #endif
2633 2719
2634 ev_feed_event (EV_A_ w, EV_STAT); 2720 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 2721 }
2636} 2722}
… …
2639ev_stat_start (EV_P_ ev_stat *w) 2725ev_stat_start (EV_P_ ev_stat *w)
2640{ 2726{
2641 if (expect_false (ev_is_active (w))) 2727 if (expect_false (ev_is_active (w)))
2642 return; 2728 return;
2643 2729
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); 2730 ev_stat_stat (EV_A_ w);
2649 2731
2732 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2650 if (w->interval < MIN_STAT_INTERVAL) 2733 w->interval = MIN_STAT_INTERVAL;
2651 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2652 2734
2653 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);
2654 ev_set_priority (&w->timer, ev_priority (w)); 2736 ev_set_priority (&w->timer, ev_priority (w));
2655 2737
2656#if EV_USE_INOTIFY 2738#if EV_USE_INOTIFY
2657 infy_init (EV_A); 2739 infy_init (EV_A);
2658 2740
2659 if (fs_fd >= 0) 2741 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); 2742 infy_add (EV_A_ w);
2661 else 2743 else
2662#endif 2744#endif
2663 ev_timer_start (EV_A_ &w->timer); 2745 ev_timer_again (EV_A_ &w->timer);
2664 2746
2665 ev_start (EV_A_ (W)w, 1); 2747 ev_start (EV_A_ (W)w, 1);
2666 2748
2667 EV_FREQUENT_CHECK; 2749 EV_FREQUENT_CHECK;
2668} 2750}
… …
2843static void 2925static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2926embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{ 2927{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2928 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847 2929
2930 ev_embed_stop (EV_A_ w);
2931
2848 { 2932 {
2849 struct ev_loop *loop = w->other; 2933 struct ev_loop *loop = w->other;
2850 2934
2851 ev_loop_fork (EV_A); 2935 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2852 } 2937 }
2938
2939 ev_embed_start (EV_A_ w);
2853} 2940}
2854 2941
2855#if 0 2942#if 0
2856static void 2943static void
2857embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2944embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2866 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2867 return; 2954 return;
2868 2955
2869 { 2956 {
2870 struct ev_loop *loop = w->other; 2957 struct ev_loop *loop = w->other;
2871 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 ()));
2872 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);
2873 } 2960 }
2874 2961
2875 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2876 2963
… …
3059 ev_timer_set (&once->to, timeout, 0.); 3146 ev_timer_set (&once->to, timeout, 0.);
3060 ev_timer_start (EV_A_ &once->to); 3147 ev_timer_start (EV_A_ &once->to);
3061 } 3148 }
3062} 3149}
3063 3150
3151/*****************************************************************************/
3152
3153#if 0
3154void
3155ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3156{
3157 int i, j;
3158 ev_watcher_list *wl, *wn;
3159
3160 if (types & (EV_IO | EV_EMBED))
3161 for (i = 0; i < anfdmax; ++i)
3162 for (wl = anfds [i].head; wl; )
3163 {
3164 wn = wl->next;
3165
3166#if EV_EMBED_ENABLE
3167 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3168 {
3169 if (types & EV_EMBED)
3170 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3171 }
3172 else
3173#endif
3174#if EV_USE_INOTIFY
3175 if (ev_cb ((ev_io *)wl) == infy_cb)
3176 ;
3177 else
3178#endif
3179 if ((ev_io *)wl != &pipeev)
3180 if (types & EV_IO)
3181 cb (EV_A_ EV_IO, wl);
3182
3183 wl = wn;
3184 }
3185
3186 if (types & (EV_TIMER | EV_STAT))
3187 for (i = timercnt + HEAP0; i-- > HEAP0; )
3188#if EV_STAT_ENABLE
3189 /*TODO: timer is not always active*/
3190 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3191 {
3192 if (types & EV_STAT)
3193 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3194 }
3195 else
3196#endif
3197 if (types & EV_TIMER)
3198 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3199
3200#if EV_PERIODIC_ENABLE
3201 if (types & EV_PERIODIC)
3202 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3203 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3204#endif
3205
3206#if EV_IDLE_ENABLE
3207 if (types & EV_IDLE)
3208 for (j = NUMPRI; i--; )
3209 for (i = idlecnt [j]; i--; )
3210 cb (EV_A_ EV_IDLE, idles [j][i]);
3211#endif
3212
3213#if EV_FORK_ENABLE
3214 if (types & EV_FORK)
3215 for (i = forkcnt; i--; )
3216 if (ev_cb (forks [i]) != embed_fork_cb)
3217 cb (EV_A_ EV_FORK, forks [i]);
3218#endif
3219
3220#if EV_ASYNC_ENABLE
3221 if (types & EV_ASYNC)
3222 for (i = asynccnt; i--; )
3223 cb (EV_A_ EV_ASYNC, asyncs [i]);
3224#endif
3225
3226 if (types & EV_PREPARE)
3227 for (i = preparecnt; i--; )
3228#if EV_EMBED_ENABLE
3229 if (ev_cb (prepares [i]) != embed_prepare_cb)
3230#endif
3231 cb (EV_A_ EV_PREPARE, prepares [i]);
3232
3233 if (types & EV_CHECK)
3234 for (i = checkcnt; i--; )
3235 cb (EV_A_ EV_CHECK, checks [i]);
3236
3237 if (types & EV_SIGNAL)
3238 for (i = 0; i < signalmax; ++i)
3239 for (wl = signals [i].head; wl; )
3240 {
3241 wn = wl->next;
3242 cb (EV_A_ EV_SIGNAL, wl);
3243 wl = wn;
3244 }
3245
3246 if (types & EV_CHILD)
3247 for (i = EV_PID_HASHSIZE; i--; )
3248 for (wl = childs [i]; wl; )
3249 {
3250 wn = wl->next;
3251 cb (EV_A_ EV_CHILD, wl);
3252 wl = wn;
3253 }
3254/* EV_STAT 0x00001000 /* stat data changed */
3255/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3256}
3257#endif
3258
3064#if EV_MULTIPLICITY 3259#if EV_MULTIPLICITY
3065 #include "ev_wrap.h" 3260 #include "ev_wrap.h"
3066#endif 3261#endif
3067 3262
3068#ifdef __cplusplus 3263#ifdef __cplusplus

Diff Legend

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