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

Comparing libev/ev.c (file contents):
Revision 1.262 by root, Wed Oct 1 04:25:25 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>
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); \
… …
625 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 676 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
626 } 677 }
627#endif 678#endif
628 679
629#define array_free(stem, idx) \ 680#define array_free(stem, idx) \
630 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
631 682
632/*****************************************************************************/ 683/*****************************************************************************/
633 684
634void noinline 685void noinline
635ev_feed_event (EV_P_ void *w, int revents) 686ev_feed_event (EV_P_ void *w, int revents)
… …
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;
728 unsigned char o_reify = anfd->reify; 766 unsigned char o_reify = anfd->reify;
729 767
730 anfd->reify = 0; 768 anfd->reify = 0;
731 anfd->events = events; 769 anfd->events = events;
732 770
733 if (o_events != events || o_reify & EV_IOFDSET) 771 if (o_events != events || o_reify & EV__IOFDSET)
734 backend_modify (EV_A_ fd, o_events, events); 772 backend_modify (EV_A_ fd, o_events, events);
735 } 773 }
736 } 774 }
737 775
738 fdchangecnt = 0; 776 fdchangecnt = 0;
… …
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/*****************************************************************************/
818 857
… …
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)
… …
1956 { 1997 {
1957 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1998 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1958 call_pending (EV_A); 1999 call_pending (EV_A);
1959 } 2000 }
1960 2001
1961 if (expect_false (!activecnt))
1962 break;
1963
1964 /* we might have forked, so reify kernel state if necessary */ 2002 /* we might have forked, so reify kernel state if necessary */
1965 if (expect_false (postfork)) 2003 if (expect_false (postfork))
1966 loop_fork (EV_A); 2004 loop_fork (EV_A);
1967 2005
1968 /* update fd-related kernel structures */ 2006 /* update fd-related kernel structures */
… …
2132 int fd = w->fd; 2170 int fd = w->fd;
2133 2171
2134 if (expect_false (ev_is_active (w))) 2172 if (expect_false (ev_is_active (w)))
2135 return; 2173 return;
2136 2174
2137 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))));
2138 2177
2139 EV_FREQUENT_CHECK; 2178 EV_FREQUENT_CHECK;
2140 2179
2141 ev_start (EV_A_ (W)w, 1); 2180 ev_start (EV_A_ (W)w, 1);
2142 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2181 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2143 wlist_add (&anfds[fd].head, (WL)w); 2182 wlist_add (&anfds[fd].head, (WL)w);
2144 2183
2145 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2184 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2146 w->events &= ~EV_IOFDSET; 2185 w->events &= ~EV__IOFDSET;
2147 2186
2148 EV_FREQUENT_CHECK; 2187 EV_FREQUENT_CHECK;
2149} 2188}
2150 2189
2151void noinline 2190void noinline
… …
2153{ 2192{
2154 clear_pending (EV_A_ (W)w); 2193 clear_pending (EV_A_ (W)w);
2155 if (expect_false (!ev_is_active (w))) 2194 if (expect_false (!ev_is_active (w)))
2156 return; 2195 return;
2157 2196
2158 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));
2159 2198
2160 EV_FREQUENT_CHECK; 2199 EV_FREQUENT_CHECK;
2161 2200
2162 wlist_del (&anfds[w->fd].head, (WL)w); 2201 wlist_del (&anfds[w->fd].head, (WL)w);
2163 ev_stop (EV_A_ (W)w); 2202 ev_stop (EV_A_ (W)w);
… …
2173 if (expect_false (ev_is_active (w))) 2212 if (expect_false (ev_is_active (w)))
2174 return; 2213 return;
2175 2214
2176 ev_at (w) += mn_now; 2215 ev_at (w) += mn_now;
2177 2216
2178 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.));
2179 2218
2180 EV_FREQUENT_CHECK; 2219 EV_FREQUENT_CHECK;
2181 2220
2182 ++timercnt; 2221 ++timercnt;
2183 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2222 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2186 ANHE_at_cache (timers [ev_active (w)]); 2225 ANHE_at_cache (timers [ev_active (w)]);
2187 upheap (timers, ev_active (w)); 2226 upheap (timers, ev_active (w));
2188 2227
2189 EV_FREQUENT_CHECK; 2228 EV_FREQUENT_CHECK;
2190 2229
2191 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2230 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2192} 2231}
2193 2232
2194void noinline 2233void noinline
2195ev_timer_stop (EV_P_ ev_timer *w) 2234ev_timer_stop (EV_P_ ev_timer *w)
2196{ 2235{
… …
2201 EV_FREQUENT_CHECK; 2240 EV_FREQUENT_CHECK;
2202 2241
2203 { 2242 {
2204 int active = ev_active (w); 2243 int active = ev_active (w);
2205 2244
2206 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2245 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2207 2246
2208 --timercnt; 2247 --timercnt;
2209 2248
2210 if (expect_true (active < timercnt + HEAP0)) 2249 if (expect_true (active < timercnt + HEAP0))
2211 { 2250 {
… …
2255 2294
2256 if (w->reschedule_cb) 2295 if (w->reschedule_cb)
2257 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2296 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2258 else if (w->interval) 2297 else if (w->interval)
2259 { 2298 {
2260 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.));
2261 /* 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 */
2262 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;
2263 } 2302 }
2264 else 2303 else
2265 ev_at (w) = w->offset; 2304 ev_at (w) = w->offset;
… …
2273 ANHE_at_cache (periodics [ev_active (w)]); 2312 ANHE_at_cache (periodics [ev_active (w)]);
2274 upheap (periodics, ev_active (w)); 2313 upheap (periodics, ev_active (w));
2275 2314
2276 EV_FREQUENT_CHECK; 2315 EV_FREQUENT_CHECK;
2277 2316
2278 /*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));*/
2279} 2318}
2280 2319
2281void noinline 2320void noinline
2282ev_periodic_stop (EV_P_ ev_periodic *w) 2321ev_periodic_stop (EV_P_ ev_periodic *w)
2283{ 2322{
… …
2288 EV_FREQUENT_CHECK; 2327 EV_FREQUENT_CHECK;
2289 2328
2290 { 2329 {
2291 int active = ev_active (w); 2330 int active = ev_active (w);
2292 2331
2293 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2332 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2294 2333
2295 --periodiccnt; 2334 --periodiccnt;
2296 2335
2297 if (expect_true (active < periodiccnt + HEAP0)) 2336 if (expect_true (active < periodiccnt + HEAP0))
2298 { 2337 {
… …
2321 2360
2322void noinline 2361void noinline
2323ev_signal_start (EV_P_ ev_signal *w) 2362ev_signal_start (EV_P_ ev_signal *w)
2324{ 2363{
2325#if EV_MULTIPLICITY 2364#if EV_MULTIPLICITY
2326 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));
2327#endif 2366#endif
2328 if (expect_false (ev_is_active (w))) 2367 if (expect_false (ev_is_active (w)))
2329 return; 2368 return;
2330 2369
2331 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));
2332 2371
2333 evpipe_init (EV_A); 2372 evpipe_init (EV_A);
2334 2373
2335 EV_FREQUENT_CHECK; 2374 EV_FREQUENT_CHECK;
2336 2375
… …
2339 sigset_t full, prev; 2378 sigset_t full, prev;
2340 sigfillset (&full); 2379 sigfillset (&full);
2341 sigprocmask (SIG_SETMASK, &full, &prev); 2380 sigprocmask (SIG_SETMASK, &full, &prev);
2342#endif 2381#endif
2343 2382
2344 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2383 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2345 2384
2346#ifndef _WIN32 2385#ifndef _WIN32
2347 sigprocmask (SIG_SETMASK, &prev, 0); 2386 sigprocmask (SIG_SETMASK, &prev, 0);
2348#endif 2387#endif
2349 } 2388 }
… …
2387 2426
2388void 2427void
2389ev_child_start (EV_P_ ev_child *w) 2428ev_child_start (EV_P_ ev_child *w)
2390{ 2429{
2391#if EV_MULTIPLICITY 2430#if EV_MULTIPLICITY
2392 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));
2393#endif 2432#endif
2394 if (expect_false (ev_is_active (w))) 2433 if (expect_false (ev_is_active (w)))
2395 return; 2434 return;
2396 2435
2397 EV_FREQUENT_CHECK; 2436 EV_FREQUENT_CHECK;
… …
2422# ifdef _WIN32 2461# ifdef _WIN32
2423# undef lstat 2462# undef lstat
2424# define lstat(a,b) _stati64 (a,b) 2463# define lstat(a,b) _stati64 (a,b)
2425# endif 2464# endif
2426 2465
2427#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 */
2428#define MIN_STAT_INTERVAL 0.1074891 2468#define MIN_STAT_INTERVAL 0.1074891
2429 2469
2430static 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);
2431 2471
2432#if EV_USE_INOTIFY 2472#if EV_USE_INOTIFY
2433# define EV_INOTIFY_BUFSIZE 8192 2473# define EV_INOTIFY_BUFSIZE 8192
… …
2437{ 2477{
2438 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);
2439 2479
2440 if (w->wd < 0) 2480 if (w->wd < 0)
2441 { 2481 {
2482 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2442 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 */
2443 2484
2444 /* monitor some parent directory for speedup hints */ 2485 /* monitor some parent directory for speedup hints */
2445 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2486 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2446 /* but an efficiency issue only */ 2487 /* but an efficiency issue only */
2447 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2488 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2448 { 2489 {
2449 char path [4096]; 2490 char path [4096];
2450 strcpy (path, w->path); 2491 strcpy (path, w->path);
… …
2454 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2495 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2455 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2496 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2456 2497
2457 char *pend = strrchr (path, '/'); 2498 char *pend = strrchr (path, '/');
2458 2499
2459 if (!pend) 2500 if (!pend || pend == path)
2460 break; /* whoops, no '/', complain to your admin */ 2501 break;
2461 2502
2462 *pend = 0; 2503 *pend = 0;
2463 w->wd = inotify_add_watch (fs_fd, path, mask); 2504 w->wd = inotify_add_watch (fs_fd, path, mask);
2464 } 2505 }
2465 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2506 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2466 } 2507 }
2467 } 2508 }
2468 else
2469 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2470 2509
2471 if (w->wd >= 0) 2510 if (w->wd >= 0)
2511 {
2472 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 }
2473} 2531}
2474 2532
2475static void noinline 2533static void noinline
2476infy_del (EV_P_ ev_stat *w) 2534infy_del (EV_P_ ev_stat *w)
2477{ 2535{
… …
2491 2549
2492static void noinline 2550static void noinline
2493infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2551infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2494{ 2552{
2495 if (slot < 0) 2553 if (slot < 0)
2496 /* overflow, need to check for all hahs slots */ 2554 /* overflow, need to check for all hash slots */
2497 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2555 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2498 infy_wd (EV_A_ slot, wd, ev); 2556 infy_wd (EV_A_ slot, wd, ev);
2499 else 2557 else
2500 { 2558 {
2501 WL w_; 2559 WL w_;
… …
2507 2565
2508 if (w->wd == wd || wd == -1) 2566 if (w->wd == wd || wd == -1)
2509 { 2567 {
2510 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2568 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2511 { 2569 {
2570 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2512 w->wd = -1; 2571 w->wd = -1;
2513 infy_add (EV_A_ w); /* re-add, no matter what */ 2572 infy_add (EV_A_ w); /* re-add, no matter what */
2514 } 2573 }
2515 2574
2516 stat_timer_cb (EV_A_ &w->timer, 0); 2575 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2530 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)
2531 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2590 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2532} 2591}
2533 2592
2534void 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
2535infy_init (EV_P) 2617infy_init (EV_P)
2536{ 2618{
2537 if (fs_fd != -2) 2619 if (fs_fd != -2)
2538 return; 2620 return;
2621
2622 fs_fd = -1;
2623
2624 check_2625 (EV_A);
2539 2625
2540 fs_fd = inotify_init (); 2626 fs_fd = inotify_init ();
2541 2627
2542 if (fs_fd >= 0) 2628 if (fs_fd >= 0)
2543 { 2629 {
… …
2571 w->wd = -1; 2657 w->wd = -1;
2572 2658
2573 if (fs_fd >= 0) 2659 if (fs_fd >= 0)
2574 infy_add (EV_A_ w); /* re-add, no matter what */ 2660 infy_add (EV_A_ w); /* re-add, no matter what */
2575 else 2661 else
2576 ev_timer_start (EV_A_ &w->timer); 2662 ev_timer_again (EV_A_ &w->timer);
2577 } 2663 }
2578
2579 } 2664 }
2580} 2665}
2581 2666
2582#endif 2667#endif
2583 2668
… …
2619 || w->prev.st_atime != w->attr.st_atime 2704 || w->prev.st_atime != w->attr.st_atime
2620 || w->prev.st_mtime != w->attr.st_mtime 2705 || w->prev.st_mtime != w->attr.st_mtime
2621 || w->prev.st_ctime != w->attr.st_ctime 2706 || w->prev.st_ctime != w->attr.st_ctime
2622 ) { 2707 ) {
2623 #if EV_USE_INOTIFY 2708 #if EV_USE_INOTIFY
2709 if (fs_fd >= 0)
2710 {
2624 infy_del (EV_A_ w); 2711 infy_del (EV_A_ w);
2625 infy_add (EV_A_ w); 2712 infy_add (EV_A_ w);
2626 ev_stat_stat (EV_A_ w); /* avoid race... */ 2713 ev_stat_stat (EV_A_ w); /* avoid race... */
2714 }
2627 #endif 2715 #endif
2628 2716
2629 ev_feed_event (EV_A_ w, EV_STAT); 2717 ev_feed_event (EV_A_ w, EV_STAT);
2630 } 2718 }
2631} 2719}
… …
2634ev_stat_start (EV_P_ ev_stat *w) 2722ev_stat_start (EV_P_ ev_stat *w)
2635{ 2723{
2636 if (expect_false (ev_is_active (w))) 2724 if (expect_false (ev_is_active (w)))
2637 return; 2725 return;
2638 2726
2639 /* since we use memcmp, we need to clear any padding data etc. */
2640 memset (&w->prev, 0, sizeof (ev_statdata));
2641 memset (&w->attr, 0, sizeof (ev_statdata));
2642
2643 ev_stat_stat (EV_A_ w); 2727 ev_stat_stat (EV_A_ w);
2644 2728
2729 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2645 if (w->interval < MIN_STAT_INTERVAL) 2730 w->interval = MIN_STAT_INTERVAL;
2646 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2647 2731
2648 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);
2649 ev_set_priority (&w->timer, ev_priority (w)); 2733 ev_set_priority (&w->timer, ev_priority (w));
2650 2734
2651#if EV_USE_INOTIFY 2735#if EV_USE_INOTIFY
2652 infy_init (EV_A); 2736 infy_init (EV_A);
2653 2737
2654 if (fs_fd >= 0) 2738 if (fs_fd >= 0)
2655 infy_add (EV_A_ w); 2739 infy_add (EV_A_ w);
2656 else 2740 else
2657#endif 2741#endif
2658 ev_timer_start (EV_A_ &w->timer); 2742 ev_timer_again (EV_A_ &w->timer);
2659 2743
2660 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2661 2745
2662 EV_FREQUENT_CHECK; 2746 EV_FREQUENT_CHECK;
2663} 2747}
… …
2838static void 2922static void
2839embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2923embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2840{ 2924{
2841 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));
2842 2926
2927 ev_embed_stop (EV_A_ w);
2928
2843 { 2929 {
2844 struct ev_loop *loop = w->other; 2930 struct ev_loop *loop = w->other;
2845 2931
2846 ev_loop_fork (EV_A); 2932 ev_loop_fork (EV_A);
2933 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2847 } 2934 }
2935
2936 ev_embed_start (EV_A_ w);
2848} 2937}
2849 2938
2850#if 0 2939#if 0
2851static void 2940static void
2852embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2941embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2861 if (expect_false (ev_is_active (w))) 2950 if (expect_false (ev_is_active (w)))
2862 return; 2951 return;
2863 2952
2864 { 2953 {
2865 struct ev_loop *loop = w->other; 2954 struct ev_loop *loop = w->other;
2866 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 ()));
2867 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);
2868 } 2957 }
2869 2958
2870 EV_FREQUENT_CHECK; 2959 EV_FREQUENT_CHECK;
2871 2960
… …
3054 ev_timer_set (&once->to, timeout, 0.); 3143 ev_timer_set (&once->to, timeout, 0.);
3055 ev_timer_start (EV_A_ &once->to); 3144 ev_timer_start (EV_A_ &once->to);
3056 } 3145 }
3057} 3146}
3058 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
3059#if EV_MULTIPLICITY 3256#if EV_MULTIPLICITY
3060 #include "ev_wrap.h" 3257 #include "ev_wrap.h"
3061#endif 3258#endif
3062 3259
3063#ifdef __cplusplus 3260#ifdef __cplusplus

Diff Legend

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